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 1710 by gezelter, Fri May 18 21:44:02 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,
# 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
# Line 201 | Line 202 | namespace oopse {
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 257 | Line 248 | namespace oopse {
248      //The third part is the index of the rigidbody defined in meta-data file
249      //For example, Butane_RB_0 is a valid rigid body name of butane molecule
250      /**@todo replace itoa by lexi_cast */
251 <    std::string s = OOPSE_itoa(mol->getNRigidBodies(), 10);
251 >    std::string s = OpenMD_itoa(mol->getNRigidBodies(), 10);
252      rb->setType(mol->getType() + "_RB_" + s.c_str());
253  
254      return rb;
# Line 438 | Line 429 | namespace oopse {
429                atomD->getType().c_str());
430        
431        painCave.isFatal = 0;
432 <      painCave.severity = OOPSE_INFO;
432 >      painCave.severity = OPENMD_INFO;
433        simError();
434        return NULL;
435      } else {
# Line 449 | Line 440 | namespace oopse {
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 oopse {
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  

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 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines