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

Comparing:
trunk/src/brains/SimInfo.cpp (file contents), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/brains/SimInfo.cpp (file contents), Revision 1536 by gezelter, Wed Jan 5 14:49:05 2011 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   /**
# Line 53 | Line 53
53   #include "brains/SimInfo.hpp"
54   #include "math/Vector3.hpp"
55   #include "primitives/Molecule.hpp"
56 < #include "UseTheForce/fCutoffPolicy.h"
57 < #include "UseTheForce/DarkSide/fElectrostaticSummationMethod.h"
58 < #include "UseTheForce/DarkSide/fElectrostaticScreeningMethod.h"
59 < #include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
56 > #include "primitives/StuntDouble.hpp"
57 > #include "UseTheForce/DarkSide/neighborLists_interface.h"
58   #include "UseTheForce/doForces_interface.h"
61 #include "UseTheForce/DarkSide/electrostatic_interface.h"
62 #include "UseTheForce/DarkSide/switcheroo_interface.h"
59   #include "utils/MemoryUtils.hpp"
60   #include "utils/simError.h"
61   #include "selection/SelectionManager.hpp"
62   #include "io/ForceFieldOptions.hpp"
63   #include "UseTheForce/ForceField.hpp"
64 + #include "nonbonded/SwitchingFunction.hpp"
65  
66   #ifdef IS_MPI
67   #include "UseTheForce/mpiComponentPlan.h"
68   #include "UseTheForce/DarkSide/simParallel_interface.h"
69   #endif
70  
71 < namespace oopse {
72 <  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 <  }
71 > using namespace std;
72 > namespace OpenMD {
73    
74    SimInfo::SimInfo(ForceField* ff, Globals* simParams) :
75      forceField_(ff), simParams_(simParams),
76      ndf_(0), fdf_local(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
77      nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
78      nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
79 <    nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
80 <    nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
81 <    sman_(NULL), fortranInitialized_(false) {
82 <
83 <      MoleculeStamp* molStamp;
84 <      int nMolWithSameStamp;
85 <      int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
86 <      int nGroups = 0;      //total cutoff groups defined in meta-data file
87 <      CutoffGroupStamp* cgStamp;    
88 <      RigidBodyStamp* rbStamp;
89 <      int nRigidAtoms = 0;
90 <      std::vector<Component*> components = simParams->getComponents();
79 >    nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nInversions_(0),
80 >    nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
81 >    nConstraints_(0), sman_(NULL), fortranInitialized_(false),
82 >    calcBoxDipole_(false), useAtomicVirial_(true) {    
83 >    
84 >    MoleculeStamp* molStamp;
85 >    int nMolWithSameStamp;
86 >    int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
87 >    int nGroups = 0;       //total cutoff groups defined in meta-data file
88 >    CutoffGroupStamp* cgStamp;    
89 >    RigidBodyStamp* rbStamp;
90 >    int nRigidAtoms = 0;
91 >    
92 >    vector<Component*> components = simParams->getComponents();
93 >    
94 >    for (vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
95 >      molStamp = (*i)->getMoleculeStamp();
96 >      nMolWithSameStamp = (*i)->getNMol();
97        
98 <      for (std::vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
99 <        molStamp = (*i)->getMoleculeStamp();
100 <        nMolWithSameStamp = (*i)->getNMol();
101 <        
102 <        addMoleculeStamp(molStamp, nMolWithSameStamp);
103 <
104 <        //calculate atoms in molecules
105 <        nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;  
106 <
107 <        //calculate atoms in cutoff groups
108 <        int nAtomsInGroups = 0;
109 <        int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
115 <        
116 <        for (int j=0; j < nCutoffGroupsInStamp; j++) {
117 <          cgStamp = molStamp->getCutoffGroupStamp(j);
118 <          nAtomsInGroups += cgStamp->getNMembers();
119 <        }
120 <
121 <        nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
122 <
123 <        nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;            
124 <
125 <        //calculate atoms in rigid bodies
126 <        int nAtomsInRigidBodies = 0;
127 <        int nRigidBodiesInStamp = molStamp->getNRigidBodies();
128 <        
129 <        for (int j=0; j < nRigidBodiesInStamp; j++) {
130 <          rbStamp = molStamp->getRigidBodyStamp(j);
131 <          nAtomsInRigidBodies += rbStamp->getNMembers();
132 <        }
133 <
134 <        nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
135 <        nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;            
136 <        
98 >      addMoleculeStamp(molStamp, nMolWithSameStamp);
99 >      
100 >      //calculate atoms in molecules
101 >      nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;  
102 >      
103 >      //calculate atoms in cutoff groups
104 >      int nAtomsInGroups = 0;
105 >      int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
106 >      
107 >      for (int j=0; j < nCutoffGroupsInStamp; j++) {
108 >        cgStamp = molStamp->getCutoffGroupStamp(j);
109 >        nAtomsInGroups += cgStamp->getNMembers();
110        }
111 <
112 <      //every free atom (atom does not belong to cutoff groups) is a cutoff
113 <      //group therefore the total number of cutoff groups in the system is
114 <      //equal to the total number of atoms minus number of atoms belong to
115 <      //cutoff group defined in meta-data file plus the number of cutoff
116 <      //groups defined in meta-data file
117 <      nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
118 <
119 <      //every free atom (atom does not belong to rigid bodies) is an
120 <      //integrable object therefore the total number of integrable objects
121 <      //in the system is equal to the total number of atoms minus number of
122 <      //atoms belong to rigid body defined in meta-data file plus the number
123 <      //of rigid bodies defined in meta-data file
124 <      nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
125 <                                                + nGlobalRigidBodies_;
126 <  
127 <      nGlobalMols_ = molStampIds_.size();
155 <
156 < #ifdef IS_MPI    
157 <      molToProcMap_.resize(nGlobalMols_);
158 < #endif
159 <
111 >      
112 >      nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
113 >      
114 >      nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;            
115 >      
116 >      //calculate atoms in rigid bodies
117 >      int nAtomsInRigidBodies = 0;
118 >      int nRigidBodiesInStamp = molStamp->getNRigidBodies();
119 >      
120 >      for (int j=0; j < nRigidBodiesInStamp; j++) {
121 >        rbStamp = molStamp->getRigidBodyStamp(j);
122 >        nAtomsInRigidBodies += rbStamp->getNMembers();
123 >      }
124 >      
125 >      nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
126 >      nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;            
127 >      
128      }
129 <
129 >    
130 >    //every free atom (atom does not belong to cutoff groups) is a cutoff
131 >    //group therefore the total number of cutoff groups in the system is
132 >    //equal to the total number of atoms minus number of atoms belong to
133 >    //cutoff group defined in meta-data file plus the number of cutoff
134 >    //groups defined in meta-data file
135 >    nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
136 >    
137 >    //every free atom (atom does not belong to rigid bodies) is an
138 >    //integrable object therefore the total number of integrable objects
139 >    //in the system is equal to the total number of atoms minus number of
140 >    //atoms belong to rigid body defined in meta-data file plus the number
141 >    //of rigid bodies defined in meta-data file
142 >    nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
143 >      + nGlobalRigidBodies_;
144 >    
145 >    nGlobalMols_ = molStampIds_.size();
146 >    molToProcMap_.resize(nGlobalMols_);
147 >  }
148 >  
149    SimInfo::~SimInfo() {
150 <    std::map<int, Molecule*>::iterator i;
150 >    map<int, Molecule*>::iterator i;
151      for (i = molecules_.begin(); i != molecules_.end(); ++i) {
152        delete i->second;
153      }
# Line 171 | Line 158 | namespace oopse {
158      delete forceField_;
159    }
160  
174  int SimInfo::getNGlobalConstraints() {
175    int nGlobalConstraints;
176 #ifdef IS_MPI
177    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
178                  MPI_COMM_WORLD);    
179 #else
180    nGlobalConstraints =  nConstraints_;
181 #endif
182    return nGlobalConstraints;
183  }
161  
162    bool SimInfo::addMolecule(Molecule* mol) {
163      MoleculeIterator i;
164 <
164 >    
165      i = molecules_.find(mol->getGlobalIndex());
166      if (i == molecules_.end() ) {
167 <
168 <      molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
169 <        
167 >      
168 >      molecules_.insert(make_pair(mol->getGlobalIndex(), mol));
169 >      
170        nAtoms_ += mol->getNAtoms();
171        nBonds_ += mol->getNBonds();
172        nBends_ += mol->getNBends();
173        nTorsions_ += mol->getNTorsions();
174 +      nInversions_ += mol->getNInversions();
175        nRigidBodies_ += mol->getNRigidBodies();
176        nIntegrableObjects_ += mol->getNIntegrableObjects();
177        nCutoffGroups_ += mol->getNCutoffGroups();
178        nConstraints_ += mol->getNConstraintPairs();
179 <
180 <      addExcludePairs(mol);
181 <        
179 >      
180 >      addInteractionPairs(mol);
181 >      
182        return true;
183      } else {
184        return false;
185      }
186    }
187 <
187 >  
188    bool SimInfo::removeMolecule(Molecule* mol) {
189      MoleculeIterator i;
190      i = molecules_.find(mol->getGlobalIndex());
# Line 219 | Line 197 | namespace oopse {
197        nBonds_ -= mol->getNBonds();
198        nBends_ -= mol->getNBends();
199        nTorsions_ -= mol->getNTorsions();
200 +      nInversions_ -= mol->getNInversions();
201        nRigidBodies_ -= mol->getNRigidBodies();
202        nIntegrableObjects_ -= mol->getNIntegrableObjects();
203        nCutoffGroups_ -= mol->getNCutoffGroups();
204        nConstraints_ -= mol->getNConstraintPairs();
205  
206 <      removeExcludePairs(mol);
206 >      removeInteractionPairs(mol);
207        molecules_.erase(mol->getGlobalIndex());
208  
209        delete mol;
# Line 233 | Line 212 | namespace oopse {
212      } else {
213        return false;
214      }
236
237
215    }    
216  
217          
# Line 252 | Line 229 | namespace oopse {
229    void SimInfo::calcNdf() {
230      int ndf_local;
231      MoleculeIterator i;
232 <    std::vector<StuntDouble*>::iterator j;
232 >    vector<StuntDouble*>::iterator j;
233      Molecule* mol;
234      StuntDouble* integrableObject;
235  
# Line 303 | Line 280 | namespace oopse {
280      int ndfRaw_local;
281  
282      MoleculeIterator i;
283 <    std::vector<StuntDouble*>::iterator j;
283 >    vector<StuntDouble*>::iterator j;
284      Molecule* mol;
285      StuntDouble* integrableObject;
286  
# Line 350 | Line 327 | namespace oopse {
327  
328    }
329  
330 <  void SimInfo::addExcludePairs(Molecule* mol) {
331 <    std::vector<Bond*>::iterator bondIter;
332 <    std::vector<Bend*>::iterator bendIter;
333 <    std::vector<Torsion*>::iterator torsionIter;
330 >  void SimInfo::addInteractionPairs(Molecule* mol) {
331 >    ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
332 >    vector<Bond*>::iterator bondIter;
333 >    vector<Bend*>::iterator bendIter;
334 >    vector<Torsion*>::iterator torsionIter;
335 >    vector<Inversion*>::iterator inversionIter;
336      Bond* bond;
337      Bend* bend;
338      Torsion* torsion;
339 +    Inversion* inversion;
340      int a;
341      int b;
342      int c;
343      int d;
344  
345 <    std::map<int, std::set<int> > atomGroups;
345 >    // atomGroups can be used to add special interaction maps between
346 >    // groups of atoms that are in two separate rigid bodies.
347 >    // However, most site-site interactions between two rigid bodies
348 >    // are probably not special, just the ones between the physically
349 >    // bonded atoms.  Interactions *within* a single rigid body should
350 >    // always be excluded.  These are done at the bottom of this
351 >    // function.
352  
353 +    map<int, set<int> > atomGroups;
354      Molecule::RigidBodyIterator rbIter;
355      RigidBody* rb;
356      Molecule::IntegrableObjectIterator ii;
357      StuntDouble* integrableObject;
358      
359 <    for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
360 <           integrableObject = mol->nextIntegrableObject(ii)) {
361 <
359 >    for (integrableObject = mol->beginIntegrableObject(ii);
360 >         integrableObject != NULL;
361 >         integrableObject = mol->nextIntegrableObject(ii)) {
362 >      
363        if (integrableObject->isRigidBody()) {
364 <          rb = static_cast<RigidBody*>(integrableObject);
365 <          std::vector<Atom*> atoms = rb->getAtoms();
366 <          std::set<int> rigidAtoms;
367 <          for (int i = 0; i < atoms.size(); ++i) {
368 <            rigidAtoms.insert(atoms[i]->getGlobalIndex());
369 <          }
370 <          for (int i = 0; i < atoms.size(); ++i) {
371 <            atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
372 <          }      
373 <      } else {
374 <        std::set<int> oneAtomSet;
364 >        rb = static_cast<RigidBody*>(integrableObject);
365 >        vector<Atom*> atoms = rb->getAtoms();
366 >        set<int> rigidAtoms;
367 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
368 >          rigidAtoms.insert(atoms[i]->getGlobalIndex());
369 >        }
370 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
371 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
372 >        }      
373 >      } else {
374 >        set<int> oneAtomSet;
375          oneAtomSet.insert(integrableObject->getGlobalIndex());
376 <        atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
376 >        atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
377        }
378      }  
379 +          
380 +    for (bond= mol->beginBond(bondIter); bond != NULL;
381 +         bond = mol->nextBond(bondIter)) {
382  
392    
393    
394    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
383        a = bond->getAtomA()->getGlobalIndex();
384 <      b = bond->getAtomB()->getGlobalIndex();        
385 <      exclude_.addPair(a, b);
384 >      b = bond->getAtomB()->getGlobalIndex();  
385 >    
386 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
387 >        oneTwoInteractions_.addPair(a, b);
388 >      } else {
389 >        excludedInteractions_.addPair(a, b);
390 >      }
391      }
392  
393 <    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
393 >    for (bend= mol->beginBend(bendIter); bend != NULL;
394 >         bend = mol->nextBend(bendIter)) {
395 >
396        a = bend->getAtomA()->getGlobalIndex();
397        b = bend->getAtomB()->getGlobalIndex();        
398        c = bend->getAtomC()->getGlobalIndex();
404      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
405      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
406      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
407
408      exclude_.addPairs(rigidSetA, rigidSetB);
409      exclude_.addPairs(rigidSetA, rigidSetC);
410      exclude_.addPairs(rigidSetB, rigidSetC);
399        
400 <      //exclude_.addPair(a, b);
401 <      //exclude_.addPair(a, c);
402 <      //exclude_.addPair(b, c);        
400 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
401 >        oneTwoInteractions_.addPair(a, b);      
402 >        oneTwoInteractions_.addPair(b, c);
403 >      } else {
404 >        excludedInteractions_.addPair(a, b);
405 >        excludedInteractions_.addPair(b, c);
406 >      }
407 >
408 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
409 >        oneThreeInteractions_.addPair(a, c);      
410 >      } else {
411 >        excludedInteractions_.addPair(a, c);
412 >      }
413      }
414  
415 <    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
415 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
416 >         torsion = mol->nextTorsion(torsionIter)) {
417 >
418        a = torsion->getAtomA()->getGlobalIndex();
419        b = torsion->getAtomB()->getGlobalIndex();        
420        c = torsion->getAtomC()->getGlobalIndex();        
421 <      d = torsion->getAtomD()->getGlobalIndex();        
422 <      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
423 <      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
424 <      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
425 <      std::set<int> rigidSetD = getRigidSet(d, atomGroups);
421 >      d = torsion->getAtomD()->getGlobalIndex();      
422  
423 <      exclude_.addPairs(rigidSetA, rigidSetB);
424 <      exclude_.addPairs(rigidSetA, rigidSetC);
425 <      exclude_.addPairs(rigidSetA, rigidSetD);
426 <      exclude_.addPairs(rigidSetB, rigidSetC);
427 <      exclude_.addPairs(rigidSetB, rigidSetD);
428 <      exclude_.addPairs(rigidSetC, rigidSetD);
423 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
424 >        oneTwoInteractions_.addPair(a, b);      
425 >        oneTwoInteractions_.addPair(b, c);
426 >        oneTwoInteractions_.addPair(c, d);
427 >      } else {
428 >        excludedInteractions_.addPair(a, b);
429 >        excludedInteractions_.addPair(b, c);
430 >        excludedInteractions_.addPair(c, d);
431 >      }
432  
433 <      /*
434 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
435 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
436 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
437 <      exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
438 <      exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
439 <      exclude_.addPairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
440 <        
441 <      
442 <      exclude_.addPair(a, b);
443 <      exclude_.addPair(a, c);
444 <      exclude_.addPair(a, d);
445 <      exclude_.addPair(b, c);
447 <      exclude_.addPair(b, d);
448 <      exclude_.addPair(c, d);        
449 <      */
433 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
434 >        oneThreeInteractions_.addPair(a, c);      
435 >        oneThreeInteractions_.addPair(b, d);      
436 >      } else {
437 >        excludedInteractions_.addPair(a, c);
438 >        excludedInteractions_.addPair(b, d);
439 >      }
440 >
441 >      if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
442 >        oneFourInteractions_.addPair(a, d);      
443 >      } else {
444 >        excludedInteractions_.addPair(a, d);
445 >      }
446      }
447  
448 <    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
449 <      std::vector<Atom*> atoms = rb->getAtoms();
450 <      for (int i = 0; i < atoms.size() -1 ; ++i) {
451 <        for (int j = i + 1; j < atoms.size(); ++j) {
448 >    for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
449 >         inversion = mol->nextInversion(inversionIter)) {
450 >
451 >      a = inversion->getAtomA()->getGlobalIndex();
452 >      b = inversion->getAtomB()->getGlobalIndex();        
453 >      c = inversion->getAtomC()->getGlobalIndex();        
454 >      d = inversion->getAtomD()->getGlobalIndex();        
455 >
456 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
457 >        oneTwoInteractions_.addPair(a, b);      
458 >        oneTwoInteractions_.addPair(a, c);
459 >        oneTwoInteractions_.addPair(a, d);
460 >      } else {
461 >        excludedInteractions_.addPair(a, b);
462 >        excludedInteractions_.addPair(a, c);
463 >        excludedInteractions_.addPair(a, d);
464 >      }
465 >
466 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
467 >        oneThreeInteractions_.addPair(b, c);    
468 >        oneThreeInteractions_.addPair(b, d);    
469 >        oneThreeInteractions_.addPair(c, d);      
470 >      } else {
471 >        excludedInteractions_.addPair(b, c);
472 >        excludedInteractions_.addPair(b, d);
473 >        excludedInteractions_.addPair(c, d);
474 >      }
475 >    }
476 >
477 >    for (rb = mol->beginRigidBody(rbIter); rb != NULL;
478 >         rb = mol->nextRigidBody(rbIter)) {
479 >      vector<Atom*> atoms = rb->getAtoms();
480 >      for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
481 >        for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
482            a = atoms[i]->getGlobalIndex();
483            b = atoms[j]->getGlobalIndex();
484 <          exclude_.addPair(a, b);
484 >          excludedInteractions_.addPair(a, b);
485          }
486        }
487      }        
488  
489    }
490  
491 <  void SimInfo::removeExcludePairs(Molecule* mol) {
492 <    std::vector<Bond*>::iterator bondIter;
493 <    std::vector<Bend*>::iterator bendIter;
494 <    std::vector<Torsion*>::iterator torsionIter;
491 >  void SimInfo::removeInteractionPairs(Molecule* mol) {
492 >    ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
493 >    vector<Bond*>::iterator bondIter;
494 >    vector<Bend*>::iterator bendIter;
495 >    vector<Torsion*>::iterator torsionIter;
496 >    vector<Inversion*>::iterator inversionIter;
497      Bond* bond;
498      Bend* bend;
499      Torsion* torsion;
500 +    Inversion* inversion;
501      int a;
502      int b;
503      int c;
504      int d;
505  
506 <    std::map<int, std::set<int> > atomGroups;
478 <
506 >    map<int, set<int> > atomGroups;
507      Molecule::RigidBodyIterator rbIter;
508      RigidBody* rb;
509      Molecule::IntegrableObjectIterator ii;
510      StuntDouble* integrableObject;
511      
512 <    for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
513 <           integrableObject = mol->nextIntegrableObject(ii)) {
514 <
512 >    for (integrableObject = mol->beginIntegrableObject(ii);
513 >         integrableObject != NULL;
514 >         integrableObject = mol->nextIntegrableObject(ii)) {
515 >      
516        if (integrableObject->isRigidBody()) {
517 <          rb = static_cast<RigidBody*>(integrableObject);
518 <          std::vector<Atom*> atoms = rb->getAtoms();
519 <          std::set<int> rigidAtoms;
520 <          for (int i = 0; i < atoms.size(); ++i) {
521 <            rigidAtoms.insert(atoms[i]->getGlobalIndex());
522 <          }
523 <          for (int i = 0; i < atoms.size(); ++i) {
524 <            atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
525 <          }      
517 >        rb = static_cast<RigidBody*>(integrableObject);
518 >        vector<Atom*> atoms = rb->getAtoms();
519 >        set<int> rigidAtoms;
520 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
521 >          rigidAtoms.insert(atoms[i]->getGlobalIndex());
522 >        }
523 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
524 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
525 >        }      
526        } else {
527 <        std::set<int> oneAtomSet;
527 >        set<int> oneAtomSet;
528          oneAtomSet.insert(integrableObject->getGlobalIndex());
529 <        atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
529 >        atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
530        }
531      }  
532  
533 <    
534 <    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
533 >    for (bond= mol->beginBond(bondIter); bond != NULL;
534 >         bond = mol->nextBond(bondIter)) {
535 >      
536        a = bond->getAtomA()->getGlobalIndex();
537 <      b = bond->getAtomB()->getGlobalIndex();        
538 <      exclude_.removePair(a, b);
537 >      b = bond->getAtomB()->getGlobalIndex();  
538 >    
539 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
540 >        oneTwoInteractions_.removePair(a, b);
541 >      } else {
542 >        excludedInteractions_.removePair(a, b);
543 >      }
544      }
545  
546 <    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
546 >    for (bend= mol->beginBend(bendIter); bend != NULL;
547 >         bend = mol->nextBend(bendIter)) {
548 >
549        a = bend->getAtomA()->getGlobalIndex();
550        b = bend->getAtomB()->getGlobalIndex();        
551        c = bend->getAtomC()->getGlobalIndex();
515
516      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
517      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
518      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
519
520      exclude_.removePairs(rigidSetA, rigidSetB);
521      exclude_.removePairs(rigidSetA, rigidSetC);
522      exclude_.removePairs(rigidSetB, rigidSetC);
552        
553 <      //exclude_.removePair(a, b);
554 <      //exclude_.removePair(a, c);
555 <      //exclude_.removePair(b, c);        
553 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
554 >        oneTwoInteractions_.removePair(a, b);      
555 >        oneTwoInteractions_.removePair(b, c);
556 >      } else {
557 >        excludedInteractions_.removePair(a, b);
558 >        excludedInteractions_.removePair(b, c);
559 >      }
560 >
561 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
562 >        oneThreeInteractions_.removePair(a, c);      
563 >      } else {
564 >        excludedInteractions_.removePair(a, c);
565 >      }
566      }
567  
568 <    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
568 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
569 >         torsion = mol->nextTorsion(torsionIter)) {
570 >
571        a = torsion->getAtomA()->getGlobalIndex();
572        b = torsion->getAtomB()->getGlobalIndex();        
573        c = torsion->getAtomC()->getGlobalIndex();        
574 <      d = torsion->getAtomD()->getGlobalIndex();        
574 >      d = torsion->getAtomD()->getGlobalIndex();      
575 >  
576 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
577 >        oneTwoInteractions_.removePair(a, b);      
578 >        oneTwoInteractions_.removePair(b, c);
579 >        oneTwoInteractions_.removePair(c, d);
580 >      } else {
581 >        excludedInteractions_.removePair(a, b);
582 >        excludedInteractions_.removePair(b, c);
583 >        excludedInteractions_.removePair(c, d);
584 >      }
585  
586 <      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
587 <      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
588 <      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
589 <      std::set<int> rigidSetD = getRigidSet(d, atomGroups);
586 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
587 >        oneThreeInteractions_.removePair(a, c);      
588 >        oneThreeInteractions_.removePair(b, d);      
589 >      } else {
590 >        excludedInteractions_.removePair(a, c);
591 >        excludedInteractions_.removePair(b, d);
592 >      }
593  
594 <      exclude_.removePairs(rigidSetA, rigidSetB);
595 <      exclude_.removePairs(rigidSetA, rigidSetC);
596 <      exclude_.removePairs(rigidSetA, rigidSetD);
597 <      exclude_.removePairs(rigidSetB, rigidSetC);
598 <      exclude_.removePairs(rigidSetB, rigidSetD);
599 <      exclude_.removePairs(rigidSetC, rigidSetD);
594 >      if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
595 >        oneFourInteractions_.removePair(a, d);      
596 >      } else {
597 >        excludedInteractions_.removePair(a, d);
598 >      }
599 >    }
600  
601 <      /*
602 <      exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
549 <      exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
550 <      exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
551 <      exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
552 <      exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
553 <      exclude_.removePairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
601 >    for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
602 >         inversion = mol->nextInversion(inversionIter)) {
603  
604 <      
605 <      exclude_.removePair(a, b);
606 <      exclude_.removePair(a, c);
607 <      exclude_.removePair(a, d);
608 <      exclude_.removePair(b, c);
609 <      exclude_.removePair(b, d);
610 <      exclude_.removePair(c, d);        
611 <      */
604 >      a = inversion->getAtomA()->getGlobalIndex();
605 >      b = inversion->getAtomB()->getGlobalIndex();        
606 >      c = inversion->getAtomC()->getGlobalIndex();        
607 >      d = inversion->getAtomD()->getGlobalIndex();        
608 >
609 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
610 >        oneTwoInteractions_.removePair(a, b);      
611 >        oneTwoInteractions_.removePair(a, c);
612 >        oneTwoInteractions_.removePair(a, d);
613 >      } else {
614 >        excludedInteractions_.removePair(a, b);
615 >        excludedInteractions_.removePair(a, c);
616 >        excludedInteractions_.removePair(a, d);
617 >      }
618 >
619 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
620 >        oneThreeInteractions_.removePair(b, c);    
621 >        oneThreeInteractions_.removePair(b, d);    
622 >        oneThreeInteractions_.removePair(c, d);      
623 >      } else {
624 >        excludedInteractions_.removePair(b, c);
625 >        excludedInteractions_.removePair(b, d);
626 >        excludedInteractions_.removePair(c, d);
627 >      }
628      }
629  
630 <    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
631 <      std::vector<Atom*> atoms = rb->getAtoms();
632 <      for (int i = 0; i < atoms.size() -1 ; ++i) {
633 <        for (int j = i + 1; j < atoms.size(); ++j) {
630 >    for (rb = mol->beginRigidBody(rbIter); rb != NULL;
631 >         rb = mol->nextRigidBody(rbIter)) {
632 >      vector<Atom*> atoms = rb->getAtoms();
633 >      for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
634 >        for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
635            a = atoms[i]->getGlobalIndex();
636            b = atoms[j]->getGlobalIndex();
637 <          exclude_.removePair(a, b);
637 >          excludedInteractions_.removePair(a, b);
638          }
639        }
640      }        
641 <
641 >    
642    }
643 <
644 <
643 >  
644 >  
645    void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
646      int curStampId;
647 <
647 >    
648      //index from 0
649      curStampId = moleculeStamps_.size();
650  
# Line 586 | Line 652 | namespace oopse {
652      molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
653    }
654  
589  void SimInfo::update() {
655  
656 <    setupSimType();
657 <
658 < #ifdef IS_MPI
659 <    setupFortranParallel();
660 < #endif
661 <
662 <    setupFortranSim();
663 <
664 <    //setup fortran force field
600 <    /** @deprecate */    
601 <    int isError = 0;
602 <    
603 <    setupElectrostaticSummationMethod( isError );
604 <    setupSwitchingFunction();
605 <
606 <    if(isError){
607 <      sprintf( painCave.errMsg,
608 <               "ForceField error: There was an error initializing the forceField in fortran.\n" );
609 <      painCave.isFatal = 1;
610 <      simError();
611 <    }
612 <  
613 <    
614 <    setupCutoff();
615 <
656 >  /**
657 >   * update
658 >   *
659 >   *  Performs the global checks and variable settings after the
660 >   *  objects have been created.
661 >   *
662 >   */
663 >  void SimInfo::update() {  
664 >    setupSimVariables();
665      calcNdf();
666      calcNdfRaw();
667      calcNdfTrans();
619
620    fortranInitialized_ = true;
668    }
669 <
670 <  std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
669 >  
670 >  /**
671 >   * getSimulatedAtomTypes
672 >   *
673 >   * Returns an STL set of AtomType* that are actually present in this
674 >   * simulation.  Must query all processors to assemble this information.
675 >   *
676 >   */
677 >  set<AtomType*> SimInfo::getSimulatedAtomTypes() {
678      SimInfo::MoleculeIterator mi;
679      Molecule* mol;
680      Molecule::AtomIterator ai;
681      Atom* atom;
682 <    std::set<AtomType*> atomTypes;
683 <
684 <    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
631 <
682 >    set<AtomType*> atomTypes;
683 >    
684 >    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {      
685        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
686          atomTypes.insert(atom->getAtomType());
687 <      }
688 <        
636 <    }
687 >      }      
688 >    }    
689  
690 <    return atomTypes;        
639 <  }
690 > #ifdef IS_MPI
691  
692 <  void SimInfo::setupSimType() {
693 <    std::set<AtomType*>::iterator i;
643 <    std::set<AtomType*> atomTypes;
644 <    atomTypes = getUniqueAtomTypes();
645 <    
646 <    int useLennardJones = 0;
647 <    int useElectrostatic = 0;
648 <    int useEAM = 0;
649 <    int useSC = 0;
650 <    int useCharge = 0;
651 <    int useDirectional = 0;
652 <    int useDipole = 0;
653 <    int useGayBerne = 0;
654 <    int useSticky = 0;
655 <    int useStickyPower = 0;
656 <    int useShape = 0;
657 <    int useFLARB = 0; //it is not in AtomType yet
658 <    int useDirectionalAtom = 0;    
659 <    int useElectrostatics = 0;
660 <    //usePBC and useRF are from simParams
661 <    int usePBC = simParams_->getUsePeriodicBoundaryConditions();
662 <    int useRF;
663 <    int useSF;
664 <    std::string myMethod;
692 >    // loop over the found atom types on this processor, and add their
693 >    // numerical idents to a vector:
694  
695 <    // set the useRF logical
696 <    useRF = 0;
697 <    useSF = 0;
695 >    vector<int> foundTypes;
696 >    set<AtomType*>::iterator i;
697 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
698 >      foundTypes.push_back( (*i)->getIdent() );
699  
700 +    // count_local holds the number of found types on this processor
701 +    int count_local = foundTypes.size();
702  
703 <    if (simParams_->haveElectrostaticSummationMethod()) {
704 <      std::string myMethod = simParams_->getElectrostaticSummationMethod();
705 <      toUpper(myMethod);
706 <      if (myMethod == "REACTION_FIELD") {
675 <        useRF=1;
676 <      } else {
677 <        if (myMethod == "SHIFTED_FORCE") {
678 <          useSF = 1;
679 <        }
680 <      }
681 <    }
703 >    // count holds the total number of found types on all processors
704 >    // (some will be redundant with the ones found locally):
705 >    int count;
706 >    MPI::COMM_WORLD.Allreduce(&count_local, &count, 1, MPI::INT, MPI::SUM);
707  
708 <    //loop over all of the atom types
709 <    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
710 <      useLennardJones |= (*i)->isLennardJones();
711 <      useElectrostatic |= (*i)->isElectrostatic();
687 <      useEAM |= (*i)->isEAM();
688 <      useSC |= (*i)->isSC();
689 <      useCharge |= (*i)->isCharge();
690 <      useDirectional |= (*i)->isDirectional();
691 <      useDipole |= (*i)->isDipole();
692 <      useGayBerne |= (*i)->isGayBerne();
693 <      useSticky |= (*i)->isSticky();
694 <      useStickyPower |= (*i)->isStickyPower();
695 <      useShape |= (*i)->isShape();
696 <    }
708 >    // create a vector to hold the globally found types, and resize it:
709 >    vector<int> ftGlobal;
710 >    ftGlobal.resize(count);
711 >    vector<int> counts;
712  
713 <    if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
714 <      useDirectionalAtom = 1;
715 <    }
713 >    int nproc = MPI::COMM_WORLD.Get_size();
714 >    counts.resize(nproc);
715 >    vector<int> disps;
716 >    disps.resize(nproc);
717  
718 <    if (useCharge || useDipole) {
703 <      useElectrostatics = 1;
704 <    }
705 <
706 < #ifdef IS_MPI    
707 <    int temp;
708 <
709 <    temp = usePBC;
710 <    MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
711 <
712 <    temp = useDirectionalAtom;
713 <    MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
714 <
715 <    temp = useLennardJones;
716 <    MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
717 <
718 <    temp = useElectrostatics;
719 <    MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
720 <
721 <    temp = useCharge;
722 <    MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
723 <
724 <    temp = useDipole;
725 <    MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
726 <
727 <    temp = useSticky;
728 <    MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
729 <
730 <    temp = useStickyPower;
731 <    MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
718 >    // now spray out the foundTypes to all the other processors:
719      
720 <    temp = useGayBerne;
721 <    MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
720 >    MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
721 >                               &ftGlobal[0], &counts[0], &disps[0], MPI::INT);
722  
723 <    temp = useEAM;
724 <    MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
725 <
726 <    temp = useSC;
727 <    MPI_Allreduce(&temp, &useSC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
723 >    // foundIdents is a stl set, so inserting an already found ident
724 >    // will have no effect.
725 >    set<int> foundIdents;
726 >    vector<int>::iterator j;
727 >    for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
728 >      foundIdents.insert((*j));
729      
730 <    temp = useShape;
731 <    MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);  
730 >    // now iterate over the foundIdents and get the actual atom types
731 >    // that correspond to these:
732 >    set<int>::iterator it;
733 >    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
734 >      atomTypes.insert( forceField_->getAtomType((*it)) );
735 >
736 > #endif
737 >    
738 >    return atomTypes;        
739 >  }
740  
741 <    temp = useFLARB;
742 <    MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
741 >  void SimInfo::setupSimVariables() {
742 >    useAtomicVirial_ = simParams_->getUseAtomicVirial();
743 >    // we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
744 >    calcBoxDipole_ = false;
745 >    if ( simParams_->haveAccumulateBoxDipole() )
746 >      if ( simParams_->getAccumulateBoxDipole() ) {
747 >        calcBoxDipole_ = true;      
748 >      }
749  
750 <    temp = useRF;
751 <    MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
750 >    set<AtomType*>::iterator i;
751 >    set<AtomType*> atomTypes;
752 >    atomTypes = getSimulatedAtomTypes();    
753 >    int usesElectrostatic = 0;
754 >    int usesMetallic = 0;
755 >    int usesDirectional = 0;
756 >    //loop over all of the atom types
757 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
758 >      usesElectrostatic |= (*i)->isElectrostatic();
759 >      usesMetallic |= (*i)->isMetal();
760 >      usesDirectional |= (*i)->isDirectional();
761 >    }
762  
763 <    temp = useSF;
764 <    MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
763 > #ifdef IS_MPI    
764 >    int temp;
765 >    temp = usesDirectional;
766 >    MPI_Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
767  
768 < #endif
768 >    temp = usesMetallic;
769 >    MPI_Allreduce(&temp, &usesMetallicAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
770  
771 <    fInfo_.SIM_uses_PBC = usePBC;    
772 <    fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
773 <    fInfo_.SIM_uses_LennardJones = useLennardJones;
774 <    fInfo_.SIM_uses_Electrostatics = useElectrostatics;    
775 <    fInfo_.SIM_uses_Charges = useCharge;
776 <    fInfo_.SIM_uses_Dipoles = useDipole;
777 <    fInfo_.SIM_uses_Sticky = useSticky;
778 <    fInfo_.SIM_uses_StickyPower = useStickyPower;
779 <    fInfo_.SIM_uses_GayBerne = useGayBerne;
765 <    fInfo_.SIM_uses_EAM = useEAM;
766 <    fInfo_.SIM_uses_SC = useSC;
767 <    fInfo_.SIM_uses_Shapes = useShape;
768 <    fInfo_.SIM_uses_FLARB = useFLARB;
769 <    fInfo_.SIM_uses_RF = useRF;
770 <    fInfo_.SIM_uses_SF = useSF;
771 <
772 <    if( myMethod == "REACTION_FIELD") {
773 <      
774 <      if (simParams_->haveDielectric()) {
775 <        fInfo_.dielect = simParams_->getDielectric();
776 <      } else {
777 <        sprintf(painCave.errMsg,
778 <                "SimSetup Error: No Dielectric constant was set.\n"
779 <                "\tYou are trying to use Reaction Field without"
780 <                "\tsetting a dielectric constant!\n");
781 <        painCave.isFatal = 1;
782 <        simError();
783 <      }      
784 <    }
785 <
771 >    temp = usesElectrostatic;
772 >    MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
773 > #endif
774 >    fInfo_.SIM_uses_PBC = usesPeriodicBoundaries_;    
775 >    fInfo_.SIM_uses_DirectionalAtoms = usesDirectionalAtoms_;
776 >    fInfo_.SIM_uses_MetallicAtoms = usesMetallicAtoms_;
777 >    fInfo_.SIM_requires_SkipCorrection = usesElectrostaticAtoms_;
778 >    fInfo_.SIM_requires_SelfCorrection = usesElectrostaticAtoms_;
779 >    fInfo_.SIM_uses_AtomicVirial = usesAtomicVirial_;
780    }
781  
782 <  void SimInfo::setupFortranSim() {
782 >  void SimInfo::setupFortran() {
783      int isError;
784 <    int nExclude;
785 <    std::vector<int> fortranGlobalGroupMembership;
784 >    int nExclude, nOneTwo, nOneThree, nOneFour;
785 >    vector<int> fortranGlobalGroupMembership;
786      
793    nExclude = exclude_.getSize();
787      isError = 0;
788  
789      //globalGroupMembership_ is filled by SimCreator    
# Line 799 | Line 792 | namespace oopse {
792      }
793  
794      //calculate mass ratio of cutoff group
795 <    std::vector<RealType> mfact;
795 >    vector<RealType> mfact;
796      SimInfo::MoleculeIterator mi;
797      Molecule* mol;
798      Molecule::CutoffGroupIterator ci;
# Line 822 | Line 815 | namespace oopse {
815            else
816              mfact.push_back( 1.0 );
817          }
825
818        }      
819      }
820  
821 <    //fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
822 <    std::vector<int> identArray;
821 >    //fill ident array of local atoms (it is actually ident of
822 >    //AtomType, it is so confusing !!!)
823 >    vector<int> identArray;
824  
825      //to avoid memory reallocation, reserve enough space identArray
826      identArray.reserve(getNAtoms());
# Line 840 | Line 833 | namespace oopse {
833  
834      //fill molMembershipArray
835      //molMembershipArray is filled by SimCreator    
836 <    std::vector<int> molMembershipArray(nGlobalAtoms_);
836 >    vector<int> molMembershipArray(nGlobalAtoms_);
837      for (int i = 0; i < nGlobalAtoms_; i++) {
838        molMembershipArray[i] = globalMolMembership_[i] + 1;
839      }
840      
841      //setup fortran simulation
849    int nGlobalExcludes = 0;
850    int* globalExcludes = NULL;
851    int* excludeList = exclude_.getExcludeList();
852    setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0], &nExclude, excludeList ,
853                   &nGlobalExcludes, globalExcludes, &molMembershipArray[0],
854                   &mfact[0], &nCutoffGroups_, &fortranGlobalGroupMembership[0], &isError);
842  
843 <    if( isError ){
843 >    nExclude = excludedInteractions_.getSize();
844 >    nOneTwo = oneTwoInteractions_.getSize();
845 >    nOneThree = oneThreeInteractions_.getSize();
846 >    nOneFour = oneFourInteractions_.getSize();
847  
848 +    int* excludeList = excludedInteractions_.getPairList();
849 +    int* oneTwoList = oneTwoInteractions_.getPairList();
850 +    int* oneThreeList = oneThreeInteractions_.getPairList();
851 +    int* oneFourList = oneFourInteractions_.getPairList();
852 +
853 +    setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0],
854 +                   &nExclude, excludeList,
855 +                   &nOneTwo, oneTwoList,
856 +                   &nOneThree, oneThreeList,
857 +                   &nOneFour, oneFourList,
858 +                   &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
859 +                   &fortranGlobalGroupMembership[0], &isError);
860 +    
861 +    if( isError ){
862 +      
863        sprintf( painCave.errMsg,
864                 "There was an error setting the simulation information in fortran.\n" );
865        painCave.isFatal = 1;
866 <      painCave.severity = OOPSE_ERROR;
866 >      painCave.severity = OPENMD_ERROR;
867        simError();
868      }
869 <
870 < #ifdef IS_MPI
869 >    
870 >    
871      sprintf( checkPointMsg,
872               "succesfully sent the simulation information to fortran.\n");
868    MPIcheckPoint();
869 #endif // is_mpi
870  }
871
872
873 #ifdef IS_MPI
874  void SimInfo::setupFortranParallel() {
873      
874 <    //SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
875 <    std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
876 <    std::vector<int> localToGlobalCutoffGroupIndex;
877 <    SimInfo::MoleculeIterator mi;
878 <    Molecule::AtomIterator ai;
879 <    Molecule::CutoffGroupIterator ci;
880 <    Molecule* mol;
881 <    Atom* atom;
882 <    CutoffGroup* cg;
874 >    errorCheckPoint();
875 >    
876 >    // Setup number of neighbors in neighbor list if present
877 >    if (simParams_->haveNeighborListNeighbors()) {
878 >      int nlistNeighbors = simParams_->getNeighborListNeighbors();
879 >      setNeighbors(&nlistNeighbors);
880 >    }
881 >  
882 > #ifdef IS_MPI    
883 >    //SimInfo is responsible for creating localToGlobalAtomIndex and
884 >    //localToGlobalGroupIndex
885 >    vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
886 >    vector<int> localToGlobalCutoffGroupIndex;
887      mpiSimData parallelData;
886    int isError;
888  
889      for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
890  
# Line 922 | Line 923 | namespace oopse {
923      }
924  
925      sprintf(checkPointMsg, " mpiRefresh successful.\n");
926 <    MPIcheckPoint();
926 <
927 <
928 <  }
929 <
926 >    errorCheckPoint();
927   #endif
928  
929 <  void SimInfo::setupCutoff() {          
930 <    
931 <    ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
932 <
933 <    // Check the cutoff policy
934 <    int cp =  TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
938 <
939 <    std::string myPolicy;
940 <    if (forceFieldOptions_.haveCutoffPolicy()){
941 <      myPolicy = forceFieldOptions_.getCutoffPolicy();
942 <    }else if (simParams_->haveCutoffPolicy()) {
943 <      myPolicy = simParams_->getCutoffPolicy();
929 >    initFortranFF(&isError);
930 >    if (isError) {
931 >      sprintf(painCave.errMsg,
932 >              "initFortranFF errror: fortran didn't like something we gave it.\n");
933 >      painCave.isFatal = 1;
934 >      simError();
935      }
936 <
946 <    if (!myPolicy.empty()){
947 <      toUpper(myPolicy);
948 <      if (myPolicy == "MIX") {
949 <        cp = MIX_CUTOFF_POLICY;
950 <      } else {
951 <        if (myPolicy == "MAX") {
952 <          cp = MAX_CUTOFF_POLICY;
953 <        } else {
954 <          if (myPolicy == "TRADITIONAL") {            
955 <            cp = TRADITIONAL_CUTOFF_POLICY;
956 <          } else {
957 <            // throw error        
958 <            sprintf( painCave.errMsg,
959 <                     "SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
960 <            painCave.isFatal = 1;
961 <            simError();
962 <          }    
963 <        }          
964 <      }
965 <    }          
966 <    notifyFortranCutoffPolicy(&cp);
967 <
968 <    // Check the Skin Thickness for neighborlists
969 <    RealType skin;
970 <    if (simParams_->haveSkinThickness()) {
971 <      skin = simParams_->getSkinThickness();
972 <      notifyFortranSkinThickness(&skin);
973 <    }            
974 <        
975 <    // Check if the cutoff was set explicitly:
976 <    if (simParams_->haveCutoffRadius()) {
977 <      rcut_ = simParams_->getCutoffRadius();
978 <      if (simParams_->haveSwitchingRadius()) {
979 <        rsw_  = simParams_->getSwitchingRadius();
980 <      } else {
981 <        if (fInfo_.SIM_uses_Charges |
982 <            fInfo_.SIM_uses_Dipoles |
983 <            fInfo_.SIM_uses_RF) {
984 <          
985 <          rsw_ = 0.85 * rcut_;
986 <          sprintf(painCave.errMsg,
987 <                  "SimCreator Warning: No value was set for the switchingRadius.\n"
988 <                  "\tOOPSE will use a default value of 85 percent of the cutoffRadius.\n"
989 <                  "\tswitchingRadius = %f. for this simulation\n", rsw_);
990 <        painCave.isFatal = 0;
991 <        simError();
992 <        } else {
993 <          rsw_ = rcut_;
994 <          sprintf(painCave.errMsg,
995 <                  "SimCreator Warning: No value was set for the switchingRadius.\n"
996 <                  "\tOOPSE will use the same value as the cutoffRadius.\n"
997 <                  "\tswitchingRadius = %f. for this simulation\n", rsw_);
998 <          painCave.isFatal = 0;
999 <          simError();
1000 <        }
1001 <      }
1002 <      
1003 <      notifyFortranCutoffs(&rcut_, &rsw_);
1004 <      
1005 <    } else {
1006 <      
1007 <      // For electrostatic atoms, we'll assume a large safe value:
1008 <      if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
1009 <        sprintf(painCave.errMsg,
1010 <                "SimCreator Warning: No value was set for the cutoffRadius.\n"
1011 <                "\tOOPSE will use a default value of 15.0 angstroms"
1012 <                "\tfor the cutoffRadius.\n");
1013 <        painCave.isFatal = 0;
1014 <        simError();
1015 <        rcut_ = 15.0;
1016 <      
1017 <        if (simParams_->haveElectrostaticSummationMethod()) {
1018 <          std::string myMethod = simParams_->getElectrostaticSummationMethod();
1019 <          toUpper(myMethod);
1020 <          if (myMethod == "SHIFTED_POTENTIAL" || myMethod == "SHIFTED_FORCE") {
1021 <            if (simParams_->haveSwitchingRadius()){
1022 <              sprintf(painCave.errMsg,
1023 <                      "SimInfo Warning: A value was set for the switchingRadius\n"
1024 <                      "\teven though the electrostaticSummationMethod was\n"
1025 <                      "\tset to %s\n", myMethod.c_str());
1026 <              painCave.isFatal = 1;
1027 <              simError();            
1028 <            }
1029 <          }
1030 <        }
1031 <      
1032 <        if (simParams_->haveSwitchingRadius()){
1033 <          rsw_ = simParams_->getSwitchingRadius();
1034 <        } else {        
1035 <          sprintf(painCave.errMsg,
1036 <                  "SimCreator Warning: No value was set for switchingRadius.\n"
1037 <                  "\tOOPSE will use a default value of\n"
1038 <                  "\t0.85 * cutoffRadius for the switchingRadius\n");
1039 <          painCave.isFatal = 0;
1040 <          simError();
1041 <          rsw_ = 0.85 * rcut_;
1042 <        }
1043 <        notifyFortranCutoffs(&rcut_, &rsw_);
1044 <      } else {
1045 <        // We didn't set rcut explicitly, and we don't have electrostatic atoms, so
1046 <        // We'll punt and let fortran figure out the cutoffs later.
1047 <        
1048 <        notifyFortranYouAreOnYourOwn();
1049 <
1050 <      }
1051 <    }
1052 <  }
1053 <
1054 <  void SimInfo::setupElectrostaticSummationMethod( int isError ) {    
1055 <    
1056 <    int errorOut;
1057 <    int esm =  NONE;
1058 <    int sm = UNDAMPED;
1059 <    RealType alphaVal;
1060 <    RealType dielectric;
1061 <
1062 <    errorOut = isError;
1063 <    alphaVal = simParams_->getDampingAlpha();
1064 <    dielectric = simParams_->getDielectric();
1065 <
1066 <    if (simParams_->haveElectrostaticSummationMethod()) {
1067 <      std::string myMethod = simParams_->getElectrostaticSummationMethod();
1068 <      toUpper(myMethod);
1069 <      if (myMethod == "NONE") {
1070 <        esm = NONE;
1071 <      } else {
1072 <        if (myMethod == "SWITCHING_FUNCTION") {
1073 <          esm = SWITCHING_FUNCTION;
1074 <        } else {
1075 <          if (myMethod == "SHIFTED_POTENTIAL") {
1076 <            esm = SHIFTED_POTENTIAL;
1077 <          } else {
1078 <            if (myMethod == "SHIFTED_FORCE") {            
1079 <              esm = SHIFTED_FORCE;
1080 <            } else {
1081 <              if (myMethod == "REACTION_FIELD") {            
1082 <                esm = REACTION_FIELD;
1083 <              } else {
1084 <                // throw error        
1085 <                sprintf( painCave.errMsg,
1086 <                         "SimInfo error: Unknown electrostaticSummationMethod.\n"
1087 <                         "\t(Input file specified %s .)\n"
1088 <                         "\telectrostaticSummationMethod must be one of: \"none\",\n"
1089 <                         "\t\"shifted_potential\", \"shifted_force\", or \n"
1090 <                         "\t\"reaction_field\".\n", myMethod.c_str() );
1091 <                painCave.isFatal = 1;
1092 <                simError();
1093 <              }    
1094 <            }          
1095 <          }
1096 <        }
1097 <      }
1098 <    }
1099 <    
1100 <    if (simParams_->haveElectrostaticScreeningMethod()) {
1101 <      std::string myScreen = simParams_->getElectrostaticScreeningMethod();
1102 <      toUpper(myScreen);
1103 <      if (myScreen == "UNDAMPED") {
1104 <        sm = UNDAMPED;
1105 <      } else {
1106 <        if (myScreen == "DAMPED") {
1107 <          sm = DAMPED;
1108 <          if (!simParams_->haveDampingAlpha()) {
1109 <            //throw error
1110 <            sprintf( painCave.errMsg,
1111 <                     "SimInfo warning: dampingAlpha was not specified in the input file.\n"
1112 <                     "\tA default value of %f (1/ang) will be used.\n", alphaVal);
1113 <            painCave.isFatal = 0;
1114 <            simError();
1115 <          }
1116 <        } else {
1117 <          // throw error        
1118 <          sprintf( painCave.errMsg,
1119 <                   "SimInfo error: Unknown electrostaticScreeningMethod.\n"
1120 <                   "\t(Input file specified %s .)\n"
1121 <                   "\telectrostaticScreeningMethod must be one of: \"undamped\"\n"
1122 <                   "or \"damped\".\n", myScreen.c_str() );
1123 <          painCave.isFatal = 1;
1124 <          simError();
1125 <        }
1126 <      }
1127 <    }
1128 <    
1129 <    // let's pass some summation method variables to fortran
1130 <    setElectrostaticSummationMethod( &esm );
1131 <    setFortranElectrostaticMethod( &esm );
1132 <    setScreeningMethod( &sm );
1133 <    setDampingAlpha( &alphaVal );
1134 <    setReactionFieldDielectric( &dielectric );
1135 <    initFortranFF( &errorOut );
936 >    fortranInitialized_ = true;
937    }
938  
1138  void SimInfo::setupSwitchingFunction() {    
1139    int ft = CUBIC;
1140
1141    if (simParams_->haveSwitchingFunctionType()) {
1142      std::string funcType = simParams_->getSwitchingFunctionType();
1143      toUpper(funcType);
1144      if (funcType == "CUBIC") {
1145        ft = CUBIC;
1146      } else {
1147        if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1148          ft = FIFTH_ORDER_POLY;
1149        } else {
1150          // throw error        
1151          sprintf( painCave.errMsg,
1152                   "SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1153          painCave.isFatal = 1;
1154          simError();
1155        }          
1156      }
1157    }
1158
1159    // send switching function notification to switcheroo
1160    setFunctionType(&ft);
1161
1162  }
1163
939    void SimInfo::addProperty(GenericData* genData) {
940      properties_.addProperty(genData);  
941    }
942  
943 <  void SimInfo::removeProperty(const std::string& propName) {
943 >  void SimInfo::removeProperty(const string& propName) {
944      properties_.removeProperty(propName);  
945    }
946  
# Line 1173 | Line 948 | namespace oopse {
948      properties_.clearProperties();
949    }
950  
951 <  std::vector<std::string> SimInfo::getPropertyNames() {
951 >  vector<string> SimInfo::getPropertyNames() {
952      return properties_.getPropertyNames();  
953    }
954        
955 <  std::vector<GenericData*> SimInfo::getProperties() {
955 >  vector<GenericData*> SimInfo::getProperties() {
956      return properties_.getProperties();
957    }
958  
959 <  GenericData* SimInfo::getPropertyByName(const std::string& propName) {
959 >  GenericData* SimInfo::getPropertyByName(const string& propName) {
960      return properties_.getPropertyByName(propName);
961    }
962  
# Line 1264 | Line 1039 | namespace oopse {
1039  
1040    }        
1041  
1042 <  std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1042 >  ostream& operator <<(ostream& o, SimInfo& info) {
1043  
1044      return o;
1045    }
# Line 1307 | Line 1082 | namespace oopse {
1082  
1083  
1084         [  Ixx -Ixy  -Ixz ]
1085 <  J =| -Iyx  Iyy  -Iyz |
1085 >    J =| -Iyx  Iyy  -Iyz |
1086         [ -Izx -Iyz   Izz ]
1087      */
1088  
# Line 1410 | Line 1185 | namespace oopse {
1185        return angularMomentum;
1186     }
1187    
1188 <  
1189 < }//end namespace oopse
1188 >  StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1189 >    return IOIndexToIntegrableObject.at(index);
1190 >  }
1191 >  
1192 >  void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1193 >    IOIndexToIntegrableObject= v;
1194 >  }
1195 >
1196 >  /* Returns the Volume of the simulation based on a ellipsoid with semi-axes
1197 >     based on the radius of gyration V=4/3*Pi*R_1*R_2*R_3
1198 >     where R_i are related to the principle inertia moments R_i = sqrt(C*I_i/N), this reduces to
1199 >     V = 4/3*Pi*(C/N)^3/2*sqrt(det(I)). See S.E. Baltazar et. al. Comp. Mat. Sci. 37 (2006) 526-536.
1200 >  */
1201 >  void SimInfo::getGyrationalVolume(RealType &volume){
1202 >    Mat3x3d intTensor;
1203 >    RealType det;
1204 >    Vector3d dummyAngMom;
1205 >    RealType sysconstants;
1206 >    RealType geomCnst;
1207 >
1208 >    geomCnst = 3.0/2.0;
1209 >    /* Get the inertial tensor and angular momentum for free*/
1210 >    getInertiaTensor(intTensor,dummyAngMom);
1211 >    
1212 >    det = intTensor.determinant();
1213 >    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1214 >    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det);
1215 >    return;
1216 >  }
1217 >
1218 >  void SimInfo::getGyrationalVolume(RealType &volume, RealType &detI){
1219 >    Mat3x3d intTensor;
1220 >    Vector3d dummyAngMom;
1221 >    RealType sysconstants;
1222 >    RealType geomCnst;
1223  
1224 +    geomCnst = 3.0/2.0;
1225 +    /* Get the inertial tensor and angular momentum for free*/
1226 +    getInertiaTensor(intTensor,dummyAngMom);
1227 +    
1228 +    detI = intTensor.determinant();
1229 +    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1230 +    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI);
1231 +    return;
1232 +  }
1233 + /*
1234 +   void SimInfo::setStuntDoubleFromGlobalIndex(vector<StuntDouble*> v) {
1235 +      assert( v.size() == nAtoms_ + nRigidBodies_);
1236 +      sdByGlobalIndex_ = v;
1237 +    }
1238 +
1239 +    StuntDouble* SimInfo::getStuntDoubleFromGlobalIndex(int index) {
1240 +      //assert(index < nAtoms_ + nRigidBodies_);
1241 +      return sdByGlobalIndex_.at(index);
1242 +    }  
1243 + */  
1244 +  int SimInfo::getNGlobalConstraints() {
1245 +    int nGlobalConstraints;
1246 + #ifdef IS_MPI
1247 +    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
1248 +                  MPI_COMM_WORLD);    
1249 + #else
1250 +    nGlobalConstraints =  nConstraints_;
1251 + #endif
1252 +    return nGlobalConstraints;
1253 +  }
1254 +
1255 + }//end namespace OpenMD
1256 +

Comparing:
trunk/src/brains/SimInfo.cpp (property svn:keywords), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/brains/SimInfo.cpp (property svn:keywords), Revision 1536 by gezelter, Wed Jan 5 14:49:05 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines