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 1710 by gezelter, Fri May 18 21:44:02 2012 UTC vs.
Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 UTC

# Line 44 | Line 44
44   * @file MoleculeCreator.cpp
45   * @author tlin
46   * @date 11/04/2004
47 * @time 13:44am
47   * @version 1.0
48   */
49  
# Line 67 | 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 177 | Line 176 | namespace OpenMD {
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 199 | 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()){
211 +
212        DirectionalAtom* dAtom;
213        dAtom = new DirectionalAtom(atomType);
214        atom = dAtom;    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines