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

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs.
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 36 | Line 36
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]  Vardeman & Gezelter, in progress (2009).                        
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 "math/Vector3.hpp"
56   #include "primitives/Molecule.hpp"
57   #include "primitives/StuntDouble.hpp"
57 – #include "UseTheForce/fCutoffPolicy.h"
58 – #include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
59 – #include "UseTheForce/doForces_interface.h"
60 – #include "UseTheForce/DarkSide/neighborLists_interface.h"
61 – #include "UseTheForce/DarkSide/switcheroo_interface.h"
58   #include "utils/MemoryUtils.hpp"
59   #include "utils/simError.h"
60   #include "selection/SelectionManager.hpp"
61   #include "io/ForceFieldOptions.hpp"
62   #include "UseTheForce/ForceField.hpp"
63 <
68 <
63 > #include "nonbonded/SwitchingFunction.hpp"
64   #ifdef IS_MPI
65 < #include "UseTheForce/mpiComponentPlan.h"
66 < #include "UseTheForce/DarkSide/simParallel_interface.h"
72 < #endif
65 > #include <mpi.h>
66 > #endif
67  
68 + using namespace std;
69   namespace OpenMD {
75 –  std::set<int> getRigidSet(int index, std::map<int, std::set<int> >& container) {
76 –    std::map<int, std::set<int> >::iterator i = container.find(index);
77 –    std::set<int> result;
78 –    if (i != container.end()) {
79 –        result = i->second;
80 –    }
81 –
82 –    return result;
83 –  }
70    
71    SimInfo::SimInfo(ForceField* ff, Globals* simParams) :
72      forceField_(ff), simParams_(simParams),
# Line 89 | Line 75 | namespace OpenMD {
75      nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
76      nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nInversions_(0),
77      nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
78 <    nConstraints_(0), sman_(NULL), fortranInitialized_(false),
79 <    calcBoxDipole_(false), useAtomicVirial_(true) {
80 <
81 <
82 <      MoleculeStamp* molStamp;
83 <      int nMolWithSameStamp;
84 <      int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
85 <      int nGroups = 0;      //total cutoff groups defined in meta-data file
86 <      CutoffGroupStamp* cgStamp;    
87 <      RigidBodyStamp* rbStamp;
88 <      int nRigidAtoms = 0;
89 <
90 <      std::vector<Component*> components = simParams->getComponents();
78 >    nConstraints_(0), sman_(NULL), topologyDone_(false),
79 >    calcBoxDipole_(false), useAtomicVirial_(true) {    
80 >    
81 >    MoleculeStamp* molStamp;
82 >    int nMolWithSameStamp;
83 >    int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
84 >    int nGroups = 0;       //total cutoff groups defined in meta-data file
85 >    CutoffGroupStamp* cgStamp;    
86 >    RigidBodyStamp* rbStamp;
87 >    int nRigidAtoms = 0;
88 >    
89 >    vector<Component*> components = simParams->getComponents();
90 >    
91 >    for (vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
92 >      molStamp = (*i)->getMoleculeStamp();
93 >      nMolWithSameStamp = (*i)->getNMol();
94        
95 <      for (std::vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
96 <        molStamp = (*i)->getMoleculeStamp();
97 <        nMolWithSameStamp = (*i)->getNMol();
98 <        
99 <        addMoleculeStamp(molStamp, nMolWithSameStamp);
100 <
101 <        //calculate atoms in molecules
102 <        nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;  
103 <
104 <        //calculate atoms in cutoff groups
105 <        int nAtomsInGroups = 0;
106 <        int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
118 <        
119 <        for (int j=0; j < nCutoffGroupsInStamp; j++) {
120 <          cgStamp = molStamp->getCutoffGroupStamp(j);
121 <          nAtomsInGroups += cgStamp->getNMembers();
122 <        }
123 <
124 <        nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
125 <
126 <        nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;            
127 <
128 <        //calculate atoms in rigid bodies
129 <        int nAtomsInRigidBodies = 0;
130 <        int nRigidBodiesInStamp = molStamp->getNRigidBodies();
131 <        
132 <        for (int j=0; j < nRigidBodiesInStamp; j++) {
133 <          rbStamp = molStamp->getRigidBodyStamp(j);
134 <          nAtomsInRigidBodies += rbStamp->getNMembers();
135 <        }
136 <
137 <        nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
138 <        nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;            
139 <        
95 >      addMoleculeStamp(molStamp, nMolWithSameStamp);
96 >      
97 >      //calculate atoms in molecules
98 >      nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;  
99 >      
100 >      //calculate atoms in cutoff groups
101 >      int nAtomsInGroups = 0;
102 >      int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
103 >      
104 >      for (int j=0; j < nCutoffGroupsInStamp; j++) {
105 >        cgStamp = molStamp->getCutoffGroupStamp(j);
106 >        nAtomsInGroups += cgStamp->getNMembers();
107        }
108 <
109 <      //every free atom (atom does not belong to cutoff groups) is a cutoff
110 <      //group therefore the total number of cutoff groups in the system is
111 <      //equal to the total number of atoms minus number of atoms belong to
112 <      //cutoff group defined in meta-data file plus the number of cutoff
113 <      //groups defined in meta-data file
114 <      nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
115 <
116 <      //every free atom (atom does not belong to rigid bodies) is an
117 <      //integrable object therefore the total number of integrable objects
118 <      //in the system is equal to the total number of atoms minus number of
119 <      //atoms belong to rigid body defined in meta-data file plus the number
120 <      //of rigid bodies defined in meta-data file
121 <      nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
122 <                                                + nGlobalRigidBodies_;
123 <  
124 <      nGlobalMols_ = molStampIds_.size();
158 <      molToProcMap_.resize(nGlobalMols_);
108 >      
109 >      nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
110 >      
111 >      nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;            
112 >      
113 >      //calculate atoms in rigid bodies
114 >      int nAtomsInRigidBodies = 0;
115 >      int nRigidBodiesInStamp = molStamp->getNRigidBodies();
116 >      
117 >      for (int j=0; j < nRigidBodiesInStamp; j++) {
118 >        rbStamp = molStamp->getRigidBodyStamp(j);
119 >        nAtomsInRigidBodies += rbStamp->getNMembers();
120 >      }
121 >      
122 >      nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
123 >      nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;            
124 >      
125      }
126 +    
127 +    //every free atom (atom does not belong to cutoff groups) is a cutoff
128 +    //group therefore the total number of cutoff groups in the system is
129 +    //equal to the total number of atoms minus number of atoms belong to
130 +    //cutoff group defined in meta-data file plus the number of cutoff
131 +    //groups defined in meta-data file
132  
133 +    nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
134 +    
135 +    //every free atom (atom does not belong to rigid bodies) is an
136 +    //integrable object therefore the total number of integrable objects
137 +    //in the system is equal to the total number of atoms minus number of
138 +    //atoms belong to rigid body defined in meta-data file plus the number
139 +    //of rigid bodies defined in meta-data file
140 +    nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
141 +      + nGlobalRigidBodies_;
142 +    
143 +    nGlobalMols_ = molStampIds_.size();
144 +    molToProcMap_.resize(nGlobalMols_);
145 +  }
146 +  
147    SimInfo::~SimInfo() {
148 <    std::map<int, Molecule*>::iterator i;
148 >    map<int, Molecule*>::iterator i;
149      for (i = molecules_.begin(); i != molecules_.end(); ++i) {
150        delete i->second;
151      }
# Line 170 | Line 156 | namespace OpenMD {
156      delete forceField_;
157    }
158  
173 –  int SimInfo::getNGlobalConstraints() {
174 –    int nGlobalConstraints;
175 – #ifdef IS_MPI
176 –    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
177 –                  MPI_COMM_WORLD);    
178 – #else
179 –    nGlobalConstraints =  nConstraints_;
180 – #endif
181 –    return nGlobalConstraints;
182 –  }
159  
160    bool SimInfo::addMolecule(Molecule* mol) {
161      MoleculeIterator i;
162 <
162 >    
163      i = molecules_.find(mol->getGlobalIndex());
164      if (i == molecules_.end() ) {
165 <
166 <      molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
167 <        
165 >      
166 >      molecules_.insert(make_pair(mol->getGlobalIndex(), mol));
167 >      
168        nAtoms_ += mol->getNAtoms();
169        nBonds_ += mol->getNBonds();
170        nBends_ += mol->getNBends();
# Line 198 | Line 174 | namespace OpenMD {
174        nIntegrableObjects_ += mol->getNIntegrableObjects();
175        nCutoffGroups_ += mol->getNCutoffGroups();
176        nConstraints_ += mol->getNConstraintPairs();
177 <
177 >      
178        addInteractionPairs(mol);
179 <  
179 >      
180        return true;
181      } else {
182        return false;
183      }
184    }
185 <
185 >  
186    bool SimInfo::removeMolecule(Molecule* mol) {
187      MoleculeIterator i;
188      i = molecules_.find(mol->getGlobalIndex());
# Line 234 | Line 210 | namespace OpenMD {
210      } else {
211        return false;
212      }
237 –
238 –
213    }    
214  
215          
# Line 253 | Line 227 | namespace OpenMD {
227    void SimInfo::calcNdf() {
228      int ndf_local;
229      MoleculeIterator i;
230 <    std::vector<StuntDouble*>::iterator j;
230 >    vector<StuntDouble*>::iterator j;
231      Molecule* mol;
232      StuntDouble* integrableObject;
233  
# Line 299 | Line 273 | namespace OpenMD {
273   #endif
274      return fdf_;
275    }
276 +  
277 +  unsigned int SimInfo::getNLocalCutoffGroups(){
278 +    int nLocalCutoffAtoms = 0;
279 +    Molecule* mol;
280 +    MoleculeIterator mi;
281 +    CutoffGroup* cg;
282 +    Molecule::CutoffGroupIterator ci;
283      
284 +    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
285 +      
286 +      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
287 +           cg = mol->nextCutoffGroup(ci)) {
288 +        nLocalCutoffAtoms += cg->getNumAtom();
289 +        
290 +      }        
291 +    }
292 +    
293 +    return nAtoms_ - nLocalCutoffAtoms + nCutoffGroups_;
294 +  }
295 +    
296    void SimInfo::calcNdfRaw() {
297      int ndfRaw_local;
298  
299      MoleculeIterator i;
300 <    std::vector<StuntDouble*>::iterator j;
300 >    vector<StuntDouble*>::iterator j;
301      Molecule* mol;
302      StuntDouble* integrableObject;
303  
# Line 353 | Line 346 | namespace OpenMD {
346  
347    void SimInfo::addInteractionPairs(Molecule* mol) {
348      ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
349 <    std::vector<Bond*>::iterator bondIter;
350 <    std::vector<Bend*>::iterator bendIter;
351 <    std::vector<Torsion*>::iterator torsionIter;
352 <    std::vector<Inversion*>::iterator inversionIter;
349 >    vector<Bond*>::iterator bondIter;
350 >    vector<Bend*>::iterator bendIter;
351 >    vector<Torsion*>::iterator torsionIter;
352 >    vector<Inversion*>::iterator inversionIter;
353      Bond* bond;
354      Bend* bend;
355      Torsion* torsion;
# Line 374 | Line 367 | namespace OpenMD {
367      // always be excluded.  These are done at the bottom of this
368      // function.
369  
370 <    std::map<int, std::set<int> > atomGroups;
370 >    map<int, set<int> > atomGroups;
371      Molecule::RigidBodyIterator rbIter;
372      RigidBody* rb;
373      Molecule::IntegrableObjectIterator ii;
# Line 386 | Line 379 | namespace OpenMD {
379        
380        if (integrableObject->isRigidBody()) {
381          rb = static_cast<RigidBody*>(integrableObject);
382 <        std::vector<Atom*> atoms = rb->getAtoms();
383 <        std::set<int> rigidAtoms;
382 >        vector<Atom*> atoms = rb->getAtoms();
383 >        set<int> rigidAtoms;
384          for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
385            rigidAtoms.insert(atoms[i]->getGlobalIndex());
386          }
387          for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
388 <          atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
388 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
389          }      
390        } else {
391 <        std::set<int> oneAtomSet;
391 >        set<int> oneAtomSet;
392          oneAtomSet.insert(integrableObject->getGlobalIndex());
393 <        atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
393 >        atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
394        }
395      }  
396            
# Line 500 | Line 493 | namespace OpenMD {
493  
494      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
495           rb = mol->nextRigidBody(rbIter)) {
496 <      std::vector<Atom*> atoms = rb->getAtoms();
496 >      vector<Atom*> atoms = rb->getAtoms();
497        for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
498          for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
499            a = atoms[i]->getGlobalIndex();
# Line 514 | Line 507 | namespace OpenMD {
507  
508    void SimInfo::removeInteractionPairs(Molecule* mol) {
509      ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
510 <    std::vector<Bond*>::iterator bondIter;
511 <    std::vector<Bend*>::iterator bendIter;
512 <    std::vector<Torsion*>::iterator torsionIter;
513 <    std::vector<Inversion*>::iterator inversionIter;
510 >    vector<Bond*>::iterator bondIter;
511 >    vector<Bend*>::iterator bendIter;
512 >    vector<Torsion*>::iterator torsionIter;
513 >    vector<Inversion*>::iterator inversionIter;
514      Bond* bond;
515      Bend* bend;
516      Torsion* torsion;
# Line 527 | Line 520 | namespace OpenMD {
520      int c;
521      int d;
522  
523 <    std::map<int, std::set<int> > atomGroups;
523 >    map<int, set<int> > atomGroups;
524      Molecule::RigidBodyIterator rbIter;
525      RigidBody* rb;
526      Molecule::IntegrableObjectIterator ii;
# Line 539 | Line 532 | namespace OpenMD {
532        
533        if (integrableObject->isRigidBody()) {
534          rb = static_cast<RigidBody*>(integrableObject);
535 <        std::vector<Atom*> atoms = rb->getAtoms();
536 <        std::set<int> rigidAtoms;
535 >        vector<Atom*> atoms = rb->getAtoms();
536 >        set<int> rigidAtoms;
537          for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
538            rigidAtoms.insert(atoms[i]->getGlobalIndex());
539          }
540          for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
541 <          atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
541 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
542          }      
543        } else {
544 <        std::set<int> oneAtomSet;
544 >        set<int> oneAtomSet;
545          oneAtomSet.insert(integrableObject->getGlobalIndex());
546 <        atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
546 >        atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
547        }
548      }  
549  
# Line 653 | Line 646 | namespace OpenMD {
646  
647      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
648           rb = mol->nextRigidBody(rbIter)) {
649 <      std::vector<Atom*> atoms = rb->getAtoms();
649 >      vector<Atom*> atoms = rb->getAtoms();
650        for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
651          for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
652            a = atoms[i]->getGlobalIndex();
# Line 676 | Line 669 | namespace OpenMD {
669      molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
670    }
671  
679 –  void SimInfo::update() {
672  
673 <    setupSimType();
674 <
675 < #ifdef IS_MPI
676 <    setupFortranParallel();
677 < #endif
678 <
679 <    setupFortranSim();
680 <
681 <    //setup fortran force field
690 <    /** @deprecate */    
691 <    int isError = 0;
692 <    
693 <    setupCutoff();
694 <    
695 <    setupElectrostaticSummationMethod( isError );
696 <    setupSwitchingFunction();
697 <    setupAccumulateBoxDipole();
698 <
699 <    if(isError){
700 <      sprintf( painCave.errMsg,
701 <               "ForceField error: There was an error initializing the forceField in fortran.\n" );
702 <      painCave.isFatal = 1;
703 <      simError();
704 <    }
705 <
673 >  /**
674 >   * update
675 >   *
676 >   *  Performs the global checks and variable settings after the
677 >   *  objects have been created.
678 >   *
679 >   */
680 >  void SimInfo::update() {  
681 >    setupSimVariables();
682      calcNdf();
683      calcNdfRaw();
684      calcNdfTrans();
709 –
710 –    fortranInitialized_ = true;
685    }
686 <
687 <  std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
686 >  
687 >  /**
688 >   * getSimulatedAtomTypes
689 >   *
690 >   * Returns an STL set of AtomType* that are actually present in this
691 >   * simulation.  Must query all processors to assemble this information.
692 >   *
693 >   */
694 >  set<AtomType*> SimInfo::getSimulatedAtomTypes() {
695      SimInfo::MoleculeIterator mi;
696      Molecule* mol;
697      Molecule::AtomIterator ai;
698      Atom* atom;
699 <    std::set<AtomType*> atomTypes;
700 <
699 >    set<AtomType*> atomTypes;
700 >    
701      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
702 <
703 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
702 >      for(atom = mol->beginAtom(ai); atom != NULL;
703 >          atom = mol->nextAtom(ai)) {
704          atomTypes.insert(atom->getAtomType());
705 <      }
706 <        
707 <    }
705 >      }      
706 >    }    
707 >    
708 > #ifdef IS_MPI
709  
710 <    return atomTypes;        
711 <  }
730 <
731 <  void SimInfo::setupSimType() {
732 <    std::set<AtomType*>::iterator i;
733 <    std::set<AtomType*> atomTypes;
734 <    atomTypes = getUniqueAtomTypes();
710 >    // loop over the found atom types on this processor, and add their
711 >    // numerical idents to a vector:
712      
713 <    int useLennardJones = 0;
714 <    int useElectrostatic = 0;
715 <    int useEAM = 0;
716 <    int useSC = 0;
740 <    int useCharge = 0;
741 <    int useDirectional = 0;
742 <    int useDipole = 0;
743 <    int useGayBerne = 0;
744 <    int useSticky = 0;
745 <    int useStickyPower = 0;
746 <    int useShape = 0;
747 <    int useFLARB = 0; //it is not in AtomType yet
748 <    int useDirectionalAtom = 0;    
749 <    int useElectrostatics = 0;
750 <    //usePBC and useRF are from simParams
751 <    int usePBC = simParams_->getUsePeriodicBoundaryConditions();
752 <    int useRF;
753 <    int useSF;
754 <    int useSP;
755 <    int useBoxDipole;
713 >    vector<int> foundTypes;
714 >    set<AtomType*>::iterator i;
715 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
716 >      foundTypes.push_back( (*i)->getIdent() );
717  
718 <    std::string myMethod;
718 >    // count_local holds the number of found types on this processor
719 >    int count_local = foundTypes.size();
720  
721 <    // set the useRF logical
760 <    useRF = 0;
761 <    useSF = 0;
762 <    useSP = 0;
763 <    useBoxDipole = 0;
721 >    int nproc = MPI::COMM_WORLD.Get_size();
722  
723 <    if (simParams_->haveElectrostaticSummationMethod()) {
724 <      std::string myMethod = simParams_->getElectrostaticSummationMethod();
725 <      toUpper(myMethod);
726 <      if (myMethod == "REACTION_FIELD"){
727 <        useRF = 1;
728 <      } else if (myMethod == "SHIFTED_FORCE"){
729 <        useSF = 1;
730 <      } else if (myMethod == "SHIFTED_POTENTIAL"){
731 <        useSP = 1;
732 <      }
723 >    // we need arrays to hold the counts and displacement vectors for
724 >    // all processors
725 >    vector<int> counts(nproc, 0);
726 >    vector<int> disps(nproc, 0);
727 >
728 >    // fill the counts array
729 >    MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0],
730 >                              1, MPI::INT);
731 >  
732 >    // use the processor counts to compute the displacement array
733 >    disps[0] = 0;    
734 >    int totalCount = counts[0];
735 >    for (int iproc = 1; iproc < nproc; iproc++) {
736 >      disps[iproc] = disps[iproc-1] + counts[iproc-1];
737 >      totalCount += counts[iproc];
738      }
739 +
740 +    // we need a (possibly redundant) set of all found types:
741 +    vector<int> ftGlobal(totalCount);
742      
743 <    if (simParams_->haveAccumulateBoxDipole())
744 <      if (simParams_->getAccumulateBoxDipole())
745 <        useBoxDipole = 1;
743 >    // now spray out the foundTypes to all the other processors:    
744 >    MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
745 >                               &ftGlobal[0], &counts[0], &disps[0],
746 >                               MPI::INT);
747  
748 <    useAtomicVirial_ = simParams_->getUseAtomicVirial();
748 >    vector<int>::iterator j;
749  
750 <    //loop over all of the atom types
751 <    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
752 <      useLennardJones |= (*i)->isLennardJones();
786 <      useElectrostatic |= (*i)->isElectrostatic();
787 <      useEAM |= (*i)->isEAM();
788 <      useSC |= (*i)->isSC();
789 <      useCharge |= (*i)->isCharge();
790 <      useDirectional |= (*i)->isDirectional();
791 <      useDipole |= (*i)->isDipole();
792 <      useGayBerne |= (*i)->isGayBerne();
793 <      useSticky |= (*i)->isSticky();
794 <      useStickyPower |= (*i)->isStickyPower();
795 <      useShape |= (*i)->isShape();
796 <    }
750 >    // foundIdents is a stl set, so inserting an already found ident
751 >    // will have no effect.
752 >    set<int> foundIdents;
753  
754 <    if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
755 <      useDirectionalAtom = 1;
756 <    }
754 >    for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
755 >      foundIdents.insert((*j));
756 >    
757 >    // now iterate over the foundIdents and get the actual atom types
758 >    // that correspond to these:
759 >    set<int>::iterator it;
760 >    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
761 >      atomTypes.insert( forceField_->getAtomType((*it)) );
762 >
763 > #endif
764  
765 <    if (useCharge || useDipole) {
766 <      useElectrostatics = 1;
804 <    }
765 >    return atomTypes;        
766 >  }
767  
768 +  void SimInfo::setupSimVariables() {
769 +    useAtomicVirial_ = simParams_->getUseAtomicVirial();
770 +    // we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
771 +    calcBoxDipole_ = false;
772 +    if ( simParams_->haveAccumulateBoxDipole() )
773 +      if ( simParams_->getAccumulateBoxDipole() ) {
774 +        calcBoxDipole_ = true;      
775 +      }
776 +    
777 +    set<AtomType*>::iterator i;
778 +    set<AtomType*> atomTypes;
779 +    atomTypes = getSimulatedAtomTypes();    
780 +    int usesElectrostatic = 0;
781 +    int usesMetallic = 0;
782 +    int usesDirectional = 0;
783 +    //loop over all of the atom types
784 +    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
785 +      usesElectrostatic |= (*i)->isElectrostatic();
786 +      usesMetallic |= (*i)->isMetal();
787 +      usesDirectional |= (*i)->isDirectional();
788 +    }
789 +    
790   #ifdef IS_MPI    
791      int temp;
792 +    temp = usesDirectional;
793 +    MPI_Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
794 +    
795 +    temp = usesMetallic;
796 +    MPI_Allreduce(&temp, &usesMetallicAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
797 +    
798 +    temp = usesElectrostatic;
799 +    MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
800 + #else
801  
802 <    temp = usePBC;
803 <    MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
802 >    usesDirectionalAtoms_ = usesDirectional;
803 >    usesMetallicAtoms_ = usesMetallic;
804 >    usesElectrostaticAtoms_ = usesElectrostatic;
805  
806 <    temp = useDirectionalAtom;
807 <    MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
806 > #endif
807 >    
808 >    requiresPrepair_ = usesMetallicAtoms_ ? true : false;
809 >    requiresSkipCorrection_ = usesElectrostaticAtoms_ ? true : false;
810 >    requiresSelfCorrection_ = usesElectrostaticAtoms_ ? true : false;    
811 >  }
812  
815 –    temp = useLennardJones;
816 –    MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
813  
814 <    temp = useElectrostatics;
815 <    MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
814 >  vector<int> SimInfo::getGlobalAtomIndices() {
815 >    SimInfo::MoleculeIterator mi;
816 >    Molecule* mol;
817 >    Molecule::AtomIterator ai;
818 >    Atom* atom;
819  
820 <    temp = useCharge;
821 <    MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
820 >    vector<int> GlobalAtomIndices(getNAtoms(), 0);
821 >    
822 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
823 >      
824 >      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
825 >        GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex();
826 >      }
827 >    }
828 >    return GlobalAtomIndices;
829 >  }
830  
824 –    temp = useDipole;
825 –    MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
831  
832 <    temp = useSticky;
833 <    MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
832 >  vector<int> SimInfo::getGlobalGroupIndices() {
833 >    SimInfo::MoleculeIterator mi;
834 >    Molecule* mol;
835 >    Molecule::CutoffGroupIterator ci;
836 >    CutoffGroup* cg;
837  
838 <    temp = useStickyPower;
831 <    MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
838 >    vector<int> GlobalGroupIndices;
839      
840 <    temp = useGayBerne;
841 <    MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
842 <
843 <    temp = useEAM;
844 <    MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
845 <
846 <    temp = useSC;
847 <    MPI_Allreduce(&temp, &useSC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
848 <    
849 <    temp = useShape;
843 <    MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);  
844 <
845 <    temp = useFLARB;
846 <    MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
847 <
848 <    temp = useRF;
849 <    MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
850 <
851 <    temp = useSF;
852 <    MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);  
853 <
854 <    temp = useSP;
855 <    MPI_Allreduce(&temp, &useSP, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
856 <
857 <    temp = useBoxDipole;
858 <    MPI_Allreduce(&temp, &useBoxDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
859 <
860 <    temp = useAtomicVirial_;
861 <    MPI_Allreduce(&temp, &useAtomicVirial_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
862 <
863 < #endif
864 <    fInfo_.SIM_uses_PBC = usePBC;    
865 <    fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
866 <    fInfo_.SIM_uses_LennardJones = useLennardJones;
867 <    fInfo_.SIM_uses_Electrostatics = useElectrostatics;    
868 <    fInfo_.SIM_uses_Charges = useCharge;
869 <    fInfo_.SIM_uses_Dipoles = useDipole;
870 <    fInfo_.SIM_uses_Sticky = useSticky;
871 <    fInfo_.SIM_uses_StickyPower = useStickyPower;
872 <    fInfo_.SIM_uses_GayBerne = useGayBerne;
873 <    fInfo_.SIM_uses_EAM = useEAM;
874 <    fInfo_.SIM_uses_SC = useSC;
875 <    fInfo_.SIM_uses_Shapes = useShape;
876 <    fInfo_.SIM_uses_FLARB = useFLARB;
877 <    fInfo_.SIM_uses_RF = useRF;
878 <    fInfo_.SIM_uses_SF = useSF;
879 <    fInfo_.SIM_uses_SP = useSP;
880 <    fInfo_.SIM_uses_BoxDipole = useBoxDipole;
881 <    fInfo_.SIM_uses_AtomicVirial = useAtomicVirial_;
840 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
841 >      
842 >      //local index of cutoff group is trivial, it only depends on the
843 >      //order of travesing
844 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
845 >           cg = mol->nextCutoffGroup(ci)) {
846 >        GlobalGroupIndices.push_back(cg->getGlobalIndex());
847 >      }        
848 >    }
849 >    return GlobalGroupIndices;
850    }
851  
852 <  void SimInfo::setupFortranSim() {
853 <    int isError;
852 >
853 >  void SimInfo::prepareTopology() {
854      int nExclude, nOneTwo, nOneThree, nOneFour;
887 –    std::vector<int> fortranGlobalGroupMembership;
888 –    
889 –    isError = 0;
855  
891 –    //globalGroupMembership_ is filled by SimCreator    
892 –    for (int i = 0; i < nGlobalAtoms_; i++) {
893 –      fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
894 –    }
895 –
856      //calculate mass ratio of cutoff group
897 –    std::vector<RealType> mfact;
857      SimInfo::MoleculeIterator mi;
858      Molecule* mol;
859      Molecule::CutoffGroupIterator ci;
# Line 903 | Line 862 | namespace OpenMD {
862      Atom* atom;
863      RealType totalMass;
864  
865 <    //to avoid memory reallocation, reserve enough space for mfact
866 <    mfact.reserve(getNCutoffGroups());
865 >    /**
866 >     * The mass factor is the relative mass of an atom to the total
867 >     * mass of the cutoff group it belongs to.  By default, all atoms
868 >     * are their own cutoff groups, and therefore have mass factors of
869 >     * 1.  We need some special handling for massless atoms, which
870 >     * will be treated as carrying the entire mass of the cutoff
871 >     * group.
872 >     */
873 >    massFactors_.clear();
874 >    massFactors_.resize(getNAtoms(), 1.0);
875      
876      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
877 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
877 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
878 >           cg = mol->nextCutoffGroup(ci)) {
879  
880          totalMass = cg->getMass();
881          for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
882            // Check for massless groups - set mfact to 1 if true
883 <          if (totalMass != 0)
884 <            mfact.push_back(atom->getMass()/totalMass);
883 >          if (totalMass != 0)
884 >            massFactors_[atom->getLocalIndex()] = atom->getMass()/totalMass;
885            else
886 <            mfact.push_back( 1.0 );
886 >            massFactors_[atom->getLocalIndex()] = 1.0;
887          }
888        }      
889      }
890  
891 <    //fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
924 <    std::vector<int> identArray;
891 >    // Build the identArray_
892  
893 <    //to avoid memory reallocation, reserve enough space identArray
894 <    identArray.reserve(getNAtoms());
928 <    
893 >    identArray_.clear();
894 >    identArray_.reserve(getNAtoms());    
895      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
896        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
897 <        identArray.push_back(atom->getIdent());
897 >        identArray_.push_back(atom->getIdent());
898        }
899      }    
934 –
935 –    //fill molMembershipArray
936 –    //molMembershipArray is filled by SimCreator    
937 –    std::vector<int> molMembershipArray(nGlobalAtoms_);
938 –    for (int i = 0; i < nGlobalAtoms_; i++) {
939 –      molMembershipArray[i] = globalMolMembership_[i] + 1;
940 –    }
900      
901 <    //setup fortran simulation
901 >    //scan topology
902  
903      nExclude = excludedInteractions_.getSize();
904      nOneTwo = oneTwoInteractions_.getSize();
# Line 951 | Line 910 | namespace OpenMD {
910      int* oneThreeList = oneThreeInteractions_.getPairList();
911      int* oneFourList = oneFourInteractions_.getPairList();
912  
913 <    setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0],
955 <                   &nExclude, excludeList,
956 <                   &nOneTwo, oneTwoList,
957 <                   &nOneThree, oneThreeList,
958 <                   &nOneFour, oneFourList,
959 <                   &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
960 <                   &fortranGlobalGroupMembership[0], &isError);
961 <    
962 <    if( isError ){
963 <      
964 <      sprintf( painCave.errMsg,
965 <               "There was an error setting the simulation information in fortran.\n" );
966 <      painCave.isFatal = 1;
967 <      painCave.severity = OPENMD_ERROR;
968 <      simError();
969 <    }
970 <    
971 <    
972 <    sprintf( checkPointMsg,
973 <             "succesfully sent the simulation information to fortran.\n");
974 <    
975 <    errorCheckPoint();
976 <    
977 <    // Setup number of neighbors in neighbor list if present
978 <    if (simParams_->haveNeighborListNeighbors()) {
979 <      int nlistNeighbors = simParams_->getNeighborListNeighbors();
980 <      setNeighbors(&nlistNeighbors);
981 <    }
982 <  
983 <
984 <  }
985 <
986 <
987 <  void SimInfo::setupFortranParallel() {
988 < #ifdef IS_MPI    
989 <    //SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
990 <    std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
991 <    std::vector<int> localToGlobalCutoffGroupIndex;
992 <    SimInfo::MoleculeIterator mi;
993 <    Molecule::AtomIterator ai;
994 <    Molecule::CutoffGroupIterator ci;
995 <    Molecule* mol;
996 <    Atom* atom;
997 <    CutoffGroup* cg;
998 <    mpiSimData parallelData;
999 <    int isError;
1000 <
1001 <    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
1002 <
1003 <      //local index(index in DataStorge) of atom is important
1004 <      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
1005 <        localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
1006 <      }
1007 <
1008 <      //local index of cutoff group is trivial, it only depends on the order of travesing
1009 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
1010 <        localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
1011 <      }        
1012 <        
1013 <    }
1014 <
1015 <    //fill up mpiSimData struct
1016 <    parallelData.nMolGlobal = getNGlobalMolecules();
1017 <    parallelData.nMolLocal = getNMolecules();
1018 <    parallelData.nAtomsGlobal = getNGlobalAtoms();
1019 <    parallelData.nAtomsLocal = getNAtoms();
1020 <    parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
1021 <    parallelData.nGroupsLocal = getNCutoffGroups();
1022 <    parallelData.myNode = worldRank;
1023 <    MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
1024 <
1025 <    //pass mpiSimData struct and index arrays to fortran
1026 <    setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
1027 <                    &localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
1028 <                    &localToGlobalCutoffGroupIndex[0], &isError);
1029 <
1030 <    if (isError) {
1031 <      sprintf(painCave.errMsg,
1032 <              "mpiRefresh errror: fortran didn't like something we gave it.\n");
1033 <      painCave.isFatal = 1;
1034 <      simError();
1035 <    }
1036 <
1037 <    sprintf(checkPointMsg, " mpiRefresh successful.\n");
1038 <    errorCheckPoint();
1039 <
1040 < #endif
1041 <  }
1042 <
1043 <  void SimInfo::setupCutoff() {          
1044 <    
1045 <    ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
1046 <
1047 <    // Check the cutoff policy
1048 <    int cp =  TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
1049 <
1050 <    // Set LJ shifting bools to false
1051 <    ljsp_ = 0;
1052 <    ljsf_ = 0;
1053 <
1054 <    std::string myPolicy;
1055 <    if (forceFieldOptions_.haveCutoffPolicy()){
1056 <      myPolicy = forceFieldOptions_.getCutoffPolicy();
1057 <    }else if (simParams_->haveCutoffPolicy()) {
1058 <      myPolicy = simParams_->getCutoffPolicy();
1059 <    }
1060 <
1061 <    if (!myPolicy.empty()){
1062 <      toUpper(myPolicy);
1063 <      if (myPolicy == "MIX") {
1064 <        cp = MIX_CUTOFF_POLICY;
1065 <      } else {
1066 <        if (myPolicy == "MAX") {
1067 <          cp = MAX_CUTOFF_POLICY;
1068 <        } else {
1069 <          if (myPolicy == "TRADITIONAL") {            
1070 <            cp = TRADITIONAL_CUTOFF_POLICY;
1071 <          } else {
1072 <            // throw error        
1073 <            sprintf( painCave.errMsg,
1074 <                     "SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
1075 <            painCave.isFatal = 1;
1076 <            simError();
1077 <          }    
1078 <        }          
1079 <      }
1080 <    }          
1081 <    notifyFortranCutoffPolicy(&cp);
1082 <
1083 <    // Check the Skin Thickness for neighborlists
1084 <    RealType skin;
1085 <    if (simParams_->haveSkinThickness()) {
1086 <      skin = simParams_->getSkinThickness();
1087 <      notifyFortranSkinThickness(&skin);
1088 <    }            
1089 <        
1090 <    // Check if the cutoff was set explicitly:
1091 <    if (simParams_->haveCutoffRadius()) {
1092 <      rcut_ = simParams_->getCutoffRadius();
1093 <      if (simParams_->haveSwitchingRadius()) {
1094 <        rsw_  = simParams_->getSwitchingRadius();
1095 <      } else {
1096 <        if (fInfo_.SIM_uses_Charges |
1097 <            fInfo_.SIM_uses_Dipoles |
1098 <            fInfo_.SIM_uses_RF) {
1099 <          
1100 <          rsw_ = 0.85 * rcut_;
1101 <          sprintf(painCave.errMsg,
1102 <                  "SimCreator Warning: No value was set for the switchingRadius.\n"
1103 <                  "\tOpenMD will use a default value of 85 percent of the cutoffRadius.\n"
1104 <                  "\tswitchingRadius = %f. for this simulation\n", rsw_);
1105 <        painCave.isFatal = 0;
1106 <        simError();
1107 <        } else {
1108 <          rsw_ = rcut_;
1109 <          sprintf(painCave.errMsg,
1110 <                  "SimCreator Warning: No value was set for the switchingRadius.\n"
1111 <                  "\tOpenMD will use the same value as the cutoffRadius.\n"
1112 <                  "\tswitchingRadius = %f. for this simulation\n", rsw_);
1113 <          painCave.isFatal = 0;
1114 <          simError();
1115 <        }
1116 <      }
1117 <
1118 <      if (simParams_->haveElectrostaticSummationMethod()) {
1119 <        std::string myMethod = simParams_->getElectrostaticSummationMethod();
1120 <        toUpper(myMethod);
1121 <        
1122 <        if (myMethod == "SHIFTED_POTENTIAL") {
1123 <          ljsp_ = 1;
1124 <        } else if (myMethod == "SHIFTED_FORCE") {
1125 <          ljsf_ = 1;
1126 <        }
1127 <      }
1128 <
1129 <      notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1130 <      
1131 <    } else {
1132 <      
1133 <      // For electrostatic atoms, we'll assume a large safe value:
1134 <      if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
1135 <        sprintf(painCave.errMsg,
1136 <                "SimCreator Warning: No value was set for the cutoffRadius.\n"
1137 <                "\tOpenMD will use a default value of 15.0 angstroms"
1138 <                "\tfor the cutoffRadius.\n");
1139 <        painCave.isFatal = 0;
1140 <        simError();
1141 <        rcut_ = 15.0;
1142 <      
1143 <        if (simParams_->haveElectrostaticSummationMethod()) {
1144 <          std::string myMethod = simParams_->getElectrostaticSummationMethod();
1145 <          toUpper(myMethod);
1146 <          
1147 <          // For the time being, we're tethering the LJ shifted behavior to the
1148 <          // electrostaticSummationMethod keyword options
1149 <          if (myMethod == "SHIFTED_POTENTIAL") {
1150 <            ljsp_ = 1;
1151 <          } else if (myMethod == "SHIFTED_FORCE") {
1152 <            ljsf_ = 1;
1153 <          }
1154 <          if (myMethod == "SHIFTED_POTENTIAL" || myMethod == "SHIFTED_FORCE") {
1155 <            if (simParams_->haveSwitchingRadius()){
1156 <              sprintf(painCave.errMsg,
1157 <                      "SimInfo Warning: A value was set for the switchingRadius\n"
1158 <                      "\teven though the electrostaticSummationMethod was\n"
1159 <                      "\tset to %s\n", myMethod.c_str());
1160 <              painCave.isFatal = 1;
1161 <              simError();            
1162 <            }
1163 <          }
1164 <        }
1165 <      
1166 <        if (simParams_->haveSwitchingRadius()){
1167 <          rsw_ = simParams_->getSwitchingRadius();
1168 <        } else {        
1169 <          sprintf(painCave.errMsg,
1170 <                  "SimCreator Warning: No value was set for switchingRadius.\n"
1171 <                  "\tOpenMD will use a default value of\n"
1172 <                  "\t0.85 * cutoffRadius for the switchingRadius\n");
1173 <          painCave.isFatal = 0;
1174 <          simError();
1175 <          rsw_ = 0.85 * rcut_;
1176 <        }
1177 <
1178 <        Electrostatic::setElectrostaticCutoffRadius(rcut_, rsw_);
1179 <        notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1180 <
1181 <      } else {
1182 <        // We didn't set rcut explicitly, and we don't have electrostatic atoms, so
1183 <        // We'll punt and let fortran figure out the cutoffs later.
1184 <        
1185 <        notifyFortranYouAreOnYourOwn();
1186 <
1187 <      }
1188 <    }
1189 <  }
1190 <
1191 <  void SimInfo::setupElectrostaticSummationMethod( int isError ) {    
1192 <    
1193 <    int errorOut;
1194 <    ElectrostaticSummationMethod esm = NONE;
1195 <    ElectrostaticScreeningMethod sm = UNDAMPED;
1196 <    RealType alphaVal;
1197 <    RealType dielectric;
1198 <    
1199 <    errorOut = isError;
1200 <
1201 <    if (simParams_->haveElectrostaticSummationMethod()) {
1202 <      std::string myMethod = simParams_->getElectrostaticSummationMethod();
1203 <      toUpper(myMethod);
1204 <      if (myMethod == "NONE") {
1205 <        esm = NONE;
1206 <      } else {
1207 <        if (myMethod == "SWITCHING_FUNCTION") {
1208 <          esm = SWITCHING_FUNCTION;
1209 <        } else {
1210 <          if (myMethod == "SHIFTED_POTENTIAL") {
1211 <            esm = SHIFTED_POTENTIAL;
1212 <          } else {
1213 <            if (myMethod == "SHIFTED_FORCE") {            
1214 <              esm = SHIFTED_FORCE;
1215 <            } else {
1216 <              if (myMethod == "REACTION_FIELD") {
1217 <                esm = REACTION_FIELD;
1218 <                dielectric = simParams_->getDielectric();
1219 <                if (!simParams_->haveDielectric()) {
1220 <                  // throw warning
1221 <                  sprintf( painCave.errMsg,
1222 <                           "SimInfo warning: dielectric was not specified in the input file\n\tfor the reaction field correction method.\n"
1223 <                           "\tA default value of %f will be used for the dielectric.\n", dielectric);
1224 <                  painCave.isFatal = 0;
1225 <                  simError();
1226 <                }
1227 <              } else {
1228 <                // throw error        
1229 <                sprintf( painCave.errMsg,
1230 <                         "SimInfo error: Unknown electrostaticSummationMethod.\n"
1231 <                         "\t(Input file specified %s .)\n"
1232 <                         "\telectrostaticSummationMethod must be one of: \"none\",\n"
1233 <                         "\t\"shifted_potential\", \"shifted_force\", or \n"
1234 <                         "\t\"reaction_field\".\n", myMethod.c_str() );
1235 <                painCave.isFatal = 1;
1236 <                simError();
1237 <              }    
1238 <            }          
1239 <          }
1240 <        }
1241 <      }
1242 <    }
1243 <    
1244 <    if (simParams_->haveElectrostaticScreeningMethod()) {
1245 <      std::string myScreen = simParams_->getElectrostaticScreeningMethod();
1246 <      toUpper(myScreen);
1247 <      if (myScreen == "UNDAMPED") {
1248 <        sm = UNDAMPED;
1249 <      } else {
1250 <        if (myScreen == "DAMPED") {
1251 <          sm = DAMPED;
1252 <          if (!simParams_->haveDampingAlpha()) {
1253 <            // first set a cutoff dependent alpha value
1254 <            // we assume alpha depends linearly with rcut from 0 to 20.5 ang
1255 <            alphaVal = 0.5125 - rcut_* 0.025;
1256 <            // for values rcut > 20.5, alpha is zero
1257 <            if (alphaVal < 0) alphaVal = 0;
1258 <
1259 <            // throw warning
1260 <            sprintf( painCave.errMsg,
1261 <                     "SimInfo warning: dampingAlpha was not specified in the input file.\n"
1262 <                     "\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1263 <            painCave.isFatal = 0;
1264 <            simError();
1265 <          } else {
1266 <            alphaVal = simParams_->getDampingAlpha();
1267 <          }
1268 <          
1269 <        } else {
1270 <          // throw error        
1271 <          sprintf( painCave.errMsg,
1272 <                   "SimInfo error: Unknown electrostaticScreeningMethod.\n"
1273 <                   "\t(Input file specified %s .)\n"
1274 <                   "\telectrostaticScreeningMethod must be one of: \"undamped\"\n"
1275 <                   "or \"damped\".\n", myScreen.c_str() );
1276 <          painCave.isFatal = 1;
1277 <          simError();
1278 <        }
1279 <      }
1280 <    }
1281 <    
1282 <
1283 <    Electrostatic::setElectrostaticSummationMethod( esm );
1284 <    Electrostatic::setElectrostaticScreeningMethod( sm );
1285 <    Electrostatic::setDampingAlpha( alphaVal );
1286 <    Electrostatic::setReactionFieldDielectric( dielectric );
1287 <    initFortranFF( &errorOut );
913 >    topologyDone_ = true;
914    }
915  
1290 –  void SimInfo::setupSwitchingFunction() {    
1291 –    int ft = CUBIC;
1292 –
1293 –    if (simParams_->haveSwitchingFunctionType()) {
1294 –      std::string funcType = simParams_->getSwitchingFunctionType();
1295 –      toUpper(funcType);
1296 –      if (funcType == "CUBIC") {
1297 –        ft = CUBIC;
1298 –      } else {
1299 –        if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1300 –          ft = FIFTH_ORDER_POLY;
1301 –        } else {
1302 –          // throw error        
1303 –          sprintf( painCave.errMsg,
1304 –                   "SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1305 –          painCave.isFatal = 1;
1306 –          simError();
1307 –        }          
1308 –      }
1309 –    }
1310 –
1311 –    // send switching function notification to switcheroo
1312 –    setFunctionType(&ft);
1313 –
1314 –  }
1315 –
1316 –  void SimInfo::setupAccumulateBoxDipole() {    
1317 –
1318 –    // we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1319 –    if ( simParams_->haveAccumulateBoxDipole() )
1320 –      if ( simParams_->getAccumulateBoxDipole() ) {
1321 –        setAccumulateBoxDipole();
1322 –        calcBoxDipole_ = true;
1323 –      }
1324 –
1325 –  }
1326 –
916    void SimInfo::addProperty(GenericData* genData) {
917      properties_.addProperty(genData);  
918    }
919  
920 <  void SimInfo::removeProperty(const std::string& propName) {
920 >  void SimInfo::removeProperty(const string& propName) {
921      properties_.removeProperty(propName);  
922    }
923  
# Line 1336 | Line 925 | namespace OpenMD {
925      properties_.clearProperties();
926    }
927  
928 <  std::vector<std::string> SimInfo::getPropertyNames() {
928 >  vector<string> SimInfo::getPropertyNames() {
929      return properties_.getPropertyNames();  
930    }
931        
932 <  std::vector<GenericData*> SimInfo::getProperties() {
932 >  vector<GenericData*> SimInfo::getProperties() {
933      return properties_.getProperties();
934    }
935  
936 <  GenericData* SimInfo::getPropertyByName(const std::string& propName) {
936 >  GenericData* SimInfo::getPropertyByName(const string& propName) {
937      return properties_.getPropertyByName(propName);
938    }
939  
# Line 1358 | Line 947 | namespace OpenMD {
947      Molecule* mol;
948      RigidBody* rb;
949      Atom* atom;
950 +    CutoffGroup* cg;
951      SimInfo::MoleculeIterator mi;
952      Molecule::RigidBodyIterator rbIter;
953 <    Molecule::AtomIterator atomIter;;
953 >    Molecule::AtomIterator atomIter;
954 >    Molecule::CutoffGroupIterator cgIter;
955  
956      for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
957          
# Line 1371 | Line 962 | namespace OpenMD {
962        for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
963          rb->setSnapshotManager(sman_);
964        }
965 +
966 +      for (cg = mol->beginCutoffGroup(cgIter); cg != NULL; cg = mol->nextCutoffGroup(cgIter)) {
967 +        cg->setSnapshotManager(sman_);
968 +      }
969      }    
970      
971    }
# Line 1427 | Line 1022 | namespace OpenMD {
1022  
1023    }        
1024  
1025 <  std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1025 >  ostream& operator <<(ostream& o, SimInfo& info) {
1026  
1027      return o;
1028    }
# Line 1577 | Line 1172 | namespace OpenMD {
1172      return IOIndexToIntegrableObject.at(index);
1173    }
1174    
1175 <  void SimInfo::setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v) {
1175 >  void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1176      IOIndexToIntegrableObject= v;
1177    }
1178  
# Line 1619 | Line 1214 | namespace OpenMD {
1214      return;
1215    }
1216   /*
1217 <   void SimInfo::setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v) {
1217 >   void SimInfo::setStuntDoubleFromGlobalIndex(vector<StuntDouble*> v) {
1218        assert( v.size() == nAtoms_ + nRigidBodies_);
1219        sdByGlobalIndex_ = v;
1220      }
# Line 1629 | Line 1224 | namespace OpenMD {
1224        return sdByGlobalIndex_.at(index);
1225      }  
1226   */  
1227 +  int SimInfo::getNGlobalConstraints() {
1228 +    int nGlobalConstraints;
1229 + #ifdef IS_MPI
1230 +    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
1231 +                  MPI_COMM_WORLD);    
1232 + #else
1233 +    nGlobalConstraints =  nConstraints_;
1234 + #endif
1235 +    return nGlobalConstraints;
1236 +  }
1237 +
1238   }//end namespace OpenMD
1239  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines