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

Comparing branches/development/src/brains/MoleculeCreator.cpp (file contents):
Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

# Line 36 | Line 36
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).                        
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 54 | Line 55
55   #include "brains/MoleculeCreator.hpp"
56   #include "primitives/GhostBend.hpp"
57   #include "primitives/GhostTorsion.hpp"
58 < #include "types/DirectionalAtomType.hpp"
58 > #include "types/AtomType.hpp"
59   #include "types/FixedBondType.hpp"
60   #include "utils/simError.h"
61   #include "utils/StringUtils.hpp"
# Line 138 | Line 139 | namespace OpenMD {
139      int nCutoffGroups = molStamp->getNCutoffGroups();
140      for (int i = 0; i < nCutoffGroups; ++i) {
141        currentCutoffGroupStamp = molStamp->getCutoffGroupStamp(i);
142 <      cutoffGroup = createCutoffGroup(mol, currentCutoffGroupStamp);
142 >      cutoffGroup = createCutoffGroup(mol, currentCutoffGroupStamp, localIndexMan);
143        mol->addCutoffGroup(cutoffGroup);
144      }
145  
# Line 169 | Line 170 | namespace OpenMD {
170      // every single free atom
171      
172      for (fai = freeAtoms.begin(); fai != freeAtoms.end(); ++fai) {
173 <      cutoffGroup = createCutoffGroup(mol, *fai);
173 >      cutoffGroup = createCutoffGroup(mol, *fai, localIndexMan);
174        mol->addCutoffGroup(cutoffGroup);
175      }
176      //create constraints
# Line 201 | Line 202 | namespace OpenMD {
202      
203      //below code still have some kind of hard-coding smell
204      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");
209
210        painCave.isFatal = 1;
211        simError();
212      }
213
205        DirectionalAtom* dAtom;
206 <      dAtom = new DirectionalAtom(dAtomType);
206 >      dAtom = new DirectionalAtom(atomType);
207        atom = dAtom;    
208      }
209      else{
# Line 449 | Line 440 | namespace OpenMD {
440    }
441    
442  
443 <  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule* mol, CutoffGroupStamp* stamp) {
443 >  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule* mol,
444 >                                                  CutoffGroupStamp* stamp,
445 >                                                  LocalIndexManager* localIndexMan) {
446      int nAtoms;
447      CutoffGroup* cg;
448      Atom* atom;
# Line 461 | Line 454 | namespace OpenMD {
454        assert(atom);
455        cg->addAtom(atom);
456      }
457 <
457 >    
458 >    //set the local index of this cutoffGroup, global index will be set later
459 >    cg->setLocalIndex(localIndexMan->getNextCutoffGroupIndex());
460 >    
461      return cg;
462    }    
463 <
464 <  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule * mol, Atom* atom) {
463 >  
464 >  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule * mol, Atom* atom,
465 >                                                  LocalIndexManager* localIndexMan) {
466      CutoffGroup* cg;
467      cg  = new CutoffGroup();
468      cg->addAtom(atom);
469 +
470 +    //set the local index of this cutoffGroup, global index will be set later
471 +    cg->setLocalIndex(localIndexMan->getNextCutoffGroupIndex());
472 +
473      return cg;
474    }
475  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines