ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/primitives/CutoffGroup.hpp
(Generate patch)

Comparing:
trunk/src/primitives/CutoffGroup.hpp (file contents), Revision 2 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
branches/development/src/primitives/CutoffGroup.hpp (file contents), Revision 1551 by gezelter, Thu Apr 28 18:38:21 2011 UTC

# Line 1 | Line 1
1 < #ifndef _CUTOFFGROUP_H_
2 < #define _CUTOFFGROUP_H_
3 < #include "Atom.hpp"
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 > *
4 > * The University of Notre Dame grants you ("Licensee") a
5 > * non-exclusive, royalty free, license to use, modify and
6 > * redistribute this software in source and binary code form, provided
7 > * that the following conditions are met:
8 > *
9 > * 1. Redistributions of source code must retain the above copyright
10 > *    notice, this list of conditions and the following disclaimer.
11 > *
12 > * 2. Redistributions in binary form must reproduce the above copyright
13 > *    notice, this list of conditions and the following disclaimer in the
14 > *    documentation and/or other materials provided with the
15 > *    distribution.
16 > *
17 > * This software is provided "AS IS," without a warranty of any
18 > * kind. All express or implied conditions, representations and
19 > * warranties, including any implied warranty of merchantability,
20 > * fitness for a particular purpose or non-infringement, are hereby
21 > * excluded.  The University of Notre Dame and its licensors shall not
22 > * be liable for any damages suffered by licensee as a result of
23 > * using, modifying or distributing the software or its
24 > * derivatives. In no event will the University of Notre Dame or its
25 > * licensors be liable for any lost revenue, profit or data, or for
26 > * direct, indirect, special, consequential, incidental or punitive
27 > * damages, however caused and regardless of the theory of liability,
28 > * arising out of the use of or inability to use software, even if the
29 > * University of Notre Dame has been advised of the possibility of
30 > * such damages.
31 > *
32 > * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 > * research, please cite the appropriate papers when you publish your
34 > * work.  Good starting points are:
35 > *                                                                      
36 > * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 > * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 > * [4]  Vardeman & Gezelter, in progress (2009).                        
40 > */
41 >
42 > #ifndef PRIMITIVES_CUTOFFGROUP_HPP
43  
44 < class CutoffGroup{
6 < public:
7 <  
8 <  CutoffGroup() {
9 <    haveTotalMass = false;
10 <    totalMass = 0.0;
11 <  }
12 <  
13 <  void addAtom(Atom* atom) {cutoffAtomList.push_back(atom);}
14 <  
15 <  Atom* beginAtom(vector<Atom*>::iterator& i){
16 <    i = cutoffAtomList.begin();
17 <    return i != cutoffAtomList.end()? *i : NULL;
18 <  }
19 <  
20 <  Atom* nextAtom(vector<Atom*>::iterator& i){
21 <    i++;
22 <    return i != cutoffAtomList.end()? *i : NULL;
23 <  }
24 <  
25 <  double getMass(){
26 <    vector<Atom*>::iterator i;
27 <    Atom* atom;
28 <    double mass;
29 <    
30 <    if (!haveTotalMass) {
44 > #define PRIMITIVES_CUTOFFGROUP_HPP
45  
46 <      totalMass = 0;
47 <      
34 <      for(atom = beginAtom(i); atom != NULL; atom = nextAtom(i)){
35 <        mass = atom->getMass();
36 <        totalMass += mass;
37 <      }
46 > #include "primitives/Atom.hpp"
47 > #include "math/Vector3.hpp"
48  
49 <      haveTotalMass = true;
49 > namespace OpenMD {
50 >  class CutoffGroup {
51 >  public:
52 >    
53 >    CutoffGroup() :  snapshotMan_(NULL) {
54 >
55 >      storage_ = &Snapshot::cgData;
56 >      haveTotalMass = false;
57 >      totalMass = 0.0;
58      }
59      
60 <    return totalMass;
61 <  }
62 <  
63 <  void getCOM(double com[3]){
60 >    /**
61 >     * Sets the Snapshot Manager of this cutoffGroup
62 >     */
63 >    void setSnapshotManager(SnapshotManager* sman) {
64 >      snapshotMan_ = sman;
65 >    }
66  
67 <    vector<Atom*>::iterator i;
68 <    Atom* atom;
69 <    double pos[3];
70 <    double mass;
67 >
68 >    void addAtom(Atom *atom) {
69 >      cutoffAtomList.push_back(atom);
70 >    }
71      
72 <    com[0] = 0;
73 <    com[1] = 0;
74 <    com[2] = 0;
75 <    totalMass = getMass();    
72 >    Atom *beginAtom(std::vector<Atom *>::iterator & i) {
73 >      i = cutoffAtomList.begin();
74 >      return i != cutoffAtomList.end() ? *i : NULL;
75 >    }
76      
77 <    if (cutoffAtomList.size() == 1) {
77 >    Atom *nextAtom(std::vector<Atom *>::iterator & i) {
78 >      i++;
79 >      return i != cutoffAtomList.end() ? *i : NULL;
80 >    }
81 >
82 >    std::vector<Atom*> getAtoms() { return cutoffAtomList; }
83 >    RealType getMass() {
84 >      std::vector<Atom *>::iterator i;
85 >      Atom * atom;
86 >      RealType mass;
87        
88 <      beginAtom(i)->getPos(com);
88 >      if (!haveTotalMass) {
89 >        totalMass = 0;
90 >        
91 >        for(atom = beginAtom(i); atom != NULL; atom = nextAtom(i)) {
92 >          mass = atom->getMass();
93 >          totalMass += mass;
94 >        }
95 >        
96 >        haveTotalMass = true;
97 >      }
98        
99 <    } else {
99 >      return totalMass;
100 >    }
101 >    
102 >    void updateCOM() {
103 >      std::vector<Atom *>::iterator i;
104 >      Atom * atom;
105 >
106 >      DataStorage&  data = snapshotMan_->getCurrentSnapshot()->*storage_;
107 >    
108 >      totalMass = getMass();
109        
110 <      for(atom = beginAtom(i); atom != NULL; atom = nextAtom(i)){
111 <        mass = atom->getMass();
112 <        atom->getPos(pos);
113 <        com[0] += pos[0] * mass;
114 <        com[1] += pos[1] * mass;
115 <        com[2] += pos[2] * mass;
110 >      if (cutoffAtomList.size() == 1) {
111 >        std::cerr << "YO!\n";
112 >        std::cerr << "atipos = " << beginAtom(i)->getPos() << "\n";
113 >        std::cerr << "lI = " << localIndex_ << "\n";
114 >
115 >        data.position[localIndex_] = beginAtom(i)->getPos();
116 >        std::cerr << "YOYO!\n";
117 >      } else {
118 >        data.position[localIndex_] = V3Zero;
119 >        for(atom = beginAtom(i); atom != NULL; atom = nextAtom(i)) {
120 >          data.position[localIndex_] += atom->getMass() * atom->getPos();
121 >        }        
122 >        data.position[localIndex_] /= totalMass;
123        }
70      
71      com[0] /= totalMass;
72      com[1] /= totalMass;
73      com[2] /= totalMass;
124      }
125 +
126 +
127 +    Vector3d getPos() {
128 +      return ((snapshotMan_->getCurrentSnapshot())->*storage_).position[localIndex_];      
129 +    }
130      
131 <  }
132 <  
133 <  int getNumAtom() {return cutoffAtomList.size();}
131 >    int getNumAtom() {
132 >      return cutoffAtomList.size();
133 >    }
134 >    
135 >    int getGlobalIndex() {
136 >      return globalIndex;
137 >    }
138 >    
139 >    void setGlobalIndex(int id) {
140 >      this->globalIndex = id;
141 >    }
142  
143 <  int getGlobalIndex() {return globalIndex;}
144 <  void setGlobalIndex(int id) {this->globalIndex = id;}
145 < private:
146 <  vector<Atom*> cutoffAtomList;
147 <  bool haveTotalMass;
148 <  double totalMass;
149 <  int globalIndex;
143 >    /**
144 >     * Returns the local index of this cutoffGroup
145 >     * @return the local index of this cutoffGroup
146 >     */
147 >    int getLocalIndex() {
148 >      return localIndex_;
149 >    }
150  
151 < };
151 >    /**
152 >     * Sets the local index of this cutoffGroup
153 >     * @param index new index to be set
154 >     */        
155 >    void setLocalIndex(int index) {
156 >      localIndex_ = index;
157 >    }
158 >    
159 >  private:
160 >    
161 >    std::vector<Atom *>cutoffAtomList;
162 >    bool haveTotalMass;
163 >    RealType totalMass;
164 >    int globalIndex;    
165  
166 < #endif
166 >    int localIndex_;
167 >    DataStoragePointer storage_;
168 >    SnapshotManager* snapshotMan_;
169 >
170 >  };  
171 > } //end namespace OpenMD
172 > #endif //PRIMITIVES_CUTOFFGROUP_HPP  

Comparing:
trunk/src/primitives/CutoffGroup.hpp (property svn:keywords), Revision 2 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
branches/development/src/primitives/CutoffGroup.hpp (property svn:keywords), Revision 1551 by gezelter, Thu Apr 28 18:38:21 2011 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines