ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/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 1908 by gezelter, Fri Jul 19 21:25:45 2013 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
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.
# Line 37 | Line 28
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, 234107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 53 | Line 54
54   #include "utils/MemoryUtils.hpp"
55   #include "utils/simError.h"
56  
57 < namespace oopse {
58 <  Molecule::Molecule(int stampId, int globalIndex, const std::string& molName)
59 <    : stampId_(stampId), globalIndex_(globalIndex), moleculeName_(molName) {
60 <
61 <    }
62 <
57 > namespace OpenMD {
58 >  Molecule::Molecule(int stampId, int globalIndex, const std::string& molName,
59 >                     int region) : stampId_(stampId),
60 >                                   globalIndex_(globalIndex),
61 >                                   moleculeName_(molName),
62 >                                   region_(region),
63 >                                   constrainTotalCharge_(false) {
64 >  }
65 >  
66    Molecule::~Molecule() {
67 <
67 >    
68      MemoryUtils::deletePointers(atoms_);
69      MemoryUtils::deletePointers(bonds_);
70      MemoryUtils::deletePointers(bends_);
71      MemoryUtils::deletePointers(torsions_);
72 +    MemoryUtils::deletePointers(inversions_);
73      MemoryUtils::deletePointers(rigidBodies_);
74      MemoryUtils::deletePointers(cutoffGroups_);
75      MemoryUtils::deletePointers(constraintPairs_);
76      MemoryUtils::deletePointers(constraintElems_);
77 <    //integrableObjects_ don't own the objects
77 >
78 >    // integrableObjects_ don't own the objects
79      integrableObjects_.clear();
80 +    fluctuatingCharges_.clear();
81      
82    }
83 <
83 >  
84    void Molecule::addAtom(Atom* atom) {
85      if (std::find(atoms_.begin(), atoms_.end(), atom) == atoms_.end()) {
86        atoms_.push_back(atom);
87      }
88    }
89 <
89 >  
90    void Molecule::addBond(Bond* bond) {
91      if (std::find(bonds_.begin(), bonds_.end(), bond) == bonds_.end()) {
92        bonds_.push_back(bond);
93      }
94    }
95 <
95 >  
96    void Molecule::addBend(Bend* bend) {
97      if (std::find(bends_.begin(), bends_.end(), bend) == bends_.end()) {
98        bends_.push_back(bend);
99      }
100    }
101 <
101 >  
102    void Molecule::addTorsion(Torsion* torsion) {
103 <    if (std::find(torsions_.begin(), torsions_.end(), torsion) == torsions_.end()) {
103 >    if (std::find(torsions_.begin(), torsions_.end(), torsion) ==
104 >        torsions_.end()) {
105        torsions_.push_back(torsion);
106      }
107    }
108  
109 +  void Molecule::addInversion(Inversion* inversion) {
110 +    if (std::find(inversions_.begin(), inversions_.end(), inversion) ==
111 +        inversions_.end()) {
112 +      inversions_.push_back(inversion);
113 +    }
114 +  }
115 +  
116    void Molecule::addRigidBody(RigidBody *rb) {
117 <    if (std::find(rigidBodies_.begin(), rigidBodies_.end(), rb) == rigidBodies_.end()) {
117 >    if (std::find(rigidBodies_.begin(), rigidBodies_.end(), rb) ==
118 >        rigidBodies_.end()) {
119        rigidBodies_.push_back(rb);
120      }
121    }
122 <
122 >  
123    void Molecule::addCutoffGroup(CutoffGroup* cp) {
124 <    if (std::find(cutoffGroups_.begin(), cutoffGroups_.end(), cp) == cutoffGroups_.end()) {
124 >    if (std::find(cutoffGroups_.begin(), cutoffGroups_.end(), cp) ==
125 >        cutoffGroups_.end()) {
126        cutoffGroups_.push_back(cp);
127 <    }
111 <
127 >    }    
128    }
129 <
129 >  
130    void Molecule::addConstraintPair(ConstraintPair* cp) {
131 <    if (std::find(constraintPairs_.begin(), constraintPairs_.end(), cp) == constraintPairs_.end()) {
131 >    if (std::find(constraintPairs_.begin(), constraintPairs_.end(), cp) ==
132 >        constraintPairs_.end()) {
133        constraintPairs_.push_back(cp);
134 <    }
118 <
134 >    }    
135    }
136 <
136 >  
137    void Molecule::addConstraintElem(ConstraintElem* cp) {
138 <    if (std::find(constraintElems_.begin(), constraintElems_.end(), cp) == constraintElems_.end()) {
138 >    if (std::find(constraintElems_.begin(), constraintElems_.end(), cp) ==
139 >        constraintElems_.end()) {
140        constraintElems_.push_back(cp);
141      }
125
142    }
143 <
143 >  
144    void Molecule::complete() {
145      
146      std::set<Atom*> rigidAtoms;
147 +    Atom* atom;
148 +    AtomIterator ai;
149      RigidBody* rb;
150 <    std::vector<RigidBody*>::iterator rbIter;
150 >    RigidBodyIterator rbIter;
151  
152 <    
152 >    // Get list of all the atoms that are part of rigid bodies
153 >
154      for (rb = beginRigidBody(rbIter); rb != NULL; rb = nextRigidBody(rbIter)) {
155        rigidAtoms.insert(rb->getBeginAtomIter(), rb->getEndAtomIter());
156      }
157 +    
158 +    // add any atom that wasn't part of a rigid body to the list of integrableObjects
159  
139    Atom* atom;
140    AtomIterator ai;
160      for (atom = beginAtom(ai); atom != NULL; atom = nextAtom(ai)) {
161 <  
162 <      if (rigidAtoms.find(*ai) == rigidAtoms.end()) {
163 <        //if an atom does not belong to a rigid body, it is an integrable object
164 <        integrableObjects_.push_back(*ai);
161 >      
162 >      if (rigidAtoms.find(atom) == rigidAtoms.end()) {
163 >
164 >        // If an atom does not belong to a rigid body, it is an
165 >        // integrable object
166 >
167 >        integrableObjects_.push_back(atom);
168        }
169      }
170 +    
171 +    // then add the rigid bodies themselves to the integrableObjects
172  
149    //find all free atoms (which do not belong to rigid bodies)  
150    //performs the "difference" operation from set theory,  the output range contains a copy of every
151    //element that is contained in [allAtoms.begin(), allAtoms.end()) and not contained in
152    //[rigidAtoms.begin(), rigidAtoms.end()).
153    //std::set_difference(allAtoms.begin(), allAtoms.end(), rigidAtoms.begin(), rigidAtoms.end(),
154    //                        std::back_inserter(integrableObjects_));
155
156    //if (integrableObjects_.size() != allAtoms.size() - rigidAtoms.size()) {
157    //    //Some atoms in rigidAtoms are not in allAtoms, something must be wrong
158    //    sprintf(painCave.errMsg, "Atoms in rigidbody are not in the atom list of the same molecule");
159    //
160    //    painCave.isFatal = 1;
161    //    simError();        
162    //}
173      for (rb = beginRigidBody(rbIter); rb != NULL; rb = nextRigidBody(rbIter)) {
174        integrableObjects_.push_back(rb);
175      }
176 <    //integrableObjects_.insert(integrableObjects_.end(), rigidBodies_.begin(), rigidBodies_.end());
176 >
177 >    // find the atoms that are fluctuating charges and add them to the
178 >    // fluctuatingCharges_ vector
179 >
180 >    for (atom = beginAtom(ai); atom != NULL; atom = nextAtom(ai)) {
181 >      if ( atom->isFluctuatingCharge() )
182 >        fluctuatingCharges_.push_back( atom );      
183 >    }
184 >
185    }
186  
187    RealType Molecule::getMass() {
188      StuntDouble* sd;
189      std::vector<StuntDouble*>::iterator i;
190      RealType mass = 0.0;
191 <
192 <    for (sd = beginIntegrableObject(i); sd != NULL; sd = nextIntegrableObject(i)){
191 >    
192 >    for (sd = beginIntegrableObject(i); sd != NULL; sd =
193 >           nextIntegrableObject(i)){
194        mass += sd->getMass();
195      }
196 <
197 <    return mass;
179 <
196 >    
197 >    return mass;    
198    }
199  
200    Vector3d Molecule::getCom() {
# Line 186 | Line 204 | namespace oopse {
204      RealType totalMass = 0;
205      RealType mass;
206      
207 <    for (sd = beginIntegrableObject(i); sd != NULL; sd = nextIntegrableObject(i)){
207 >    for (sd = beginIntegrableObject(i); sd != NULL; sd =
208 >           nextIntegrableObject(i)){
209        mass = sd->getMass();
210        totalMass += mass;
211        com += sd->getPos() * mass;    
212      }
213 <
213 >    
214      com /= totalMass;
215  
216      return com;
# Line 201 | Line 220 | namespace oopse {
220      StuntDouble* sd;
221      std::vector<StuntDouble*>::iterator i;
222      
223 <    for (sd = beginIntegrableObject(i); sd != NULL; sd = nextIntegrableObject(i)){
223 >    for (sd = beginIntegrableObject(i); sd != NULL; sd =
224 >           nextIntegrableObject(i)){
225        sd->setPos(sd->getPos() + delta);
226 <    }
207 <
226 >    }    
227    }
228  
229    Vector3d Molecule::getComVel() {
# Line 214 | Line 233 | namespace oopse {
233      RealType totalMass = 0;
234      RealType mass;
235      
236 <    for (sd = beginIntegrableObject(i); sd != NULL; sd = nextIntegrableObject(i)){
236 >    for (sd = beginIntegrableObject(i); sd != NULL; sd =
237 >           nextIntegrableObject(i)){
238        mass = sd->getMass();
239        totalMass += mass;
240        velCom += sd->getVel() * mass;    
241      }
242 <
242 >    
243      velCom /= totalMass;
244 <
244 >    
245      return velCom;
246    }
247  
# Line 230 | Line 250 | namespace oopse {
250      Bond* bond;
251      Bend* bend;
252      Torsion* torsion;
253 +    Inversion* inversion;
254      Molecule::BondIterator bondIter;;
255      Molecule::BendIterator  bendIter;
256      Molecule::TorsionIterator  torsionIter;
257 +    Molecule::InversionIterator  inversionIter;
258  
259      RealType potential = 0.0;
260  
# Line 244 | Line 266 | namespace oopse {
266        potential += bend->getPotential();
267      }
268  
269 <    for (torsion = beginTorsion(torsionIter); torsion != NULL; torsion = nextTorsion(torsionIter)) {
269 >    for (torsion = beginTorsion(torsionIter); torsion != NULL; torsion =
270 >           nextTorsion(torsionIter)) {
271        potential += torsion->getPotential();
272      }
273 <
273 >    
274 >    for (inversion = beginInversion(inversionIter); torsion != NULL;
275 >         inversion =  nextInversion(inversionIter)) {
276 >      potential += inversion->getPotential();
277 >    }
278 >    
279      return potential;
280 +    
281 +  }
282 +  
283 +  void Molecule::addProperty(GenericData* genData) {
284 +    properties_.addProperty(genData);  
285 +  }
286  
287 +  void Molecule::removeProperty(const std::string& propName) {
288 +    properties_.removeProperty(propName);  
289    }
290  
291 +  void Molecule::clearProperties() {
292 +    properties_.clearProperties();
293 +  }
294 +
295 +  std::vector<std::string> Molecule::getPropertyNames() {
296 +    return properties_.getPropertyNames();  
297 +  }
298 +      
299 +  std::vector<GenericData*> Molecule::getProperties() {
300 +    return properties_.getProperties();
301 +  }
302 +
303 +  GenericData* Molecule::getPropertyByName(const std::string& propName) {
304 +    return properties_.getPropertyByName(propName);
305 +  }
306 +
307    std::ostream& operator <<(std::ostream& o, Molecule& mol) {
308      o << std::endl;
309      o << "Molecule " << mol.getGlobalIndex() << "has: " << std::endl;
# Line 259 | Line 311 | namespace oopse {
311      o << mol.getNBonds() << " bonds" << std::endl;
312      o << mol.getNBends() << " bends" << std::endl;
313      o << mol.getNTorsions() << " torsions" << std::endl;
314 +    o << mol.getNInversions() << " inversions" << std::endl;
315      o << mol.getNRigidBodies() << " rigid bodies" << std::endl;
316 <    o << mol.getNIntegrableObjects() << "integrable objects" << std::endl;
317 <    o << mol.getNCutoffGroups() << "cutoff groups" << std::endl;
318 <    o << mol.getNConstraintPairs() << "constraint pairs" << std::endl;
316 >    o << mol.getNIntegrableObjects() << " integrable objects" << std::endl;
317 >    o << mol.getNCutoffGroups() << " cutoff groups" << std::endl;
318 >    o << mol.getNConstraintPairs() << " constraint pairs" << std::endl;
319 >    o << mol.getNFluctuatingCharges() << " fluctuating charges" << std::endl;
320      return o;
321    }
322 <
323 < }//end namespace oopse
322 >  
323 > }//end namespace OpenMD

Comparing trunk/src/primitives/Molecule.cpp (property svn:keywords):
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1908 by gezelter, Fri Jul 19 21:25:45 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines