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 1241 by gezelter, Fri Apr 25 15:14:47 2008 UTC vs.
branches/development/src/brains/SimInfo.cpp (file contents), Revision 1779 by gezelter, Mon Aug 20 17:51:39 2012 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 54 | Line 55
55   #include "math/Vector3.hpp"
56   #include "primitives/Molecule.hpp"
57   #include "primitives/StuntDouble.hpp"
57 #include "UseTheForce/fCutoffPolicy.h"
58 #include "UseTheForce/DarkSide/fElectrostaticSummationMethod.h"
59 #include "UseTheForce/DarkSide/fElectrostaticScreeningMethod.h"
60 #include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
61 #include "UseTheForce/doForces_interface.h"
62 #include "UseTheForce/DarkSide/neighborLists_interface.h"
63 #include "UseTheForce/DarkSide/electrostatic_interface.h"
64 #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 <
71 <
62 > #include "brains/ForceField.hpp"
63 > #include "nonbonded/SwitchingFunction.hpp"
64   #ifdef IS_MPI
65 < #include "UseTheForce/mpiComponentPlan.h"
66 < #include "UseTheForce/DarkSide/simParallel_interface.h"
75 < #endif
65 > #include <mpi.h>
66 > #endif
67  
68 < namespace oopse {
69 <  std::set<int> getRigidSet(int index, std::map<int, std::set<int> >& container) {
79 <    std::map<int, std::set<int> >::iterator i = container.find(index);
80 <    std::set<int> result;
81 <    if (i != container.end()) {
82 <        result = i->second;
83 <    }
84 <
85 <    return result;
86 <  }
68 > using namespace std;
69 > namespace OpenMD {
70    
71    SimInfo::SimInfo(ForceField* ff, Globals* simParams) :
72      forceField_(ff), simParams_(simParams),
73      ndf_(0), fdf_local(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
74      nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
75 <    nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
76 <    nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
77 <    nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
78 <    sman_(NULL), fortranInitialized_(false), calcBoxDipole_(false),
79 <    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 <      std::vector<Component*> components = simParams->getComponents();
89 <      
90 <      for (std::vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
91 <        molStamp = (*i)->getMoleculeStamp();
92 <        nMolWithSameStamp = (*i)->getNMol();
93 <        
94 <        addMoleculeStamp(molStamp, nMolWithSameStamp);
95 <
96 <        //calculate atoms in molecules
97 <        nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;  
98 <
99 <        //calculate atoms in cutoff groups
100 <        int nAtomsInGroups = 0;
101 <        int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
102 <        
103 <        for (int j=0; j < nCutoffGroupsInStamp; j++) {
104 <          cgStamp = molStamp->getCutoffGroupStamp(j);
105 <          nAtomsInGroups += cgStamp->getNMembers();
106 <        }
107 <
108 <        nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
109 <
110 <        nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;            
111 <
112 <        //calculate atoms in rigid bodies
113 <        int nAtomsInRigidBodies = 0;
114 <        int nRigidBodiesInStamp = molStamp->getNRigidBodies();
115 <        
116 <        for (int j=0; j < nRigidBodiesInStamp; j++) {
117 <          rbStamp = molStamp->getRigidBodyStamp(j);
118 <          nAtomsInRigidBodies += rbStamp->getNMembers();
119 <        }
120 <
121 <        nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
122 <        nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;            
123 <        
124 <      }
125 <
143 <      //every free atom (atom does not belong to cutoff groups) is a cutoff
144 <      //group therefore the total number of cutoff groups in the system is
145 <      //equal to the total number of atoms minus number of atoms belong to
146 <      //cutoff group defined in meta-data file plus the number of cutoff
147 <      //groups defined in meta-data file
148 <      nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
149 <
150 <      //every free atom (atom does not belong to rigid bodies) is an
151 <      //integrable object therefore the total number of integrable objects
152 <      //in the system is equal to the total number of atoms minus number of
153 <      //atoms belong to rigid body defined in meta-data file plus the number
154 <      //of rigid bodies defined in meta-data file
155 <      nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
156 <                                                + nGlobalRigidBodies_;
157 <  
158 <      nGlobalMols_ = molStampIds_.size();
159 <      molToProcMap_.resize(nGlobalMols_);
75 >    nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0), nGlobalFluctuatingCharges_(0),
76 >    nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nInversions_(0),
77 >    nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
78 >    nConstraints_(0), nFluctuatingCharges_(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();
92 >         i !=components.end(); ++i) {
93 >      molStamp = (*i)->getMoleculeStamp();
94 >      nMolWithSameStamp = (*i)->getNMol();
95 >      
96 >      addMoleculeStamp(molStamp, nMolWithSameStamp);
97 >      
98 >      //calculate atoms in molecules
99 >      nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;  
100 >      
101 >      //calculate atoms in cutoff groups
102 >      int nAtomsInGroups = 0;
103 >      int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
104 >      
105 >      for (int j=0; j < nCutoffGroupsInStamp; j++) {
106 >        cgStamp = molStamp->getCutoffGroupStamp(j);
107 >        nAtomsInGroups += cgStamp->getNMembers();
108 >      }
109 >      
110 >      nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
111 >      
112 >      nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;            
113 >      
114 >      //calculate atoms in rigid bodies
115 >      int nAtomsInRigidBodies = 0;
116 >      int nRigidBodiesInStamp = molStamp->getNRigidBodies();
117 >      
118 >      for (int j=0; j < nRigidBodiesInStamp; j++) {
119 >        rbStamp = molStamp->getRigidBodyStamp(j);
120 >        nAtomsInRigidBodies += rbStamp->getNMembers();
121 >      }
122 >      
123 >      nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
124 >      nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;            
125 >      
126      }
127 +    
128 +    //every free atom (atom does not belong to cutoff groups) is a cutoff
129 +    //group therefore the total number of cutoff groups in the system is
130 +    //equal to the total number of atoms minus number of atoms belong to
131 +    //cutoff group defined in meta-data file plus the number of cutoff
132 +    //groups defined in meta-data file
133  
134 +    nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
135 +    
136 +    //every free atom (atom does not belong to rigid bodies) is an
137 +    //integrable object therefore the total number of integrable objects
138 +    //in the system is equal to the total number of atoms minus number of
139 +    //atoms belong to rigid body defined in meta-data file plus the number
140 +    //of rigid bodies defined in meta-data file
141 +    nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
142 +      + nGlobalRigidBodies_;
143 +    
144 +    nGlobalMols_ = molStampIds_.size();
145 +    molToProcMap_.resize(nGlobalMols_);
146 +  }
147 +  
148    SimInfo::~SimInfo() {
149 <    std::map<int, Molecule*>::iterator i;
149 >    map<int, Molecule*>::iterator i;
150      for (i = molecules_.begin(); i != molecules_.end(); ++i) {
151        delete i->second;
152      }
# Line 171 | Line 157 | namespace oopse {
157      delete forceField_;
158    }
159  
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  }
160  
161    bool SimInfo::addMolecule(Molecule* mol) {
162      MoleculeIterator i;
163 <
163 >    
164      i = molecules_.find(mol->getGlobalIndex());
165      if (i == molecules_.end() ) {
166 <
167 <      molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
168 <        
166 >      
167 >      molecules_.insert(make_pair(mol->getGlobalIndex(), mol));
168 >      
169        nAtoms_ += mol->getNAtoms();
170        nBonds_ += mol->getNBonds();
171        nBends_ += mol->getNBends();
172        nTorsions_ += mol->getNTorsions();
173 +      nInversions_ += mol->getNInversions();
174        nRigidBodies_ += mol->getNRigidBodies();
175        nIntegrableObjects_ += mol->getNIntegrableObjects();
176        nCutoffGroups_ += mol->getNCutoffGroups();
177        nConstraints_ += mol->getNConstraintPairs();
178 <
179 <      addExcludePairs(mol);
180 <        
178 >      
179 >      addInteractionPairs(mol);
180 >      
181        return true;
182      } else {
183        return false;
184      }
185    }
186 <
186 >  
187    bool SimInfo::removeMolecule(Molecule* mol) {
188      MoleculeIterator i;
189      i = molecules_.find(mol->getGlobalIndex());
# Line 219 | Line 196 | namespace oopse {
196        nBonds_ -= mol->getNBonds();
197        nBends_ -= mol->getNBends();
198        nTorsions_ -= mol->getNTorsions();
199 +      nInversions_ -= mol->getNInversions();
200        nRigidBodies_ -= mol->getNRigidBodies();
201        nIntegrableObjects_ -= mol->getNIntegrableObjects();
202        nCutoffGroups_ -= mol->getNCutoffGroups();
203        nConstraints_ -= mol->getNConstraintPairs();
204  
205 <      removeExcludePairs(mol);
205 >      removeInteractionPairs(mol);
206        molecules_.erase(mol->getGlobalIndex());
207  
208        delete mol;
# Line 233 | Line 211 | namespace oopse {
211      } else {
212        return false;
213      }
236
237
214    }    
215  
216          
# Line 250 | Line 226 | namespace oopse {
226  
227  
228    void SimInfo::calcNdf() {
229 <    int ndf_local;
229 >    int ndf_local, nfq_local;
230      MoleculeIterator i;
231 <    std::vector<StuntDouble*>::iterator j;
231 >    vector<StuntDouble*>::iterator j;
232 >    vector<Atom*>::iterator k;
233 >
234      Molecule* mol;
235 <    StuntDouble* integrableObject;
235 >    StuntDouble* sd;
236 >    Atom* atom;
237  
238      ndf_local = 0;
239 +    nfq_local = 0;
240      
241      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
262      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
263           integrableObject = mol->nextIntegrableObject(j)) {
242  
243 +      for (sd = mol->beginIntegrableObject(j); sd != NULL;
244 +           sd = mol->nextIntegrableObject(j)) {
245 +
246          ndf_local += 3;
247  
248 <        if (integrableObject->isDirectional()) {
249 <          if (integrableObject->isLinear()) {
248 >        if (sd->isDirectional()) {
249 >          if (sd->isLinear()) {
250              ndf_local += 2;
251            } else {
252              ndf_local += 3;
253            }
254          }
274            
255        }
256 +
257 +      for (atom = mol->beginFluctuatingCharge(k); atom != NULL;
258 +           atom = mol->nextFluctuatingCharge(k)) {
259 +        if (atom->isFluctuatingCharge()) {
260 +          nfq_local++;
261 +        }
262 +      }
263      }
264      
265 +    ndfLocal_ = ndf_local;
266 +
267      // n_constraints is local, so subtract them on each processor
268      ndf_local -= nConstraints_;
269  
270   #ifdef IS_MPI
271      MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
272 +    MPI_Allreduce(&nfq_local,&nGlobalFluctuatingCharges_,1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
273   #else
274      ndf_ = ndf_local;
275 +    nGlobalFluctuatingCharges_ = nfq_local;
276   #endif
277  
278      // nZconstraints_ is global, as are the 3 COM translations for the
# Line 298 | Line 289 | namespace oopse {
289   #endif
290      return fdf_;
291    }
292 +  
293 +  unsigned int SimInfo::getNLocalCutoffGroups(){
294 +    int nLocalCutoffAtoms = 0;
295 +    Molecule* mol;
296 +    MoleculeIterator mi;
297 +    CutoffGroup* cg;
298 +    Molecule::CutoffGroupIterator ci;
299      
300 +    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
301 +      
302 +      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
303 +           cg = mol->nextCutoffGroup(ci)) {
304 +        nLocalCutoffAtoms += cg->getNumAtom();
305 +        
306 +      }        
307 +    }
308 +    
309 +    return nAtoms_ - nLocalCutoffAtoms + nCutoffGroups_;
310 +  }
311 +    
312    void SimInfo::calcNdfRaw() {
313      int ndfRaw_local;
314  
315      MoleculeIterator i;
316 <    std::vector<StuntDouble*>::iterator j;
316 >    vector<StuntDouble*>::iterator j;
317      Molecule* mol;
318 <    StuntDouble* integrableObject;
318 >    StuntDouble* sd;
319  
320      // Raw degrees of freedom that we have to set
321      ndfRaw_local = 0;
322      
323      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
314      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
315           integrableObject = mol->nextIntegrableObject(j)) {
324  
325 +      for (sd = mol->beginIntegrableObject(j); sd != NULL;
326 +           sd = mol->nextIntegrableObject(j)) {
327 +
328          ndfRaw_local += 3;
329  
330 <        if (integrableObject->isDirectional()) {
331 <          if (integrableObject->isLinear()) {
330 >        if (sd->isDirectional()) {
331 >          if (sd->isLinear()) {
332              ndfRaw_local += 2;
333            } else {
334              ndfRaw_local += 3;
# Line 350 | Line 361 | namespace oopse {
361  
362    }
363  
364 <  void SimInfo::addExcludePairs(Molecule* mol) {
365 <    std::vector<Bond*>::iterator bondIter;
366 <    std::vector<Bend*>::iterator bendIter;
367 <    std::vector<Torsion*>::iterator torsionIter;
364 >  void SimInfo::addInteractionPairs(Molecule* mol) {
365 >    ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
366 >    vector<Bond*>::iterator bondIter;
367 >    vector<Bend*>::iterator bendIter;
368 >    vector<Torsion*>::iterator torsionIter;
369 >    vector<Inversion*>::iterator inversionIter;
370      Bond* bond;
371      Bend* bend;
372      Torsion* torsion;
373 +    Inversion* inversion;
374      int a;
375      int b;
376      int c;
377      int d;
378  
379 <    std::map<int, std::set<int> > atomGroups;
379 >    // atomGroups can be used to add special interaction maps between
380 >    // groups of atoms that are in two separate rigid bodies.
381 >    // However, most site-site interactions between two rigid bodies
382 >    // are probably not special, just the ones between the physically
383 >    // bonded atoms.  Interactions *within* a single rigid body should
384 >    // always be excluded.  These are done at the bottom of this
385 >    // function.
386  
387 +    map<int, set<int> > atomGroups;
388      Molecule::RigidBodyIterator rbIter;
389      RigidBody* rb;
390      Molecule::IntegrableObjectIterator ii;
391 <    StuntDouble* integrableObject;
391 >    StuntDouble* sd;
392      
393 <    for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
394 <           integrableObject = mol->nextIntegrableObject(ii)) {
395 <
396 <      if (integrableObject->isRigidBody()) {
397 <          rb = static_cast<RigidBody*>(integrableObject);
398 <          std::vector<Atom*> atoms = rb->getAtoms();
399 <          std::set<int> rigidAtoms;
400 <          for (int i = 0; i < atoms.size(); ++i) {
401 <            rigidAtoms.insert(atoms[i]->getGlobalIndex());
402 <          }
403 <          for (int i = 0; i < atoms.size(); ++i) {
404 <            atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
405 <          }      
393 >    for (sd = mol->beginIntegrableObject(ii); sd != NULL;
394 >         sd = mol->nextIntegrableObject(ii)) {
395 >      
396 >      if (sd->isRigidBody()) {
397 >        rb = static_cast<RigidBody*>(sd);
398 >        vector<Atom*> atoms = rb->getAtoms();
399 >        set<int> rigidAtoms;
400 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
401 >          rigidAtoms.insert(atoms[i]->getGlobalIndex());
402 >        }
403 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
404 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
405 >        }      
406        } else {
407 <        std::set<int> oneAtomSet;
408 <        oneAtomSet.insert(integrableObject->getGlobalIndex());
409 <        atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
407 >        set<int> oneAtomSet;
408 >        oneAtomSet.insert(sd->getGlobalIndex());
409 >        atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));        
410        }
411      }  
412 +          
413 +    for (bond= mol->beginBond(bondIter); bond != NULL;
414 +         bond = mol->nextBond(bondIter)) {
415  
392    
393    
394    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
416        a = bond->getAtomA()->getGlobalIndex();
417 <      b = bond->getAtomB()->getGlobalIndex();        
418 <      exclude_.addPair(a, b);
417 >      b = bond->getAtomB()->getGlobalIndex();  
418 >    
419 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
420 >        oneTwoInteractions_.addPair(a, b);
421 >      } else {
422 >        excludedInteractions_.addPair(a, b);
423 >      }
424      }
425  
426 <    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
426 >    for (bend= mol->beginBend(bendIter); bend != NULL;
427 >         bend = mol->nextBend(bendIter)) {
428 >
429        a = bend->getAtomA()->getGlobalIndex();
430        b = bend->getAtomB()->getGlobalIndex();        
431        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);
432        
433 <      //exclude_.addPair(a, b);
434 <      //exclude_.addPair(a, c);
435 <      //exclude_.addPair(b, c);        
433 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
434 >        oneTwoInteractions_.addPair(a, b);      
435 >        oneTwoInteractions_.addPair(b, c);
436 >      } else {
437 >        excludedInteractions_.addPair(a, b);
438 >        excludedInteractions_.addPair(b, c);
439 >      }
440 >
441 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
442 >        oneThreeInteractions_.addPair(a, c);      
443 >      } else {
444 >        excludedInteractions_.addPair(a, c);
445 >      }
446      }
447  
448 <    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
448 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
449 >         torsion = mol->nextTorsion(torsionIter)) {
450 >
451        a = torsion->getAtomA()->getGlobalIndex();
452        b = torsion->getAtomB()->getGlobalIndex();        
453        c = torsion->getAtomC()->getGlobalIndex();        
454 <      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);
454 >      d = torsion->getAtomD()->getGlobalIndex();      
455  
456 <      exclude_.addPairs(rigidSetA, rigidSetB);
457 <      exclude_.addPairs(rigidSetA, rigidSetC);
458 <      exclude_.addPairs(rigidSetA, rigidSetD);
459 <      exclude_.addPairs(rigidSetB, rigidSetC);
460 <      exclude_.addPairs(rigidSetB, rigidSetD);
461 <      exclude_.addPairs(rigidSetC, rigidSetD);
456 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
457 >        oneTwoInteractions_.addPair(a, b);      
458 >        oneTwoInteractions_.addPair(b, c);
459 >        oneTwoInteractions_.addPair(c, d);
460 >      } else {
461 >        excludedInteractions_.addPair(a, b);
462 >        excludedInteractions_.addPair(b, c);
463 >        excludedInteractions_.addPair(c, d);
464 >      }
465  
466 <      /*
467 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
468 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
469 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
470 <      exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
471 <      exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
472 <      exclude_.addPairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
473 <        
474 <      
475 <      exclude_.addPair(a, b);
476 <      exclude_.addPair(a, c);
477 <      exclude_.addPair(a, d);
478 <      exclude_.addPair(b, c);
447 <      exclude_.addPair(b, d);
448 <      exclude_.addPair(c, d);        
449 <      */
466 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
467 >        oneThreeInteractions_.addPair(a, c);      
468 >        oneThreeInteractions_.addPair(b, d);      
469 >      } else {
470 >        excludedInteractions_.addPair(a, c);
471 >        excludedInteractions_.addPair(b, d);
472 >      }
473 >
474 >      if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
475 >        oneFourInteractions_.addPair(a, d);      
476 >      } else {
477 >        excludedInteractions_.addPair(a, d);
478 >      }
479      }
480  
481 <    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
482 <      std::vector<Atom*> atoms = rb->getAtoms();
483 <      for (int i = 0; i < atoms.size() -1 ; ++i) {
484 <        for (int j = i + 1; j < atoms.size(); ++j) {
481 >    for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
482 >         inversion = mol->nextInversion(inversionIter)) {
483 >
484 >      a = inversion->getAtomA()->getGlobalIndex();
485 >      b = inversion->getAtomB()->getGlobalIndex();        
486 >      c = inversion->getAtomC()->getGlobalIndex();        
487 >      d = inversion->getAtomD()->getGlobalIndex();        
488 >
489 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
490 >        oneTwoInteractions_.addPair(a, b);      
491 >        oneTwoInteractions_.addPair(a, c);
492 >        oneTwoInteractions_.addPair(a, d);
493 >      } else {
494 >        excludedInteractions_.addPair(a, b);
495 >        excludedInteractions_.addPair(a, c);
496 >        excludedInteractions_.addPair(a, d);
497 >      }
498 >
499 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
500 >        oneThreeInteractions_.addPair(b, c);    
501 >        oneThreeInteractions_.addPair(b, d);    
502 >        oneThreeInteractions_.addPair(c, d);      
503 >      } else {
504 >        excludedInteractions_.addPair(b, c);
505 >        excludedInteractions_.addPair(b, d);
506 >        excludedInteractions_.addPair(c, d);
507 >      }
508 >    }
509 >
510 >    for (rb = mol->beginRigidBody(rbIter); rb != NULL;
511 >         rb = mol->nextRigidBody(rbIter)) {
512 >      vector<Atom*> atoms = rb->getAtoms();
513 >      for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
514 >        for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
515            a = atoms[i]->getGlobalIndex();
516            b = atoms[j]->getGlobalIndex();
517 <          exclude_.addPair(a, b);
517 >          excludedInteractions_.addPair(a, b);
518          }
519        }
520      }        
521  
522    }
523  
524 <  void SimInfo::removeExcludePairs(Molecule* mol) {
525 <    std::vector<Bond*>::iterator bondIter;
526 <    std::vector<Bend*>::iterator bendIter;
527 <    std::vector<Torsion*>::iterator torsionIter;
524 >  void SimInfo::removeInteractionPairs(Molecule* mol) {
525 >    ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
526 >    vector<Bond*>::iterator bondIter;
527 >    vector<Bend*>::iterator bendIter;
528 >    vector<Torsion*>::iterator torsionIter;
529 >    vector<Inversion*>::iterator inversionIter;
530      Bond* bond;
531      Bend* bend;
532      Torsion* torsion;
533 +    Inversion* inversion;
534      int a;
535      int b;
536      int c;
537      int d;
538  
539 <    std::map<int, std::set<int> > atomGroups;
478 <
539 >    map<int, set<int> > atomGroups;
540      Molecule::RigidBodyIterator rbIter;
541      RigidBody* rb;
542      Molecule::IntegrableObjectIterator ii;
543 <    StuntDouble* integrableObject;
543 >    StuntDouble* sd;
544      
545 <    for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
546 <           integrableObject = mol->nextIntegrableObject(ii)) {
547 <
548 <      if (integrableObject->isRigidBody()) {
549 <          rb = static_cast<RigidBody*>(integrableObject);
550 <          std::vector<Atom*> atoms = rb->getAtoms();
551 <          std::set<int> rigidAtoms;
552 <          for (int i = 0; i < atoms.size(); ++i) {
553 <            rigidAtoms.insert(atoms[i]->getGlobalIndex());
554 <          }
555 <          for (int i = 0; i < atoms.size(); ++i) {
556 <            atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
557 <          }      
545 >    for (sd = mol->beginIntegrableObject(ii); sd != NULL;
546 >         sd = mol->nextIntegrableObject(ii)) {
547 >      
548 >      if (sd->isRigidBody()) {
549 >        rb = static_cast<RigidBody*>(sd);
550 >        vector<Atom*> atoms = rb->getAtoms();
551 >        set<int> rigidAtoms;
552 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
553 >          rigidAtoms.insert(atoms[i]->getGlobalIndex());
554 >        }
555 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
556 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
557 >        }      
558        } else {
559 <        std::set<int> oneAtomSet;
560 <        oneAtomSet.insert(integrableObject->getGlobalIndex());
561 <        atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
559 >        set<int> oneAtomSet;
560 >        oneAtomSet.insert(sd->getGlobalIndex());
561 >        atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));        
562        }
563      }  
564  
565 <    
566 <    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
565 >    for (bond= mol->beginBond(bondIter); bond != NULL;
566 >         bond = mol->nextBond(bondIter)) {
567 >      
568        a = bond->getAtomA()->getGlobalIndex();
569 <      b = bond->getAtomB()->getGlobalIndex();        
570 <      exclude_.removePair(a, b);
569 >      b = bond->getAtomB()->getGlobalIndex();  
570 >    
571 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
572 >        oneTwoInteractions_.removePair(a, b);
573 >      } else {
574 >        excludedInteractions_.removePair(a, b);
575 >      }
576      }
577  
578 <    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
578 >    for (bend= mol->beginBend(bendIter); bend != NULL;
579 >         bend = mol->nextBend(bendIter)) {
580 >
581        a = bend->getAtomA()->getGlobalIndex();
582        b = bend->getAtomB()->getGlobalIndex();        
583        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);
584        
585 <      //exclude_.removePair(a, b);
586 <      //exclude_.removePair(a, c);
587 <      //exclude_.removePair(b, c);        
585 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
586 >        oneTwoInteractions_.removePair(a, b);      
587 >        oneTwoInteractions_.removePair(b, c);
588 >      } else {
589 >        excludedInteractions_.removePair(a, b);
590 >        excludedInteractions_.removePair(b, c);
591 >      }
592 >
593 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
594 >        oneThreeInteractions_.removePair(a, c);      
595 >      } else {
596 >        excludedInteractions_.removePair(a, c);
597 >      }
598      }
599  
600 <    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
600 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
601 >         torsion = mol->nextTorsion(torsionIter)) {
602 >
603        a = torsion->getAtomA()->getGlobalIndex();
604        b = torsion->getAtomB()->getGlobalIndex();        
605        c = torsion->getAtomC()->getGlobalIndex();        
606 <      d = torsion->getAtomD()->getGlobalIndex();        
606 >      d = torsion->getAtomD()->getGlobalIndex();      
607 >  
608 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
609 >        oneTwoInteractions_.removePair(a, b);      
610 >        oneTwoInteractions_.removePair(b, c);
611 >        oneTwoInteractions_.removePair(c, d);
612 >      } else {
613 >        excludedInteractions_.removePair(a, b);
614 >        excludedInteractions_.removePair(b, c);
615 >        excludedInteractions_.removePair(c, d);
616 >      }
617  
618 <      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
619 <      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
620 <      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
621 <      std::set<int> rigidSetD = getRigidSet(d, atomGroups);
618 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
619 >        oneThreeInteractions_.removePair(a, c);      
620 >        oneThreeInteractions_.removePair(b, d);      
621 >      } else {
622 >        excludedInteractions_.removePair(a, c);
623 >        excludedInteractions_.removePair(b, d);
624 >      }
625  
626 <      exclude_.removePairs(rigidSetA, rigidSetB);
627 <      exclude_.removePairs(rigidSetA, rigidSetC);
628 <      exclude_.removePairs(rigidSetA, rigidSetD);
629 <      exclude_.removePairs(rigidSetB, rigidSetC);
630 <      exclude_.removePairs(rigidSetB, rigidSetD);
631 <      exclude_.removePairs(rigidSetC, rigidSetD);
626 >      if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
627 >        oneFourInteractions_.removePair(a, d);      
628 >      } else {
629 >        excludedInteractions_.removePair(a, d);
630 >      }
631 >    }
632  
633 <      /*
634 <      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());
633 >    for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
634 >         inversion = mol->nextInversion(inversionIter)) {
635  
636 <      
637 <      exclude_.removePair(a, b);
638 <      exclude_.removePair(a, c);
639 <      exclude_.removePair(a, d);
640 <      exclude_.removePair(b, c);
641 <      exclude_.removePair(b, d);
642 <      exclude_.removePair(c, d);        
643 <      */
636 >      a = inversion->getAtomA()->getGlobalIndex();
637 >      b = inversion->getAtomB()->getGlobalIndex();        
638 >      c = inversion->getAtomC()->getGlobalIndex();        
639 >      d = inversion->getAtomD()->getGlobalIndex();        
640 >
641 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
642 >        oneTwoInteractions_.removePair(a, b);      
643 >        oneTwoInteractions_.removePair(a, c);
644 >        oneTwoInteractions_.removePair(a, d);
645 >      } else {
646 >        excludedInteractions_.removePair(a, b);
647 >        excludedInteractions_.removePair(a, c);
648 >        excludedInteractions_.removePair(a, d);
649 >      }
650 >
651 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
652 >        oneThreeInteractions_.removePair(b, c);    
653 >        oneThreeInteractions_.removePair(b, d);    
654 >        oneThreeInteractions_.removePair(c, d);      
655 >      } else {
656 >        excludedInteractions_.removePair(b, c);
657 >        excludedInteractions_.removePair(b, d);
658 >        excludedInteractions_.removePair(c, d);
659 >      }
660      }
661  
662 <    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
663 <      std::vector<Atom*> atoms = rb->getAtoms();
664 <      for (int i = 0; i < atoms.size() -1 ; ++i) {
665 <        for (int j = i + 1; j < atoms.size(); ++j) {
662 >    for (rb = mol->beginRigidBody(rbIter); rb != NULL;
663 >         rb = mol->nextRigidBody(rbIter)) {
664 >      vector<Atom*> atoms = rb->getAtoms();
665 >      for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
666 >        for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
667            a = atoms[i]->getGlobalIndex();
668            b = atoms[j]->getGlobalIndex();
669 <          exclude_.removePair(a, b);
669 >          excludedInteractions_.removePair(a, b);
670          }
671        }
672      }        
673 <
673 >    
674    }
675 <
676 <
675 >  
676 >  
677    void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
678      int curStampId;
679 <
679 >    
680      //index from 0
681      curStampId = moleculeStamps_.size();
682  
# Line 586 | Line 684 | namespace oopse {
684      molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
685    }
686  
589  void SimInfo::update() {
687  
688 <    setupSimType();
689 <
690 < #ifdef IS_MPI
691 <    setupFortranParallel();
692 < #endif
693 <
694 <    setupFortranSim();
695 <
696 <    //setup fortran force field
600 <    /** @deprecate */    
601 <    int isError = 0;
602 <    
603 <    setupCutoff();
604 <    
605 <    setupElectrostaticSummationMethod( isError );
606 <    setupSwitchingFunction();
607 <    setupAccumulateBoxDipole();
608 <
609 <    if(isError){
610 <      sprintf( painCave.errMsg,
611 <               "ForceField error: There was an error initializing the forceField in fortran.\n" );
612 <      painCave.isFatal = 1;
613 <      simError();
614 <    }
615 <
688 >  /**
689 >   * update
690 >   *
691 >   *  Performs the global checks and variable settings after the
692 >   *  objects have been created.
693 >   *
694 >   */
695 >  void SimInfo::update() {  
696 >    setupSimVariables();
697      calcNdf();
698      calcNdfRaw();
699      calcNdfTrans();
619
620    fortranInitialized_ = true;
700    }
701 <
702 <  std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
701 >  
702 >  /**
703 >   * getSimulatedAtomTypes
704 >   *
705 >   * Returns an STL set of AtomType* that are actually present in this
706 >   * simulation.  Must query all processors to assemble this information.
707 >   *
708 >   */
709 >  set<AtomType*> SimInfo::getSimulatedAtomTypes() {
710      SimInfo::MoleculeIterator mi;
711      Molecule* mol;
712      Molecule::AtomIterator ai;
713      Atom* atom;
714 <    std::set<AtomType*> atomTypes;
715 <
714 >    set<AtomType*> atomTypes;
715 >    
716      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
717 <
718 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
717 >      for(atom = mol->beginAtom(ai); atom != NULL;
718 >          atom = mol->nextAtom(ai)) {
719          atomTypes.insert(atom->getAtomType());
720 <      }
721 <        
636 <    }
637 <
638 <    return atomTypes;        
639 <  }
640 <
641 <  void SimInfo::setupSimType() {
642 <    std::set<AtomType*>::iterator i;
643 <    std::set<AtomType*> atomTypes;
644 <    atomTypes = getUniqueAtomTypes();
720 >      }      
721 >    }    
722      
723 <    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 <    int useSP;
665 <    int useBoxDipole;
723 > #ifdef IS_MPI
724  
725 <    std::string myMethod;
726 <
669 <    // set the useRF logical
670 <    useRF = 0;
671 <    useSF = 0;
672 <    useSP = 0;
673 <
674 <
675 <    if (simParams_->haveElectrostaticSummationMethod()) {
676 <      std::string myMethod = simParams_->getElectrostaticSummationMethod();
677 <      toUpper(myMethod);
678 <      if (myMethod == "REACTION_FIELD"){
679 <        useRF = 1;
680 <      } else if (myMethod == "SHIFTED_FORCE"){
681 <        useSF = 1;
682 <      } else if (myMethod == "SHIFTED_POTENTIAL"){
683 <        useSP = 1;
684 <      }
685 <    }
725 >    // loop over the found atom types on this processor, and add their
726 >    // numerical idents to a vector:
727      
728 <    if (simParams_->haveAccumulateBoxDipole())
729 <      if (simParams_->getAccumulateBoxDipole())
730 <        useBoxDipole = 1;
728 >    vector<int> foundTypes;
729 >    set<AtomType*>::iterator i;
730 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
731 >      foundTypes.push_back( (*i)->getIdent() );
732  
733 <    useAtomicVirial_ = simParams_->getUseAtomicVirial();
733 >    // count_local holds the number of found types on this processor
734 >    int count_local = foundTypes.size();
735  
736 <    //loop over all of the atom types
694 <    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
695 <      useLennardJones |= (*i)->isLennardJones();
696 <      useElectrostatic |= (*i)->isElectrostatic();
697 <      useEAM |= (*i)->isEAM();
698 <      useSC |= (*i)->isSC();
699 <      useCharge |= (*i)->isCharge();
700 <      useDirectional |= (*i)->isDirectional();
701 <      useDipole |= (*i)->isDipole();
702 <      useGayBerne |= (*i)->isGayBerne();
703 <      useSticky |= (*i)->isSticky();
704 <      useStickyPower |= (*i)->isStickyPower();
705 <      useShape |= (*i)->isShape();
706 <    }
736 >    int nproc = MPI::COMM_WORLD.Get_size();
737  
738 <    if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
739 <      useDirectionalAtom = 1;
740 <    }
738 >    // we need arrays to hold the counts and displacement vectors for
739 >    // all processors
740 >    vector<int> counts(nproc, 0);
741 >    vector<int> disps(nproc, 0);
742  
743 <    if (useCharge || useDipole) {
744 <      useElectrostatics = 1;
743 >    // fill the counts array
744 >    MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0],
745 >                              1, MPI::INT);
746 >  
747 >    // use the processor counts to compute the displacement array
748 >    disps[0] = 0;    
749 >    int totalCount = counts[0];
750 >    for (int iproc = 1; iproc < nproc; iproc++) {
751 >      disps[iproc] = disps[iproc-1] + counts[iproc-1];
752 >      totalCount += counts[iproc];
753      }
754  
755 < #ifdef IS_MPI    
756 <    int temp;
755 >    // we need a (possibly redundant) set of all found types:
756 >    vector<int> ftGlobal(totalCount);
757 >    
758 >    // now spray out the foundTypes to all the other processors:    
759 >    MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
760 >                               &ftGlobal[0], &counts[0], &disps[0],
761 >                               MPI::INT);
762  
763 <    temp = usePBC;
720 <    MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
763 >    vector<int>::iterator j;
764  
765 <    temp = useDirectionalAtom;
766 <    MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
765 >    // foundIdents is a stl set, so inserting an already found ident
766 >    // will have no effect.
767 >    set<int> foundIdents;
768  
769 <    temp = useLennardJones;
770 <    MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
727 <
728 <    temp = useElectrostatics;
729 <    MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
730 <
731 <    temp = useCharge;
732 <    MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
733 <
734 <    temp = useDipole;
735 <    MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
736 <
737 <    temp = useSticky;
738 <    MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
739 <
740 <    temp = useStickyPower;
741 <    MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
769 >    for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
770 >      foundIdents.insert((*j));
771      
772 <    temp = useGayBerne;
773 <    MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
772 >    // now iterate over the foundIdents and get the actual atom types
773 >    // that correspond to these:
774 >    set<int>::iterator it;
775 >    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
776 >      atomTypes.insert( forceField_->getAtomType((*it)) );
777 >
778 > #endif
779  
780 <    temp = useEAM;
781 <    MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
780 >    return atomTypes;        
781 >  }
782  
783 <    temp = useSC;
784 <    MPI_Allreduce(&temp, &useSC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
783 >  void SimInfo::setupSimVariables() {
784 >    useAtomicVirial_ = simParams_->getUseAtomicVirial();
785 >    // we only call setAccumulateBoxDipole if the accumulateBoxDipole
786 >    // parameter is true
787 >    calcBoxDipole_ = false;
788 >    if ( simParams_->haveAccumulateBoxDipole() )
789 >      if ( simParams_->getAccumulateBoxDipole() ) {
790 >        calcBoxDipole_ = true;      
791 >      }
792      
793 <    temp = useShape;
794 <    MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);  
793 >    set<AtomType*>::iterator i;
794 >    set<AtomType*> atomTypes;
795 >    atomTypes = getSimulatedAtomTypes();    
796 >    bool usesElectrostatic = false;
797 >    bool usesMetallic = false;
798 >    bool usesDirectional = false;
799 >    bool usesFluctuatingCharges =  false;
800 >    //loop over all of the atom types
801 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
802 >      usesElectrostatic |= (*i)->isElectrostatic();
803 >      usesMetallic |= (*i)->isMetal();
804 >      usesDirectional |= (*i)->isDirectional();
805 >      usesFluctuatingCharges |= (*i)->isFluctuatingCharge();
806 >    }
807  
808 <    temp = useFLARB;
809 <    MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
808 > #ifdef IS_MPI
809 >    bool temp;
810 >    temp = usesDirectional;
811 >    MPI::COMM_WORLD.Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI::BOOL,
812 >                              MPI::LOR);
813 >        
814 >    temp = usesMetallic;
815 >    MPI::COMM_WORLD.Allreduce(&temp, &usesMetallicAtoms_, 1, MPI::BOOL,
816 >                              MPI::LOR);
817 >    
818 >    temp = usesElectrostatic;
819 >    MPI::COMM_WORLD.Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI::BOOL,
820 >                              MPI::LOR);
821  
822 <    temp = useRF;
823 <    MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
822 >    temp = usesFluctuatingCharges;
823 >    MPI::COMM_WORLD.Allreduce(&temp, &usesFluctuatingCharges_, 1, MPI::BOOL,
824 >                              MPI::LOR);
825 > #else
826  
827 <    temp = useSF;
828 <    MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);  
827 >    usesDirectionalAtoms_ = usesDirectional;
828 >    usesMetallicAtoms_ = usesMetallic;
829 >    usesElectrostaticAtoms_ = usesElectrostatic;
830 >    usesFluctuatingCharges_ = usesFluctuatingCharges;
831  
832 <    temp = useSP;
833 <    MPI_Allreduce(&temp, &useSP, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
832 > #endif
833 >    
834 >    requiresPrepair_ = usesMetallicAtoms_ ? true : false;
835 >    requiresSkipCorrection_ = usesElectrostaticAtoms_ ? true : false;
836 >    requiresSelfCorrection_ = usesElectrostaticAtoms_ ? true : false;    
837 >  }
838  
767    temp = useBoxDipole;
768    MPI_Allreduce(&temp, &useBoxDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
839  
840 <    temp = useAtomicVirial_;
841 <    MPI_Allreduce(&temp, &useAtomicVirial_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
840 >  vector<int> SimInfo::getGlobalAtomIndices() {
841 >    SimInfo::MoleculeIterator mi;
842 >    Molecule* mol;
843 >    Molecule::AtomIterator ai;
844 >    Atom* atom;
845  
846 < #endif
847 <
848 <    fInfo_.SIM_uses_PBC = usePBC;    
849 <    fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
850 <    fInfo_.SIM_uses_LennardJones = useLennardJones;
851 <    fInfo_.SIM_uses_Electrostatics = useElectrostatics;    
852 <    fInfo_.SIM_uses_Charges = useCharge;
853 <    fInfo_.SIM_uses_Dipoles = useDipole;
854 <    fInfo_.SIM_uses_Sticky = useSticky;
782 <    fInfo_.SIM_uses_StickyPower = useStickyPower;
783 <    fInfo_.SIM_uses_GayBerne = useGayBerne;
784 <    fInfo_.SIM_uses_EAM = useEAM;
785 <    fInfo_.SIM_uses_SC = useSC;
786 <    fInfo_.SIM_uses_Shapes = useShape;
787 <    fInfo_.SIM_uses_FLARB = useFLARB;
788 <    fInfo_.SIM_uses_RF = useRF;
789 <    fInfo_.SIM_uses_SF = useSF;
790 <    fInfo_.SIM_uses_SP = useSP;
791 <    fInfo_.SIM_uses_BoxDipole = useBoxDipole;
792 <    fInfo_.SIM_uses_AtomicVirial = useAtomicVirial_;
846 >    vector<int> GlobalAtomIndices(getNAtoms(), 0);
847 >    
848 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
849 >      
850 >      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
851 >        GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex();
852 >      }
853 >    }
854 >    return GlobalAtomIndices;
855    }
856  
795  void SimInfo::setupFortranSim() {
796    int isError;
797    int nExclude;
798    std::vector<int> fortranGlobalGroupMembership;
799    
800    nExclude = exclude_.getSize();
801    isError = 0;
857  
858 <    //globalGroupMembership_ is filled by SimCreator    
859 <    for (int i = 0; i < nGlobalAtoms_; i++) {
860 <      fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
858 >  vector<int> SimInfo::getGlobalGroupIndices() {
859 >    SimInfo::MoleculeIterator mi;
860 >    Molecule* mol;
861 >    Molecule::CutoffGroupIterator ci;
862 >    CutoffGroup* cg;
863 >
864 >    vector<int> GlobalGroupIndices;
865 >    
866 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
867 >      
868 >      //local index of cutoff group is trivial, it only depends on the
869 >      //order of travesing
870 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
871 >           cg = mol->nextCutoffGroup(ci)) {
872 >        GlobalGroupIndices.push_back(cg->getGlobalIndex());
873 >      }        
874      }
875 +    return GlobalGroupIndices;
876 +  }
877  
878 +
879 +  void SimInfo::prepareTopology() {
880 +    int nExclude, nOneTwo, nOneThree, nOneFour;
881 +
882      //calculate mass ratio of cutoff group
809    std::vector<RealType> mfact;
883      SimInfo::MoleculeIterator mi;
884      Molecule* mol;
885      Molecule::CutoffGroupIterator ci;
# Line 815 | Line 888 | namespace oopse {
888      Atom* atom;
889      RealType totalMass;
890  
891 <    //to avoid memory reallocation, reserve enough space for mfact
892 <    mfact.reserve(getNCutoffGroups());
891 >    /**
892 >     * The mass factor is the relative mass of an atom to the total
893 >     * mass of the cutoff group it belongs to.  By default, all atoms
894 >     * are their own cutoff groups, and therefore have mass factors of
895 >     * 1.  We need some special handling for massless atoms, which
896 >     * will be treated as carrying the entire mass of the cutoff
897 >     * group.
898 >     */
899 >    massFactors_.clear();
900 >    massFactors_.resize(getNAtoms(), 1.0);
901      
902      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
903 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
903 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
904 >           cg = mol->nextCutoffGroup(ci)) {
905  
906          totalMass = cg->getMass();
907          for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
908            // Check for massless groups - set mfact to 1 if true
909 <          if (totalMass != 0)
910 <            mfact.push_back(atom->getMass()/totalMass);
909 >          if (totalMass != 0)
910 >            massFactors_[atom->getLocalIndex()] = atom->getMass()/totalMass;
911            else
912 <            mfact.push_back( 1.0 );
912 >            massFactors_[atom->getLocalIndex()] = 1.0;
913          }
832
914        }      
915      }
916  
917 <    //fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
837 <    std::vector<int> identArray;
917 >    // Build the identArray_
918  
919 <    //to avoid memory reallocation, reserve enough space identArray
920 <    identArray.reserve(getNAtoms());
841 <    
919 >    identArray_.clear();
920 >    identArray_.reserve(getNAtoms());    
921      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
922        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
923 <        identArray.push_back(atom->getIdent());
923 >        identArray_.push_back(atom->getIdent());
924        }
925      }    
847
848    //fill molMembershipArray
849    //molMembershipArray is filled by SimCreator    
850    std::vector<int> molMembershipArray(nGlobalAtoms_);
851    for (int i = 0; i < nGlobalAtoms_; i++) {
852      molMembershipArray[i] = globalMolMembership_[i] + 1;
853    }
926      
927 <    //setup fortran simulation
856 <    int nGlobalExcludes = 0;
857 <    int* globalExcludes = NULL;
858 <    int* excludeList = exclude_.getExcludeList();
859 <    setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0],
860 <                   &nExclude, excludeList , &nGlobalExcludes, globalExcludes,
861 <                   &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
862 <                   &fortranGlobalGroupMembership[0], &isError);
863 <    
864 <    if( isError ){
865 <      
866 <      sprintf( painCave.errMsg,
867 <               "There was an error setting the simulation information in fortran.\n" );
868 <      painCave.isFatal = 1;
869 <      painCave.severity = OOPSE_ERROR;
870 <      simError();
871 <    }
872 <    
873 <    
874 <    sprintf( checkPointMsg,
875 <             "succesfully sent the simulation information to fortran.\n");
876 <    
877 <    errorCheckPoint();
878 <    
879 <    // Setup number of neighbors in neighbor list if present
880 <    if (simParams_->haveNeighborListNeighbors()) {
881 <      int nlistNeighbors = simParams_->getNeighborListNeighbors();
882 <      setNeighbors(&nlistNeighbors);
883 <    }
884 <  
927 >    //scan topology
928  
929 <  }
929 >    nExclude = excludedInteractions_.getSize();
930 >    nOneTwo = oneTwoInteractions_.getSize();
931 >    nOneThree = oneThreeInteractions_.getSize();
932 >    nOneFour = oneFourInteractions_.getSize();
933  
934 <
935 <  void SimInfo::setupFortranParallel() {
936 < #ifdef IS_MPI    
937 <    //SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
892 <    std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
893 <    std::vector<int> localToGlobalCutoffGroupIndex;
894 <    SimInfo::MoleculeIterator mi;
895 <    Molecule::AtomIterator ai;
896 <    Molecule::CutoffGroupIterator ci;
897 <    Molecule* mol;
898 <    Atom* atom;
899 <    CutoffGroup* cg;
900 <    mpiSimData parallelData;
901 <    int isError;
902 <
903 <    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
904 <
905 <      //local index(index in DataStorge) of atom is important
906 <      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
907 <        localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
908 <      }
909 <
910 <      //local index of cutoff group is trivial, it only depends on the order of travesing
911 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
912 <        localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
913 <      }        
914 <        
915 <    }
916 <
917 <    //fill up mpiSimData struct
918 <    parallelData.nMolGlobal = getNGlobalMolecules();
919 <    parallelData.nMolLocal = getNMolecules();
920 <    parallelData.nAtomsGlobal = getNGlobalAtoms();
921 <    parallelData.nAtomsLocal = getNAtoms();
922 <    parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
923 <    parallelData.nGroupsLocal = getNCutoffGroups();
924 <    parallelData.myNode = worldRank;
925 <    MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
926 <
927 <    //pass mpiSimData struct and index arrays to fortran
928 <    setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
929 <                    &localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
930 <                    &localToGlobalCutoffGroupIndex[0], &isError);
931 <
932 <    if (isError) {
933 <      sprintf(painCave.errMsg,
934 <              "mpiRefresh errror: fortran didn't like something we gave it.\n");
935 <      painCave.isFatal = 1;
936 <      simError();
937 <    }
938 <
939 <    sprintf(checkPointMsg, " mpiRefresh successful.\n");
940 <    errorCheckPoint();
941 <
942 < #endif
943 <  }
944 <
945 <  void SimInfo::setupCutoff() {          
946 <    
947 <    ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
948 <
949 <    // Check the cutoff policy
950 <    int cp =  TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
951 <
952 <    // Set LJ shifting bools to false
953 <    ljsp_ = false;
954 <    ljsf_ = false;
955 <
956 <    std::string myPolicy;
957 <    if (forceFieldOptions_.haveCutoffPolicy()){
958 <      myPolicy = forceFieldOptions_.getCutoffPolicy();
959 <    }else if (simParams_->haveCutoffPolicy()) {
960 <      myPolicy = simParams_->getCutoffPolicy();
961 <    }
962 <
963 <    if (!myPolicy.empty()){
964 <      toUpper(myPolicy);
965 <      if (myPolicy == "MIX") {
966 <        cp = MIX_CUTOFF_POLICY;
967 <      } else {
968 <        if (myPolicy == "MAX") {
969 <          cp = MAX_CUTOFF_POLICY;
970 <        } else {
971 <          if (myPolicy == "TRADITIONAL") {            
972 <            cp = TRADITIONAL_CUTOFF_POLICY;
973 <          } else {
974 <            // throw error        
975 <            sprintf( painCave.errMsg,
976 <                     "SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
977 <            painCave.isFatal = 1;
978 <            simError();
979 <          }    
980 <        }          
981 <      }
982 <    }          
983 <    notifyFortranCutoffPolicy(&cp);
984 <
985 <    // Check the Skin Thickness for neighborlists
986 <    RealType skin;
987 <    if (simParams_->haveSkinThickness()) {
988 <      skin = simParams_->getSkinThickness();
989 <      notifyFortranSkinThickness(&skin);
990 <    }            
991 <        
992 <    // Check if the cutoff was set explicitly:
993 <    if (simParams_->haveCutoffRadius()) {
994 <      rcut_ = simParams_->getCutoffRadius();
995 <      if (simParams_->haveSwitchingRadius()) {
996 <        rsw_  = simParams_->getSwitchingRadius();
997 <      } else {
998 <        if (fInfo_.SIM_uses_Charges |
999 <            fInfo_.SIM_uses_Dipoles |
1000 <            fInfo_.SIM_uses_RF) {
1001 <          
1002 <          rsw_ = 0.85 * rcut_;
1003 <          sprintf(painCave.errMsg,
1004 <                  "SimCreator Warning: No value was set for the switchingRadius.\n"
1005 <                  "\tOOPSE will use a default value of 85 percent of the cutoffRadius.\n"
1006 <                  "\tswitchingRadius = %f. for this simulation\n", rsw_);
1007 <        painCave.isFatal = 0;
1008 <        simError();
1009 <        } else {
1010 <          rsw_ = rcut_;
1011 <          sprintf(painCave.errMsg,
1012 <                  "SimCreator Warning: No value was set for the switchingRadius.\n"
1013 <                  "\tOOPSE will use the same value as the cutoffRadius.\n"
1014 <                  "\tswitchingRadius = %f. for this simulation\n", rsw_);
1015 <          painCave.isFatal = 0;
1016 <          simError();
1017 <        }
1018 <      }
1019 <
1020 <      if (simParams_->haveElectrostaticSummationMethod()) {
1021 <        std::string myMethod = simParams_->getElectrostaticSummationMethod();
1022 <        toUpper(myMethod);
1023 <        
1024 <        if (myMethod == "SHIFTED_POTENTIAL") {
1025 <          ljsp_ = true;
1026 <        } else if (myMethod == "SHIFTED_FORCE") {
1027 <          ljsf_ = true;
1028 <        }
1029 <      }
1030 <      notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1031 <      
1032 <    } else {
1033 <      
1034 <      // For electrostatic atoms, we'll assume a large safe value:
1035 <      if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
1036 <        sprintf(painCave.errMsg,
1037 <                "SimCreator Warning: No value was set for the cutoffRadius.\n"
1038 <                "\tOOPSE will use a default value of 15.0 angstroms"
1039 <                "\tfor the cutoffRadius.\n");
1040 <        painCave.isFatal = 0;
1041 <        simError();
1042 <        rcut_ = 15.0;
1043 <      
1044 <        if (simParams_->haveElectrostaticSummationMethod()) {
1045 <          std::string myMethod = simParams_->getElectrostaticSummationMethod();
1046 <          toUpper(myMethod);
1047 <      
1048 <      // For the time being, we're tethering the LJ shifted behavior to the
1049 <      // electrostaticSummationMethod keyword options
1050 <          if (myMethod == "SHIFTED_POTENTIAL") {
1051 <            ljsp_ = true;
1052 <          } else if (myMethod == "SHIFTED_FORCE") {
1053 <            ljsf_ = true;
1054 <          }
1055 <          if (myMethod == "SHIFTED_POTENTIAL" || myMethod == "SHIFTED_FORCE") {
1056 <            if (simParams_->haveSwitchingRadius()){
1057 <              sprintf(painCave.errMsg,
1058 <                      "SimInfo Warning: A value was set for the switchingRadius\n"
1059 <                      "\teven though the electrostaticSummationMethod was\n"
1060 <                      "\tset to %s\n", myMethod.c_str());
1061 <              painCave.isFatal = 1;
1062 <              simError();            
1063 <            }
1064 <          }
1065 <        }
1066 <      
1067 <        if (simParams_->haveSwitchingRadius()){
1068 <          rsw_ = simParams_->getSwitchingRadius();
1069 <        } else {        
1070 <          sprintf(painCave.errMsg,
1071 <                  "SimCreator Warning: No value was set for switchingRadius.\n"
1072 <                  "\tOOPSE will use a default value of\n"
1073 <                  "\t0.85 * cutoffRadius for the switchingRadius\n");
1074 <          painCave.isFatal = 0;
1075 <          simError();
1076 <          rsw_ = 0.85 * rcut_;
1077 <        }
1078 <
1079 <        notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1080 <
1081 <      } else {
1082 <        // We didn't set rcut explicitly, and we don't have electrostatic atoms, so
1083 <        // We'll punt and let fortran figure out the cutoffs later.
1084 <        
1085 <        notifyFortranYouAreOnYourOwn();
1086 <
1087 <      }
1088 <    }
1089 <  }
1090 <
1091 <  void SimInfo::setupElectrostaticSummationMethod( int isError ) {    
1092 <    
1093 <    int errorOut;
1094 <    int esm =  NONE;
1095 <    int sm = UNDAMPED;
1096 <    RealType alphaVal;
1097 <    RealType dielectric;
1098 <    
1099 <    errorOut = isError;
934 >    int* excludeList = excludedInteractions_.getPairList();
935 >    int* oneTwoList = oneTwoInteractions_.getPairList();
936 >    int* oneThreeList = oneThreeInteractions_.getPairList();
937 >    int* oneFourList = oneFourInteractions_.getPairList();
938  
939 <    if (simParams_->haveElectrostaticSummationMethod()) {
1102 <      std::string myMethod = simParams_->getElectrostaticSummationMethod();
1103 <      toUpper(myMethod);
1104 <      if (myMethod == "NONE") {
1105 <        esm = NONE;
1106 <      } else {
1107 <        if (myMethod == "SWITCHING_FUNCTION") {
1108 <          esm = SWITCHING_FUNCTION;
1109 <        } else {
1110 <          if (myMethod == "SHIFTED_POTENTIAL") {
1111 <            esm = SHIFTED_POTENTIAL;
1112 <          } else {
1113 <            if (myMethod == "SHIFTED_FORCE") {            
1114 <              esm = SHIFTED_FORCE;
1115 <            } else {
1116 <              if (myMethod == "REACTION_FIELD") {
1117 <                esm = REACTION_FIELD;
1118 <                dielectric = simParams_->getDielectric();
1119 <                if (!simParams_->haveDielectric()) {
1120 <                  // throw warning
1121 <                  sprintf( painCave.errMsg,
1122 <                           "SimInfo warning: dielectric was not specified in the input file\n\tfor the reaction field correction method.\n"
1123 <                           "\tA default value of %f will be used for the dielectric.\n", dielectric);
1124 <                  painCave.isFatal = 0;
1125 <                  simError();
1126 <                }
1127 <              } else {
1128 <                // throw error        
1129 <                sprintf( painCave.errMsg,
1130 <                         "SimInfo error: Unknown electrostaticSummationMethod.\n"
1131 <                         "\t(Input file specified %s .)\n"
1132 <                         "\telectrostaticSummationMethod must be one of: \"none\",\n"
1133 <                         "\t\"shifted_potential\", \"shifted_force\", or \n"
1134 <                         "\t\"reaction_field\".\n", myMethod.c_str() );
1135 <                painCave.isFatal = 1;
1136 <                simError();
1137 <              }    
1138 <            }          
1139 <          }
1140 <        }
1141 <      }
1142 <    }
1143 <    
1144 <    if (simParams_->haveElectrostaticScreeningMethod()) {
1145 <      std::string myScreen = simParams_->getElectrostaticScreeningMethod();
1146 <      toUpper(myScreen);
1147 <      if (myScreen == "UNDAMPED") {
1148 <        sm = UNDAMPED;
1149 <      } else {
1150 <        if (myScreen == "DAMPED") {
1151 <          sm = DAMPED;
1152 <          if (!simParams_->haveDampingAlpha()) {
1153 <            // first set a cutoff dependent alpha value
1154 <            // we assume alpha depends linearly with rcut from 0 to 20.5 ang
1155 <            alphaVal = 0.5125 - rcut_* 0.025;
1156 <            // for values rcut > 20.5, alpha is zero
1157 <            if (alphaVal < 0) alphaVal = 0;
1158 <
1159 <            // throw warning
1160 <            sprintf( painCave.errMsg,
1161 <                     "SimInfo warning: dampingAlpha was not specified in the input file.\n"
1162 <                     "\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1163 <            painCave.isFatal = 0;
1164 <            simError();
1165 <          } else {
1166 <            alphaVal = simParams_->getDampingAlpha();
1167 <          }
1168 <          
1169 <        } else {
1170 <          // throw error        
1171 <          sprintf( painCave.errMsg,
1172 <                   "SimInfo error: Unknown electrostaticScreeningMethod.\n"
1173 <                   "\t(Input file specified %s .)\n"
1174 <                   "\telectrostaticScreeningMethod must be one of: \"undamped\"\n"
1175 <                   "or \"damped\".\n", myScreen.c_str() );
1176 <          painCave.isFatal = 1;
1177 <          simError();
1178 <        }
1179 <      }
1180 <    }
1181 <    
1182 <    // let's pass some summation method variables to fortran
1183 <    setElectrostaticSummationMethod( &esm );
1184 <    setFortranElectrostaticMethod( &esm );
1185 <    setScreeningMethod( &sm );
1186 <    setDampingAlpha( &alphaVal );
1187 <    setReactionFieldDielectric( &dielectric );
1188 <    initFortranFF( &errorOut );
939 >    topologyDone_ = true;
940    }
941  
1191  void SimInfo::setupSwitchingFunction() {    
1192    int ft = CUBIC;
1193
1194    if (simParams_->haveSwitchingFunctionType()) {
1195      std::string funcType = simParams_->getSwitchingFunctionType();
1196      toUpper(funcType);
1197      if (funcType == "CUBIC") {
1198        ft = CUBIC;
1199      } else {
1200        if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1201          ft = FIFTH_ORDER_POLY;
1202        } else {
1203          // throw error        
1204          sprintf( painCave.errMsg,
1205                   "SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1206          painCave.isFatal = 1;
1207          simError();
1208        }          
1209      }
1210    }
1211
1212    // send switching function notification to switcheroo
1213    setFunctionType(&ft);
1214
1215  }
1216
1217  void SimInfo::setupAccumulateBoxDipole() {    
1218
1219    // we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1220    if ( simParams_->haveAccumulateBoxDipole() )
1221      if ( simParams_->getAccumulateBoxDipole() ) {
1222        setAccumulateBoxDipole();
1223        calcBoxDipole_ = true;
1224      }
1225
1226  }
1227
942    void SimInfo::addProperty(GenericData* genData) {
943      properties_.addProperty(genData);  
944    }
945  
946 <  void SimInfo::removeProperty(const std::string& propName) {
946 >  void SimInfo::removeProperty(const string& propName) {
947      properties_.removeProperty(propName);  
948    }
949  
# Line 1237 | Line 951 | namespace oopse {
951      properties_.clearProperties();
952    }
953  
954 <  std::vector<std::string> SimInfo::getPropertyNames() {
954 >  vector<string> SimInfo::getPropertyNames() {
955      return properties_.getPropertyNames();  
956    }
957        
958 <  std::vector<GenericData*> SimInfo::getProperties() {
958 >  vector<GenericData*> SimInfo::getProperties() {
959      return properties_.getProperties();
960    }
961  
962 <  GenericData* SimInfo::getPropertyByName(const std::string& propName) {
962 >  GenericData* SimInfo::getPropertyByName(const string& propName) {
963      return properties_.getPropertyByName(propName);
964    }
965  
# Line 1259 | Line 973 | namespace oopse {
973      Molecule* mol;
974      RigidBody* rb;
975      Atom* atom;
976 +    CutoffGroup* cg;
977      SimInfo::MoleculeIterator mi;
978      Molecule::RigidBodyIterator rbIter;
979 <    Molecule::AtomIterator atomIter;;
979 >    Molecule::AtomIterator atomIter;
980 >    Molecule::CutoffGroupIterator cgIter;
981  
982      for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
983          
984 <      for (atom = mol->beginAtom(atomIter); atom != NULL; atom = mol->nextAtom(atomIter)) {
984 >      for (atom = mol->beginAtom(atomIter); atom != NULL;
985 >           atom = mol->nextAtom(atomIter)) {
986          atom->setSnapshotManager(sman_);
987        }
988          
989 <      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
989 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
990 >           rb = mol->nextRigidBody(rbIter)) {
991          rb->setSnapshotManager(sman_);
992        }
993 +
994 +      for (cg = mol->beginCutoffGroup(cgIter); cg != NULL;
995 +           cg = mol->nextCutoffGroup(cgIter)) {
996 +        cg->setSnapshotManager(sman_);
997 +      }
998      }    
999      
1000    }
1001  
1279  Vector3d SimInfo::getComVel(){
1280    SimInfo::MoleculeIterator i;
1281    Molecule* mol;
1002  
1003 <    Vector3d comVel(0.0);
1284 <    RealType totalMass = 0.0;
1285 <    
1286 <
1287 <    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1288 <      RealType mass = mol->getMass();
1289 <      totalMass += mass;
1290 <      comVel += mass * mol->getComVel();
1291 <    }  
1003 >  ostream& operator <<(ostream& o, SimInfo& info) {
1004  
1293 #ifdef IS_MPI
1294    RealType tmpMass = totalMass;
1295    Vector3d tmpComVel(comVel);    
1296    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1297    MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1298 #endif
1299
1300    comVel /= totalMass;
1301
1302    return comVel;
1303  }
1304
1305  Vector3d SimInfo::getCom(){
1306    SimInfo::MoleculeIterator i;
1307    Molecule* mol;
1308
1309    Vector3d com(0.0);
1310    RealType totalMass = 0.0;
1311    
1312    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1313      RealType mass = mol->getMass();
1314      totalMass += mass;
1315      com += mass * mol->getCom();
1316    }  
1317
1318 #ifdef IS_MPI
1319    RealType tmpMass = totalMass;
1320    Vector3d tmpCom(com);    
1321    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1322    MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1323 #endif
1324
1325    com /= totalMass;
1326
1327    return com;
1328
1329  }        
1330
1331  std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1332
1005      return o;
1006    }
1335  
1336  
1337   /*
1338   Returns center of mass and center of mass velocity in one function call.
1339   */
1007    
1008 <   void SimInfo::getComAll(Vector3d &com, Vector3d &comVel){
1342 <      SimInfo::MoleculeIterator i;
1343 <      Molecule* mol;
1344 <      
1345 <    
1346 <      RealType totalMass = 0.0;
1347 <    
1348 <
1349 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1350 <         RealType mass = mol->getMass();
1351 <         totalMass += mass;
1352 <         com += mass * mol->getCom();
1353 <         comVel += mass * mol->getComVel();          
1354 <      }  
1355 <      
1356 < #ifdef IS_MPI
1357 <      RealType tmpMass = totalMass;
1358 <      Vector3d tmpCom(com);  
1359 <      Vector3d tmpComVel(comVel);
1360 <      MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1361 <      MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1362 <      MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1363 < #endif
1364 <      
1365 <      com /= totalMass;
1366 <      comVel /= totalMass;
1367 <   }        
1368 <  
1369 <   /*
1370 <   Return intertia tensor for entire system and angular momentum Vector.
1371 <
1372 <
1373 <       [  Ixx -Ixy  -Ixz ]
1374 <  J =| -Iyx  Iyy  -Iyz |
1375 <       [ -Izx -Iyz   Izz ]
1376 <    */
1377 <
1378 <   void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1379 <      
1380 <
1381 <      RealType xx = 0.0;
1382 <      RealType yy = 0.0;
1383 <      RealType zz = 0.0;
1384 <      RealType xy = 0.0;
1385 <      RealType xz = 0.0;
1386 <      RealType yz = 0.0;
1387 <      Vector3d com(0.0);
1388 <      Vector3d comVel(0.0);
1389 <      
1390 <      getComAll(com, comVel);
1391 <      
1392 <      SimInfo::MoleculeIterator i;
1393 <      Molecule* mol;
1394 <      
1395 <      Vector3d thisq(0.0);
1396 <      Vector3d thisv(0.0);
1397 <
1398 <      RealType thisMass = 0.0;
1399 <    
1400 <      
1401 <      
1402 <  
1403 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1404 <        
1405 <         thisq = mol->getCom()-com;
1406 <         thisv = mol->getComVel()-comVel;
1407 <         thisMass = mol->getMass();
1408 <         // Compute moment of intertia coefficients.
1409 <         xx += thisq[0]*thisq[0]*thisMass;
1410 <         yy += thisq[1]*thisq[1]*thisMass;
1411 <         zz += thisq[2]*thisq[2]*thisMass;
1412 <        
1413 <         // compute products of intertia
1414 <         xy += thisq[0]*thisq[1]*thisMass;
1415 <         xz += thisq[0]*thisq[2]*thisMass;
1416 <         yz += thisq[1]*thisq[2]*thisMass;
1417 <            
1418 <         angularMomentum += cross( thisq, thisv ) * thisMass;
1419 <            
1420 <      }  
1421 <      
1422 <      
1423 <      inertiaTensor(0,0) = yy + zz;
1424 <      inertiaTensor(0,1) = -xy;
1425 <      inertiaTensor(0,2) = -xz;
1426 <      inertiaTensor(1,0) = -xy;
1427 <      inertiaTensor(1,1) = xx + zz;
1428 <      inertiaTensor(1,2) = -yz;
1429 <      inertiaTensor(2,0) = -xz;
1430 <      inertiaTensor(2,1) = -yz;
1431 <      inertiaTensor(2,2) = xx + yy;
1432 <      
1433 < #ifdef IS_MPI
1434 <      Mat3x3d tmpI(inertiaTensor);
1435 <      Vector3d tmpAngMom;
1436 <      MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1437 <      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1438 < #endif
1439 <              
1440 <      return;
1441 <   }
1442 <
1443 <   //Returns the angular momentum of the system
1444 <   Vector3d SimInfo::getAngularMomentum(){
1445 <      
1446 <      Vector3d com(0.0);
1447 <      Vector3d comVel(0.0);
1448 <      Vector3d angularMomentum(0.0);
1449 <      
1450 <      getComAll(com,comVel);
1451 <      
1452 <      SimInfo::MoleculeIterator i;
1453 <      Molecule* mol;
1454 <      
1455 <      Vector3d thisr(0.0);
1456 <      Vector3d thisp(0.0);
1457 <      
1458 <      RealType thisMass;
1459 <      
1460 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {        
1461 <        thisMass = mol->getMass();
1462 <        thisr = mol->getCom()-com;
1463 <        thisp = (mol->getComVel()-comVel)*thisMass;
1464 <        
1465 <        angularMomentum += cross( thisr, thisp );
1466 <        
1467 <      }  
1468 <      
1469 < #ifdef IS_MPI
1470 <      Vector3d tmpAngMom;
1471 <      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1472 < #endif
1473 <      
1474 <      return angularMomentum;
1475 <   }
1476 <  
1008 >  
1009    StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1010 <    return IOIndexToIntegrableObject.at(index);
1010 >    if (index >= IOIndexToIntegrableObject.size()) {
1011 >      sprintf(painCave.errMsg,
1012 >              "SimInfo::getIOIndexToIntegrableObject Error: Integrable Object\n"
1013 >              "\tindex exceeds number of known objects!\n");
1014 >      painCave.isFatal = 1;
1015 >      simError();
1016 >      return NULL;
1017 >    } else
1018 >      return IOIndexToIntegrableObject.at(index);
1019    }
1020    
1021 <  void SimInfo::setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v) {
1021 >  void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1022      IOIndexToIntegrableObject= v;
1023    }
1024  
1025 <  /* Returns the Volume of the simulation based on a ellipsoid with semi-axes
1026 <     based on the radius of gyration V=4/3*Pi*R_1*R_2*R_3
1027 <     where R_i are related to the principle inertia moments R_i = sqrt(C*I_i/N), this reduces to
1028 <     V = 4/3*Pi*(C/N)^3/2*sqrt(det(I)). See S.E. Baltazar et. al. Comp. Mat. Sci. 37 (2006) 526-536.
1029 <  */
1030 <  void SimInfo::getGyrationalVolume(RealType &volume){
1031 <    Mat3x3d intTensor;
1032 <    RealType det;
1033 <    Vector3d dummyAngMom;
1494 <    RealType sysconstants;
1495 <    RealType geomCnst;
1496 <
1497 <    geomCnst = 3.0/2.0;
1498 <    /* Get the inertial tensor and angular momentum for free*/
1499 <    getInertiaTensor(intTensor,dummyAngMom);
1500 <    
1501 <    det = intTensor.determinant();
1502 <    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1503 <    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det);
1504 <    return;
1025 >  int SimInfo::getNGlobalConstraints() {
1026 >    int nGlobalConstraints;
1027 > #ifdef IS_MPI
1028 >    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
1029 >                  MPI_COMM_WORLD);    
1030 > #else
1031 >    nGlobalConstraints =  nConstraints_;
1032 > #endif
1033 >    return nGlobalConstraints;
1034    }
1035  
1036 <  void SimInfo::getGyrationalVolume(RealType &volume, RealType &detI){
1508 <    Mat3x3d intTensor;
1509 <    Vector3d dummyAngMom;
1510 <    RealType sysconstants;
1511 <    RealType geomCnst;
1036 > }//end namespace OpenMD
1037  
1513    geomCnst = 3.0/2.0;
1514    /* Get the inertial tensor and angular momentum for free*/
1515    getInertiaTensor(intTensor,dummyAngMom);
1516    
1517    detI = intTensor.determinant();
1518    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1519    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI);
1520    return;
1521  }
1522 /*
1523   void SimInfo::setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v) {
1524      assert( v.size() == nAtoms_ + nRigidBodies_);
1525      sdByGlobalIndex_ = v;
1526    }
1527
1528    StuntDouble* SimInfo::getStuntDoubleFromGlobalIndex(int index) {
1529      //assert(index < nAtoms_ + nRigidBodies_);
1530      return sdByGlobalIndex_.at(index);
1531    }  
1532 */  
1533 }//end namespace oopse
1534

Comparing:
trunk/src/brains/SimInfo.cpp (property svn:keywords), Revision 1241 by gezelter, Fri Apr 25 15:14:47 2008 UTC vs.
branches/development/src/brains/SimInfo.cpp (property svn:keywords), Revision 1779 by gezelter, Mon Aug 20 17:51:39 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines