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 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
Revision 1908 by gezelter, Fri Jul 19 21:25:45 2013 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, 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"
61  
62 < namespace oopse {
62 > namespace OpenMD {
63    
64    Molecule* MoleculeCreator::createMolecule(ForceField* ff,
65                                              MoleculeStamp *molStamp,
66                                              int stampId, int globalIndex,
67                                              LocalIndexManager* localIndexMan) {
68 <    Molecule* mol = new Molecule(stampId, globalIndex, molStamp->getName());
69 <    
68 >    Molecule* mol = new Molecule(stampId, globalIndex, molStamp->getName(),
69 >                                 molStamp->getRegion() );
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 198 | Line 206 | namespace oopse {
206        painCave.isFatal = 1;
207        simError();
208      }
209 <    
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");
212  
210        painCave.isFatal = 1;
211        simError();
212      }
213
213        DirectionalAtom* dAtom;
214 <      dAtom = new DirectionalAtom(dAtomType);
214 >      dAtom = new DirectionalAtom(atomType);
215        atom = dAtom;    
216      }
217      else{
# Line 257 | Line 256 | namespace oopse {
256      //The third part is the index of the rigidbody defined in meta-data file
257      //For example, Butane_RB_0 is a valid rigid body name of butane molecule
258      /**@todo replace itoa by lexi_cast */
259 <    std::string s = OOPSE_itoa(mol->getNRigidBodies(), 10);
259 >    std::string s = OpenMD_itoa(mol->getNRigidBodies(), 10);
260      rb->setType(mol->getType() + "_RB_" + s.c_str());
261  
262      return rb;
# Line 365 | Line 364 | namespace oopse {
364                                                      atomB->getType(),
365                                                      atomC->getType(),
366                                                      atomD->getType());
368
367        if (torsionType == NULL) {
368          sprintf(painCave.errMsg, "Can not find Matching Torsion Type for[%s, %s, %s, %s]",
369                  atomA->getType().c_str(),
# Line 439 | Line 437 | namespace oopse {
437                atomD->getType().c_str());
438        
439        painCave.isFatal = 0;
440 <      painCave.severity = OOPSE_INFO;
440 >      painCave.severity = OPENMD_INFO;
441        simError();
442        return NULL;
443      } else {
# Line 450 | Line 448 | namespace oopse {
448    }
449    
450  
451 <  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule* mol, CutoffGroupStamp* stamp) {
451 >  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule* mol,
452 >                                                  CutoffGroupStamp* stamp,
453 >                                                  LocalIndexManager* localIndexMan) {
454      int nAtoms;
455      CutoffGroup* cg;
456      Atom* atom;
# Line 462 | Line 462 | namespace oopse {
462        assert(atom);
463        cg->addAtom(atom);
464      }
465 <
465 >    
466 >    //set the local index of this cutoffGroup, global index will be set later
467 >    cg->setLocalIndex(localIndexMan->getNextCutoffGroupIndex());
468 >    
469      return cg;
470    }    
471 <
472 <  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule * mol, Atom* atom) {
471 >  
472 >  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule * mol, Atom* atom,
473 >                                                  LocalIndexManager* localIndexMan) {
474      CutoffGroup* cg;
475      cg  = new CutoffGroup();
476      cg->addAtom(atom);
477 +
478 +    //set the local index of this cutoffGroup, global index will be set later
479 +    cg->setLocalIndex(localIndexMan->getNextCutoffGroupIndex());
480 +
481      return cg;
482    }
483  

Comparing trunk/src/brains/MoleculeCreator.cpp (property svn:keywords):
Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
Revision 1908 by gezelter, Fri Jul 19 21:25:45 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines