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

Comparing:
trunk/src/brains/MoleculeCreator.cpp (file contents), Revision 1290 by cli2, Wed Sep 10 19:51:45 2008 UTC vs.
branches/development/src/brains/MoleculeCreator.cpp (file contents), Revision 1718 by gezelter, Thu May 24 01:29:59 2012 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
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]  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"
62  
63 < namespace oopse {
63 > namespace OpenMD {
64    
65    Molecule* MoleculeCreator::createMolecule(ForceField* ff,
66                                              MoleculeStamp *molStamp,
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 138 | Line 139 | namespace oopse {
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 oopse {
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
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->haveConstrainTotalCharge() ) {
184 +      mol->setConstrainTotalCharge( molStamp->getConstrainTotalCharge() );
185 +    }
186 +
187      //the construction of this molecule is finished
188      mol->complete();
189      
# Line 201 | Line 209 | namespace oopse {
209      
210      //below code still have some kind of hard-coding smell
211      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
212        DirectionalAtom* dAtom;
213 <      dAtom = new DirectionalAtom(dAtomType);
213 >      dAtom = new DirectionalAtom(atomType);
214        atom = dAtom;    
215      }
216      else{
# Line 257 | Line 255 | namespace oopse {
255      //The third part is the index of the rigidbody defined in meta-data file
256      //For example, Butane_RB_0 is a valid rigid body name of butane molecule
257      /**@todo replace itoa by lexi_cast */
258 <    std::string s = OOPSE_itoa(mol->getNRigidBodies(), 10);
258 >    std::string s = OpenMD_itoa(mol->getNRigidBodies(), 10);
259      rb->setType(mol->getType() + "_RB_" + s.c_str());
260  
261      return rb;
# Line 438 | Line 436 | namespace oopse {
436                atomD->getType().c_str());
437        
438        painCave.isFatal = 0;
439 <      painCave.severity = OOPSE_INFO;
439 >      painCave.severity = OPENMD_INFO;
440        simError();
441        return NULL;
442      } else {
# Line 449 | Line 447 | namespace oopse {
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 oopse {
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 1290 by cli2, Wed Sep 10 19:51:45 2008 UTC vs.
branches/development/src/brains/MoleculeCreator.cpp (property svn:keywords), Revision 1718 by gezelter, Thu May 24 01:29:59 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines