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

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 1129 by chrisfen, Fri Apr 20 18:15:48 2007 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC

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

Comparing trunk/src/brains/SimInfo.cpp (property svn:keywords):
Revision 1129 by chrisfen, Fri Apr 20 18:15:48 2007 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines