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 1908 by gezelter, Fri Jul 19 21:25:45 2013 UTC vs.
Revision 2071 by gezelter, Sat Mar 7 21:41:51 2015 UTC

# Line 53 | Line 53
53   #include "primitives/Molecule.hpp"
54   #include "utils/MemoryUtils.hpp"
55   #include "utils/simError.h"
56 + #include "utils/StringUtils.hpp"
57  
58   namespace OpenMD {
59    Molecule::Molecule(int stampId, int globalIndex, const std::string& molName,
60 <                     int region) : stampId_(stampId),
60 >                     int region) :
61                                     globalIndex_(globalIndex),
62 <                                   moleculeName_(molName),
63 <                                   region_(region),
62 >                                   stampId_(stampId),
63 >                                   region_(region),
64 >                                   moleculeName_(molName),
65                                     constrainTotalCharge_(false) {
66    }
67    
# Line 145 | Line 147 | namespace OpenMD {
147      
148      std::set<Atom*> rigidAtoms;
149      Atom* atom;
150 <    AtomIterator ai;
150 >    Atom* atom1;
151 >    Atom* atom2;
152 >    AtomIterator ai, aj;
153      RigidBody* rb;
154      RigidBodyIterator rbIter;
155 +    Bond* bond;
156 +    BondIterator bi;
157  
158      // Get list of all the atoms that are part of rigid bodies
159  
# Line 182 | Line 188 | namespace OpenMD {
188          fluctuatingCharges_.push_back( atom );      
189      }
190  
185  }
191  
192 +    // find the electronegative atoms and add them to the
193 +    // hBondAcceptors_ vector:
194 +    
195 +    for (atom = beginAtom(ai); atom != NULL; atom = nextAtom(ai)) {
196 +      AtomType* at = atom->getAtomType();
197 +      // get the chain of base types for this atom type:
198 +      std::vector<AtomType*> ayb = at->allYourBase();
199 +      // use the last type in the chain of base types for the name:
200 +      std::string bn = UpperCase(ayb[ayb.size()-1]->getName());
201 +
202 +        if (bn.compare("O")==0 || bn.compare("N")==0
203 +            || bn.compare("F")==0)
204 +          hBondAcceptors_.push_back( atom );
205 +      
206 +    }
207 +    
208 +    // find electronegative atoms that are either bonded to
209 +    // hydrogens or are present in the same rigid bodies:
210 +    
211 +    for (bond = beginBond(bi); bond != NULL; bond = nextBond(bi)) {
212 +      Atom* atom1 = bond->getAtomA();
213 +      Atom* atom2 = bond->getAtomB();
214 +      AtomType* at1 = atom1->getAtomType();
215 +      AtomType* at2 = atom1->getAtomType();
216 +      // get the chain of base types for this atom type:
217 +      std::vector<AtomType*> ayb1 = at1->allYourBase();
218 +      std::vector<AtomType*> ayb2 = at2->allYourBase();
219 +      // use the last type in the chain of base types for the name:
220 +      std::string bn1 = UpperCase(ayb1[ayb1.size()-1]->getName());
221 +      std::string bn2 = UpperCase(ayb2[ayb2.size()-1]->getName());
222 +      
223 +      if (bn1.compare("H")==0) {
224 +        if (bn2.compare("O")==0 || bn2.compare("N")==0
225 +            || bn2.compare("F")==0) {
226 +          HBondDonor* donor = new HBondDonor();
227 +          donor->donorAtom = atom2;
228 +          donor->donatedHydrogen = atom1;
229 +          hBondDonors_.push_back( donor );
230 +        }
231 +      }
232 +      if (bn2.compare("H")==0) {
233 +        if (bn1.compare("O")==0 || bn1.compare("N")==0
234 +            || bn1.compare("F")==0) {
235 +          HBondDonor* donor = new HBondDonor();
236 +          donor->donorAtom = atom1;
237 +          donor->donatedHydrogen = atom2;
238 +            hBondDonors_.push_back( donor );
239 +        }
240 +      }
241 +    }
242 +    
243 +    for (rb = beginRigidBody(rbIter); rb != NULL;
244 +         rb = nextRigidBody(rbIter)) {
245 +      for(atom1 = rb->beginAtom(ai); atom1 != NULL;
246 +          atom1 = rb->nextAtom(ai)) {
247 +        AtomType* at1 = atom1->getAtomType();
248 +        // get the chain of base types for this atom type:
249 +        std::vector<AtomType*> ayb1 = at1->allYourBase();
250 +        // use the last type in the chain of base types for the name:
251 +        std::string bn1 = UpperCase(ayb1[ayb1.size()-1]->getName());
252 +        
253 +        if (bn1.compare("O")==0 || bn1.compare("N")==0
254 +            || bn1.compare("F")==0) {
255 +          for(atom2 = rb->beginAtom(aj); atom2 != NULL;
256 +              atom2 = rb->nextAtom(aj)) {
257 +            AtomType* at2 = atom2->getAtomType();
258 +            // get the chain of base types for this atom type:              
259 +            std::vector<AtomType*> ayb2 = at2->allYourBase();
260 +            // use the last type in the chain of base types for the name:
261 +            std::string bn2 = UpperCase(ayb2[ayb2.size()-1]->getName());
262 +            if (bn2.compare("H")==0) {              
263 +              HBondDonor* donor = new HBondDonor();
264 +              donor->donorAtom = atom1;
265 +              donor->donatedHydrogen = atom2;
266 +              hBondDonors_.push_back( donor );
267 +            }
268 +          }
269 +        }
270 +      }
271 +    }
272 +  }
273 +  
274    RealType Molecule::getMass() {
275      StuntDouble* sd;
276      std::vector<StuntDouble*>::iterator i;
# Line 215 | Line 302 | namespace OpenMD {
302  
303      return com;
304    }
305 +  
306 +  Vector3d Molecule::getCom(int snapshotNo) {
307 +    StuntDouble* sd;
308 +    std::vector<StuntDouble*>::iterator i;
309 +    Vector3d com;
310 +    RealType totalMass = 0;
311 +    RealType mass;
312 +    
313 +    for (sd = beginIntegrableObject(i); sd != NULL; sd =
314 +           nextIntegrableObject(i)){
315 +      mass = sd->getMass();
316 +      totalMass += mass;
317 +      com += sd->getPos(snapshotNo) * mass;    
318 +    }
319 +    
320 +    com /= totalMass;
321  
322 +    return com;
323 +  }
324 +
325    void Molecule::moveCom(const Vector3d& delta) {
326      StuntDouble* sd;
327      std::vector<StuntDouble*>::iterator i;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines