ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/brains/MoleculeCreator.cpp
(Generate patch)

Comparing trunk/src/brains/MoleculeCreator.cpp (file contents):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

# Line 35 | Line 35
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).                        
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   /**
44   * @file MoleculeCreator.cpp
45   * @author tlin
46   * @date 11/04/2004
46 * @time 13:44am
47   * @version 1.0
48   */
49  
# Line 54 | Line 54
54   #include "brains/MoleculeCreator.hpp"
55   #include "primitives/GhostBend.hpp"
56   #include "primitives/GhostTorsion.hpp"
57 < #include "types/DirectionalAtomType.hpp"
57 > #include "types/AtomType.hpp"
58   #include "types/FixedBondType.hpp"
59   #include "utils/simError.h"
60   #include "utils/StringUtils.hpp"
# Line 66 | Line 66 | namespace OpenMD {
66                                              int stampId, int globalIndex,
67                                              LocalIndexManager* localIndexMan) {
68      Molecule* mol = new Molecule(stampId, globalIndex, molStamp->getName());
69 <    
69 >
70      //create atoms
71      Atom* atom;
72      AtomStamp* currentAtomStamp;
# Line 138 | Line 138 | namespace OpenMD {
138      int nCutoffGroups = molStamp->getNCutoffGroups();
139      for (int i = 0; i < nCutoffGroups; ++i) {
140        currentCutoffGroupStamp = molStamp->getCutoffGroupStamp(i);
141 <      cutoffGroup = createCutoffGroup(mol, currentCutoffGroupStamp);
141 >      cutoffGroup = createCutoffGroup(mol, currentCutoffGroupStamp, localIndexMan);
142        mol->addCutoffGroup(cutoffGroup);
143      }
144  
# Line 169 | Line 169 | namespace OpenMD {
169      // every single free atom
170      
171      for (fai = freeAtoms.begin(); fai != freeAtoms.end(); ++fai) {
172 <      cutoffGroup = createCutoffGroup(mol, *fai);
172 >      cutoffGroup = createCutoffGroup(mol, *fai, localIndexMan);
173        mol->addCutoffGroup(cutoffGroup);
174      }
175      //create constraints
176      createConstraintPair(mol);
177      createConstraintElem(mol);
178      
179 +    // Does this molecule stamp define a total constrained charge value?
180 +    // If so, let the created molecule know about it.
181 +
182 +    if (molStamp->haveConstrainTotalCharge() ) {
183 +      mol->setConstrainTotalCharge( molStamp->getConstrainTotalCharge() );
184 +    }
185 +
186      //the construction of this molecule is finished
187      mol->complete();
188      
# Line 198 | Line 205 | namespace OpenMD {
205        painCave.isFatal = 1;
206        simError();
207      }
208 <    
208 >
209      //below code still have some kind of hard-coding smell
210      if (atomType->isDirectional()){
204    
205      DirectionalAtomType* dAtomType = dynamic_cast<DirectionalAtomType*>(atomType);
206        
207      if (dAtomType == NULL) {
208        sprintf(painCave.errMsg, "Can not cast AtomType to DirectionalAtomType");
211  
210        painCave.isFatal = 1;
211        simError();
212      }
213
212        DirectionalAtom* dAtom;
213 <      dAtom = new DirectionalAtom(dAtomType);
213 >      dAtom = new DirectionalAtom(atomType);
214        atom = dAtom;    
215      }
216      else{
# Line 449 | Line 447 | namespace OpenMD {
447    }
448    
449  
450 <  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule* mol, CutoffGroupStamp* stamp) {
450 >  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule* mol,
451 >                                                  CutoffGroupStamp* stamp,
452 >                                                  LocalIndexManager* localIndexMan) {
453      int nAtoms;
454      CutoffGroup* cg;
455      Atom* atom;
# Line 461 | Line 461 | namespace OpenMD {
461        assert(atom);
462        cg->addAtom(atom);
463      }
464 <
464 >    
465 >    //set the local index of this cutoffGroup, global index will be set later
466 >    cg->setLocalIndex(localIndexMan->getNextCutoffGroupIndex());
467 >    
468      return cg;
469    }    
470 <
471 <  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule * mol, Atom* atom) {
470 >  
471 >  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule * mol, Atom* atom,
472 >                                                  LocalIndexManager* localIndexMan) {
473      CutoffGroup* cg;
474      cg  = new CutoffGroup();
475      cg->addAtom(atom);
476 +
477 +    //set the local index of this cutoffGroup, global index will be set later
478 +    cg->setLocalIndex(localIndexMan->getNextCutoffGroupIndex());
479 +
480      return cg;
481    }
482  

Comparing trunk/src/brains/MoleculeCreator.cpp (property svn:keywords):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines