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 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1715 by gezelter, Tue May 22 21:55:31 2012 UTC

# Line 55 | 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 67 | Line 67 | namespace OpenMD {
67                                              int stampId, int globalIndex,
68                                              LocalIndexManager* localIndexMan) {
69      Molecule* mol = new Molecule(stampId, globalIndex, molStamp->getName());
70 <    
70 >
71      //create atoms
72      Atom* atom;
73      AtomStamp* currentAtomStamp;
# Line 177 | Line 177 | namespace OpenMD {
177      createConstraintPair(mol);
178      createConstraintElem(mol);
179      
180 +    // Does this molecule stamp define a total constrained charge value?
181 +    // If so, let the created molecule know about it.
182 +
183 +    if (molStamp->haveConstrainedCharge() ) {
184 +      mol->setConstrainedCharge( molStamp->getConstrainedCharge() );
185 +    }
186 +
187      //the construction of this molecule is finished
188      mol->complete();
189      
# Line 202 | Line 209 | namespace OpenMD {
209      
210      //below code still have some kind of hard-coding smell
211      if (atomType->isDirectional()){
212 <    
213 <      DirectionalAtomType* dAtomType = dynamic_cast<DirectionalAtomType*>(atomType);
207 <        
208 <      if (dAtomType == NULL) {
209 <        sprintf(painCave.errMsg, "Can not cast AtomType to DirectionalAtomType");
210 <
211 <        painCave.isFatal = 1;
212 <        simError();
213 <      }
214 <
215 <      DirectionalAtom* dAtom;
216 <      dAtom = new DirectionalAtom(dAtomType);
212 >      DirectionalAtom* dAtom;
213 >      dAtom = new DirectionalAtom(atomType);
214        atom = dAtom;    
215      }
216      else{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines