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

Comparing trunk/src/primitives/Molecule.cpp (file contents):
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC

# Line 56 | Line 56 | namespace oopse {
56   namespace oopse {
57    Molecule::Molecule(int stampId, int globalIndex, const std::string& molName)
58      : stampId_(stampId), globalIndex_(globalIndex), moleculeName_(molName) {
59 <
60 <    }
61 <
59 >  }
60 >  
61    Molecule::~Molecule() {
62 <
62 >    
63      MemoryUtils::deletePointers(atoms_);
64      MemoryUtils::deletePointers(bonds_);
65      MemoryUtils::deletePointers(bends_);
66      MemoryUtils::deletePointers(torsions_);
67 +    MemoryUtils::deletePointers(inversions_);
68      MemoryUtils::deletePointers(rigidBodies_);
69      MemoryUtils::deletePointers(cutoffGroups_);
70      MemoryUtils::deletePointers(constraintPairs_);
71      MemoryUtils::deletePointers(constraintElems_);
72 <    //integrableObjects_ don't own the objects
72 >    // integrableObjects_ don't own the objects
73      integrableObjects_.clear();
74      
75    }
76 <
76 >  
77    void Molecule::addAtom(Atom* atom) {
78      if (std::find(atoms_.begin(), atoms_.end(), atom) == atoms_.end()) {
79        atoms_.push_back(atom);
80      }
81    }
82 <
82 >  
83    void Molecule::addBond(Bond* bond) {
84      if (std::find(bonds_.begin(), bonds_.end(), bond) == bonds_.end()) {
85        bonds_.push_back(bond);
86      }
87    }
88 <
88 >  
89    void Molecule::addBend(Bend* bend) {
90      if (std::find(bends_.begin(), bends_.end(), bend) == bends_.end()) {
91        bends_.push_back(bend);
92      }
93    }
94 <
94 >  
95    void Molecule::addTorsion(Torsion* torsion) {
96 <    if (std::find(torsions_.begin(), torsions_.end(), torsion) == torsions_.end()) {
96 >    if (std::find(torsions_.begin(), torsions_.end(), torsion) ==
97 >        torsions_.end()) {
98        torsions_.push_back(torsion);
99      }
100    }
101  
102 +  void Molecule::addInversion(Inversion* inversion) {
103 +    if (std::find(inversions_.begin(), inversions_.end(), inversion) ==
104 +        inversions_.end()) {
105 +      inversions_.push_back(inversion);
106 +    }
107 +  }
108 +  
109    void Molecule::addRigidBody(RigidBody *rb) {
110 <    if (std::find(rigidBodies_.begin(), rigidBodies_.end(), rb) == rigidBodies_.end()) {
110 >    if (std::find(rigidBodies_.begin(), rigidBodies_.end(), rb) ==
111 >        rigidBodies_.end()) {
112        rigidBodies_.push_back(rb);
113      }
114    }
115 <
115 >  
116    void Molecule::addCutoffGroup(CutoffGroup* cp) {
117 <    if (std::find(cutoffGroups_.begin(), cutoffGroups_.end(), cp) == cutoffGroups_.end()) {
117 >    if (std::find(cutoffGroups_.begin(), cutoffGroups_.end(), cp) ==
118 >        cutoffGroups_.end()) {
119        cutoffGroups_.push_back(cp);
120 <    }
111 <
120 >    }    
121    }
122 <
122 >  
123    void Molecule::addConstraintPair(ConstraintPair* cp) {
124 <    if (std::find(constraintPairs_.begin(), constraintPairs_.end(), cp) == constraintPairs_.end()) {
124 >    if (std::find(constraintPairs_.begin(), constraintPairs_.end(), cp) ==
125 >        constraintPairs_.end()) {
126        constraintPairs_.push_back(cp);
127 <    }
118 <
127 >    }    
128    }
129 <
129 >  
130    void Molecule::addConstraintElem(ConstraintElem* cp) {
131 <    if (std::find(constraintElems_.begin(), constraintElems_.end(), cp) == constraintElems_.end()) {
131 >    if (std::find(constraintElems_.begin(), constraintElems_.end(), cp) ==
132 >        constraintElems_.end()) {
133        constraintElems_.push_back(cp);
134      }
125 –
135    }
136 <
136 >  
137    void Molecule::complete() {
138      
139      std::set<Atom*> rigidAtoms;
# Line 135 | Line 144 | namespace oopse {
144      for (rb = beginRigidBody(rbIter); rb != NULL; rb = nextRigidBody(rbIter)) {
145        rigidAtoms.insert(rb->getBeginAtomIter(), rb->getEndAtomIter());
146      }
147 <
147 >    
148      Atom* atom;
149      AtomIterator ai;
150      for (atom = beginAtom(ai); atom != NULL; atom = nextAtom(ai)) {
151 <  
151 >      
152        if (rigidAtoms.find(*ai) == rigidAtoms.end()) {
153 <        //if an atom does not belong to a rigid body, it is an integrable object
153 >
154 >        // If an atom does not belong to a rigid body, it is an
155 >        // integrable object
156 >
157          integrableObjects_.push_back(*ai);
158        }
159      }
160 <
160 >    
161      //find all free atoms (which do not belong to rigid bodies)  
162 <    //performs the "difference" operation from set theory,  the output range contains a copy of every
163 <    //element that is contained in [allAtoms.begin(), allAtoms.end()) and not contained in
164 <    //[rigidAtoms.begin(), rigidAtoms.end()).
162 >    // performs the "difference" operation from set theory, the output
163 >    // range contains a copy of every element that is contained in
164 >    // [allAtoms.begin(), allAtoms.end()) and not contained in
165 >    // [rigidAtoms.begin(), rigidAtoms.end()).
166      //std::set_difference(allAtoms.begin(), allAtoms.end(), rigidAtoms.begin(), rigidAtoms.end(),
167      //                        std::back_inserter(integrableObjects_));
168  
# Line 170 | Line 183 | namespace oopse {
183      StuntDouble* sd;
184      std::vector<StuntDouble*>::iterator i;
185      RealType mass = 0.0;
186 <
187 <    for (sd = beginIntegrableObject(i); sd != NULL; sd = nextIntegrableObject(i)){
186 >    
187 >    for (sd = beginIntegrableObject(i); sd != NULL; sd =
188 >           nextIntegrableObject(i)){
189        mass += sd->getMass();
190      }
191 <
192 <    return mass;
179 <
191 >    
192 >    return mass;    
193    }
194  
195    Vector3d Molecule::getCom() {
# Line 186 | Line 199 | namespace oopse {
199      RealType totalMass = 0;
200      RealType mass;
201      
202 <    for (sd = beginIntegrableObject(i); sd != NULL; sd = nextIntegrableObject(i)){
202 >    for (sd = beginIntegrableObject(i); sd != NULL; sd =
203 >           nextIntegrableObject(i)){
204        mass = sd->getMass();
205        totalMass += mass;
206        com += sd->getPos() * mass;    
207      }
208 <
208 >    
209      com /= totalMass;
210  
211      return com;
# Line 201 | Line 215 | namespace oopse {
215      StuntDouble* sd;
216      std::vector<StuntDouble*>::iterator i;
217      
218 <    for (sd = beginIntegrableObject(i); sd != NULL; sd = nextIntegrableObject(i)){
218 >    for (sd = beginIntegrableObject(i); sd != NULL; sd =
219 >           nextIntegrableObject(i)){
220        sd->setPos(sd->getPos() + delta);
221 <    }
207 <
221 >    }    
222    }
223  
224    Vector3d Molecule::getComVel() {
# Line 214 | Line 228 | namespace oopse {
228      RealType totalMass = 0;
229      RealType mass;
230      
231 <    for (sd = beginIntegrableObject(i); sd != NULL; sd = nextIntegrableObject(i)){
231 >    for (sd = beginIntegrableObject(i); sd != NULL; sd =
232 >           nextIntegrableObject(i)){
233        mass = sd->getMass();
234        totalMass += mass;
235        velCom += sd->getVel() * mass;    
236      }
237 <
237 >    
238      velCom /= totalMass;
239 <
239 >    
240      return velCom;
241    }
242  
# Line 230 | Line 245 | namespace oopse {
245      Bond* bond;
246      Bend* bend;
247      Torsion* torsion;
248 +    Inversion* inversion;
249      Molecule::BondIterator bondIter;;
250      Molecule::BendIterator  bendIter;
251      Molecule::TorsionIterator  torsionIter;
252 +    Molecule::InversionIterator  inversionIter;
253  
254      RealType potential = 0.0;
255  
# Line 244 | Line 261 | namespace oopse {
261        potential += bend->getPotential();
262      }
263  
264 <    for (torsion = beginTorsion(torsionIter); torsion != NULL; torsion = nextTorsion(torsionIter)) {
264 >    for (torsion = beginTorsion(torsionIter); torsion != NULL; torsion =
265 >           nextTorsion(torsionIter)) {
266        potential += torsion->getPotential();
267      }
268 <
268 >    
269 >    for (inversion = beginInversion(inversionIter); torsion != NULL;
270 >         inversion =  nextInversion(inversionIter)) {
271 >      potential += inversion->getPotential();
272 >    }
273 >    
274      return potential;
275 +    
276 +  }
277 +  
278 +  void Molecule::addProperty(GenericData* genData) {
279 +    properties_.addProperty(genData);  
280 +  }
281  
282 +  void Molecule::removeProperty(const std::string& propName) {
283 +    properties_.removeProperty(propName);  
284    }
285  
286 +  void Molecule::clearProperties() {
287 +    properties_.clearProperties();
288 +  }
289 +
290 +  std::vector<std::string> Molecule::getPropertyNames() {
291 +    return properties_.getPropertyNames();  
292 +  }
293 +      
294 +  std::vector<GenericData*> Molecule::getProperties() {
295 +    return properties_.getProperties();
296 +  }
297 +
298 +  GenericData* Molecule::getPropertyByName(const std::string& propName) {
299 +    return properties_.getPropertyByName(propName);
300 +  }
301 +
302 +
303 +
304 +
305    std::ostream& operator <<(std::ostream& o, Molecule& mol) {
306      o << std::endl;
307      o << "Molecule " << mol.getGlobalIndex() << "has: " << std::endl;
# Line 259 | Line 309 | namespace oopse {
309      o << mol.getNBonds() << " bonds" << std::endl;
310      o << mol.getNBends() << " bends" << std::endl;
311      o << mol.getNTorsions() << " torsions" << std::endl;
312 +    o << mol.getNInversions() << " inversions" << std::endl;
313      o << mol.getNRigidBodies() << " rigid bodies" << std::endl;
314      o << mol.getNIntegrableObjects() << "integrable objects" << std::endl;
315      o << mol.getNCutoffGroups() << "cutoff groups" << std::endl;
316      o << mol.getNConstraintPairs() << "constraint pairs" << std::endl;
317      return o;
318    }
319 <
319 >  
320   }//end namespace oopse

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines