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 555 by chuckv, Mon May 30 14:01:52 2005 UTC vs.
Revision 1940 by gezelter, Fri Nov 1 19:31:41 2013 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>
56  
57   #include "brains/SimInfo.hpp"
58   #include "math/Vector3.hpp"
59   #include "primitives/Molecule.hpp"
60 < #include "UseTheForce/doForces_interface.h"
56 < #include "UseTheForce/notifyCutoffs_interface.h"
60 > #include "primitives/StuntDouble.hpp"
61   #include "utils/MemoryUtils.hpp"
62   #include "utils/simError.h"
63   #include "selection/SelectionManager.hpp"
64 + #include "io/ForceFieldOptions.hpp"
65 + #include "brains/ForceField.hpp"
66 + #include "nonbonded/SwitchingFunction.hpp"
67  
68 < #ifdef IS_MPI
69 < #include "UseTheForce/mpiComponentPlan.h"
70 < #include "UseTheForce/DarkSide/simParallel_interface.h"
71 < #endif
72 <
73 < namespace oopse {
67 <
68 <  SimInfo::SimInfo(MakeStamps* stamps, std::vector<std::pair<MoleculeStamp*, int> >& molStampPairs,
69 <                   ForceField* ff, Globals* simParams) :
70 <    stamps_(stamps), forceField_(ff), simParams_(simParams),
71 <    ndf_(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
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) {
79 <
78 <            
79 <      std::vector<std::pair<MoleculeStamp*, int> >::iterator i;
80 <      MoleculeStamp* molStamp;
81 <      int nMolWithSameStamp;
82 <      int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
83 <      int nGroups = 0;          //total cutoff groups defined in meta-data file
84 <      CutoffGroupStamp* cgStamp;    
85 <      RigidBodyStamp* rbStamp;
86 <      int nRigidAtoms = 0;
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 <      for (i = molStampPairs.begin(); i !=molStampPairs.end(); ++i) {
82 <        molStamp = i->first;
83 <        nMolWithSameStamp = i->second;
84 <        
85 <        addMoleculeStamp(molStamp, nMolWithSameStamp);
86 <
87 <        //calculate atoms in molecules
88 <        nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;  
89 <
90 <
91 <        //calculate atoms in cutoff groups
92 <        int nAtomsInGroups = 0;
93 <        int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
94 <        
95 <        for (int j=0; j < nCutoffGroupsInStamp; j++) {
96 <          cgStamp = molStamp->getCutoffGroup(j);
97 <          nAtomsInGroups += cgStamp->getNMembers();
98 <        }
106 <
107 <        nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
108 <        nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;            
109 <
110 <        //calculate atoms in rigid bodies
111 <        int nAtomsInRigidBodies = 0;
112 <        int nRigidBodiesInStamp = molStamp->getNRigidBodies();
113 <        
114 <        for (int j=0; j < nRigidBodiesInStamp; j++) {
115 <          rbStamp = molStamp->getRigidBody(j);
116 <          nAtomsInRigidBodies += rbStamp->getNMembers();
117 <        }
118 <
119 <        nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
120 <        nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;            
121 <        
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 >      if ( (*i)->haveRegion() ) {        
95 >        molStamp->setRegion( (*i)->getRegion() );
96 >      } else {
97 >        // set the region to a disallowed value:
98 >        molStamp->setRegion( -1 );
99        }
100  
101 <      //every free atom (atom does not belong to cutoff groups) is a cutoff group
102 <      //therefore the total number of cutoff groups in the system is equal to
103 <      //the total number of atoms minus number of atoms belong to cutoff group defined in meta-data
104 <      //file plus the number of cutoff groups defined in meta-data file
105 <      nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
106 <
107 <      //every free atom (atom does not belong to rigid bodies) is an integrable object
108 <      //therefore the total number of  integrable objects in the system is equal to
109 <      //the total number of atoms minus number of atoms belong to  rigid body defined in meta-data
110 <      //file plus the number of  rigid bodies defined in meta-data file
111 <      nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms + nGlobalRigidBodies_;
112 <
113 <      nGlobalMols_ = molStampIds_.size();
114 <
115 < #ifdef IS_MPI    
116 <      molToProcMap_.resize(nGlobalMols_);
117 < #endif
118 <
101 >      nMolWithSameStamp = (*i)->getNMol();
102 >      
103 >      addMoleculeStamp(molStamp, nMolWithSameStamp);
104 >      
105 >      //calculate atoms in molecules
106 >      nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;  
107 >      
108 >      //calculate atoms in cutoff groups
109 >      int nAtomsInGroups = 0;
110 >      int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
111 >      
112 >      for (int j=0; j < nCutoffGroupsInStamp; j++) {
113 >        cgStamp = molStamp->getCutoffGroupStamp(j);
114 >        nAtomsInGroups += cgStamp->getNMembers();
115 >      }
116 >      
117 >      nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
118 >      
119 >      nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;            
120 >      
121 >      //calculate atoms in rigid bodies
122 >      int nAtomsInRigidBodies = 0;
123 >      int nRigidBodiesInStamp = molStamp->getNRigidBodies();
124 >      
125 >      for (int j=0; j < nRigidBodiesInStamp; j++) {
126 >        rbStamp = molStamp->getRigidBodyStamp(j);
127 >        nAtomsInRigidBodies += rbStamp->getNMembers();
128 >      }
129 >      
130 >      nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
131 >      nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;            
132 >      
133      }
134 +    
135 +    //every free atom (atom does not belong to cutoff groups) is a cutoff
136 +    //group therefore the total number of cutoff groups in the system is
137 +    //equal to the total number of atoms minus number of atoms belong to
138 +    //cutoff group defined in meta-data file plus the number of cutoff
139 +    //groups defined in meta-data file
140  
141 +    nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
142 +    
143 +    //every free atom (atom does not belong to rigid bodies) is an
144 +    //integrable object therefore the total number of integrable objects
145 +    //in the system is equal to the total number of atoms minus number of
146 +    //atoms belong to rigid body defined in meta-data file plus the number
147 +    //of rigid bodies defined in meta-data file
148 +    nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
149 +      + nGlobalRigidBodies_;
150 +    
151 +    nGlobalMols_ = molStampIds_.size();
152 +    molToProcMap_.resize(nGlobalMols_);
153 +  }
154 +  
155    SimInfo::~SimInfo() {
156 <    std::map<int, Molecule*>::iterator i;
156 >    map<int, Molecule*>::iterator i;
157      for (i = molecules_.begin(); i != molecules_.end(); ++i) {
158        delete i->second;
159      }
160      molecules_.clear();
161        
151    delete stamps_;
162      delete sman_;
163      delete simParams_;
164      delete forceField_;
165    }
166  
157  int SimInfo::getNGlobalConstraints() {
158    int nGlobalConstraints;
159 #ifdef IS_MPI
160    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
161                  MPI_COMM_WORLD);    
162 #else
163    nGlobalConstraints =  nConstraints_;
164 #endif
165    return nGlobalConstraints;
166  }
167  
168    bool SimInfo::addMolecule(Molecule* mol) {
169      MoleculeIterator i;
170 <
170 >    
171      i = molecules_.find(mol->getGlobalIndex());
172      if (i == molecules_.end() ) {
173 <
174 <      molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
175 <        
173 >      
174 >      molecules_.insert(make_pair(mol->getGlobalIndex(), mol));
175 >      
176        nAtoms_ += mol->getNAtoms();
177        nBonds_ += mol->getNBonds();
178        nBends_ += mol->getNBends();
179        nTorsions_ += mol->getNTorsions();
180 +      nInversions_ += mol->getNInversions();
181        nRigidBodies_ += mol->getNRigidBodies();
182        nIntegrableObjects_ += mol->getNIntegrableObjects();
183        nCutoffGroups_ += mol->getNCutoffGroups();
184        nConstraints_ += mol->getNConstraintPairs();
185 <
186 <      addExcludePairs(mol);
187 <        
185 >      
186 >      addInteractionPairs(mol);
187 >      
188        return true;
189      } else {
190        return false;
191      }
192    }
193 <
193 >  
194    bool SimInfo::removeMolecule(Molecule* mol) {
195      MoleculeIterator i;
196      i = molecules_.find(mol->getGlobalIndex());
# Line 202 | Line 203 | namespace oopse {
203        nBonds_ -= mol->getNBonds();
204        nBends_ -= mol->getNBends();
205        nTorsions_ -= mol->getNTorsions();
206 +      nInversions_ -= mol->getNInversions();
207        nRigidBodies_ -= mol->getNRigidBodies();
208        nIntegrableObjects_ -= mol->getNIntegrableObjects();
209        nCutoffGroups_ -= mol->getNCutoffGroups();
210        nConstraints_ -= mol->getNConstraintPairs();
211  
212 <      removeExcludePairs(mol);
212 >      removeInteractionPairs(mol);
213        molecules_.erase(mol->getGlobalIndex());
214  
215        delete mol;
# Line 216 | Line 218 | namespace oopse {
218      } else {
219        return false;
220      }
219
220
221    }    
222  
223          
# Line 233 | Line 233 | namespace oopse {
233  
234  
235    void SimInfo::calcNdf() {
236 <    int ndf_local;
236 >    int ndf_local, nfq_local;
237      MoleculeIterator i;
238 <    std::vector<StuntDouble*>::iterator j;
238 >    vector<StuntDouble*>::iterator j;
239 >    vector<Atom*>::iterator k;
240 >
241      Molecule* mol;
242 <    StuntDouble* integrableObject;
242 >    StuntDouble* sd;
243 >    Atom* atom;
244  
245      ndf_local = 0;
246 +    nfq_local = 0;
247      
248      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
245      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
246           integrableObject = mol->nextIntegrableObject(j)) {
249  
250 +      for (sd = mol->beginIntegrableObject(j); sd != NULL;
251 +           sd = mol->nextIntegrableObject(j)) {
252 +
253          ndf_local += 3;
254  
255 <        if (integrableObject->isDirectional()) {
256 <          if (integrableObject->isLinear()) {
255 >        if (sd->isDirectional()) {
256 >          if (sd->isLinear()) {
257              ndf_local += 2;
258            } else {
259              ndf_local += 3;
260            }
261          }
262 <            
263 <      }//end for (integrableObject)
264 <    }// end for (mol)
262 >      }
263 >
264 >      for (atom = mol->beginFluctuatingCharge(k); atom != NULL;
265 >           atom = mol->nextFluctuatingCharge(k)) {
266 >        if (atom->isFluctuatingCharge()) {
267 >          nfq_local++;
268 >        }
269 >      }
270 >    }
271      
272 +    ndfLocal_ = ndf_local;
273 +
274      // n_constraints is local, so subtract them on each processor
275      ndf_local -= nConstraints_;
276  
277   #ifdef IS_MPI
278 <    MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
278 >    MPI::COMM_WORLD.Allreduce(&ndf_local, &ndf_, 1, MPI::INT,MPI::SUM);
279 >    MPI::COMM_WORLD.Allreduce(&nfq_local, &nGlobalFluctuatingCharges_, 1,
280 >                              MPI::INT, MPI::SUM);
281   #else
282      ndf_ = ndf_local;
283 +    nGlobalFluctuatingCharges_ = nfq_local;
284   #endif
285  
286      // nZconstraints_ is global, as are the 3 COM translations for the
# Line 273 | Line 289 | namespace oopse {
289  
290    }
291  
292 +  int SimInfo::getFdf() {
293 + #ifdef IS_MPI
294 +    MPI::COMM_WORLD.Allreduce(&fdf_local, &fdf_, 1, MPI::INT, MPI::SUM);
295 + #else
296 +    fdf_ = fdf_local;
297 + #endif
298 +    return fdf_;
299 +  }
300 +  
301 +  unsigned int SimInfo::getNLocalCutoffGroups(){
302 +    int nLocalCutoffAtoms = 0;
303 +    Molecule* mol;
304 +    MoleculeIterator mi;
305 +    CutoffGroup* cg;
306 +    Molecule::CutoffGroupIterator ci;
307 +    
308 +    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
309 +      
310 +      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
311 +           cg = mol->nextCutoffGroup(ci)) {
312 +        nLocalCutoffAtoms += cg->getNumAtom();
313 +        
314 +      }        
315 +    }
316 +    
317 +    return nAtoms_ - nLocalCutoffAtoms + nCutoffGroups_;
318 +  }
319 +    
320    void SimInfo::calcNdfRaw() {
321      int ndfRaw_local;
322  
323      MoleculeIterator i;
324 <    std::vector<StuntDouble*>::iterator j;
324 >    vector<StuntDouble*>::iterator j;
325      Molecule* mol;
326 <    StuntDouble* integrableObject;
326 >    StuntDouble* sd;
327  
328      // Raw degrees of freedom that we have to set
329      ndfRaw_local = 0;
330      
331      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
288      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
289           integrableObject = mol->nextIntegrableObject(j)) {
332  
333 +      for (sd = mol->beginIntegrableObject(j); sd != NULL;
334 +           sd = mol->nextIntegrableObject(j)) {
335 +
336          ndfRaw_local += 3;
337  
338 <        if (integrableObject->isDirectional()) {
339 <          if (integrableObject->isLinear()) {
338 >        if (sd->isDirectional()) {
339 >          if (sd->isLinear()) {
340              ndfRaw_local += 2;
341            } else {
342              ndfRaw_local += 3;
# Line 302 | Line 347 | namespace oopse {
347      }
348      
349   #ifdef IS_MPI
350 <    MPI_Allreduce(&ndfRaw_local,&ndfRaw_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
350 >    MPI::COMM_WORLD.Allreduce(&ndfRaw_local, &ndfRaw_, 1, MPI::INT, MPI::SUM);
351   #else
352      ndfRaw_ = ndfRaw_local;
353   #endif
# Line 315 | Line 360 | namespace oopse {
360  
361  
362   #ifdef IS_MPI
363 <    MPI_Allreduce(&ndfTrans_local,&ndfTrans_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
363 >    MPI::COMM_WORLD.Allreduce(&ndfTrans_local, &ndfTrans_, 1,
364 >                              MPI::INT, MPI::SUM);
365   #else
366      ndfTrans_ = ndfTrans_local;
367   #endif
# Line 324 | Line 370 | namespace oopse {
370  
371    }
372  
373 <  void SimInfo::addExcludePairs(Molecule* mol) {
374 <    std::vector<Bond*>::iterator bondIter;
375 <    std::vector<Bend*>::iterator bendIter;
376 <    std::vector<Torsion*>::iterator torsionIter;
373 >  void SimInfo::addInteractionPairs(Molecule* mol) {
374 >    ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
375 >    vector<Bond*>::iterator bondIter;
376 >    vector<Bend*>::iterator bendIter;
377 >    vector<Torsion*>::iterator torsionIter;
378 >    vector<Inversion*>::iterator inversionIter;
379      Bond* bond;
380      Bend* bend;
381      Torsion* torsion;
382 +    Inversion* inversion;
383      int a;
384      int b;
385      int c;
386      int d;
387 +
388 +    // atomGroups can be used to add special interaction maps between
389 +    // groups of atoms that are in two separate rigid bodies.
390 +    // However, most site-site interactions between two rigid bodies
391 +    // are probably not special, just the ones between the physically
392 +    // bonded atoms.  Interactions *within* a single rigid body should
393 +    // always be excluded.  These are done at the bottom of this
394 +    // function.
395 +
396 +    map<int, set<int> > atomGroups;
397 +    Molecule::RigidBodyIterator rbIter;
398 +    RigidBody* rb;
399 +    Molecule::IntegrableObjectIterator ii;
400 +    StuntDouble* sd;
401      
402 <    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
402 >    for (sd = mol->beginIntegrableObject(ii); sd != NULL;
403 >         sd = mol->nextIntegrableObject(ii)) {
404 >      
405 >      if (sd->isRigidBody()) {
406 >        rb = static_cast<RigidBody*>(sd);
407 >        vector<Atom*> atoms = rb->getAtoms();
408 >        set<int> rigidAtoms;
409 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
410 >          rigidAtoms.insert(atoms[i]->getGlobalIndex());
411 >        }
412 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
413 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
414 >        }      
415 >      } else {
416 >        set<int> oneAtomSet;
417 >        oneAtomSet.insert(sd->getGlobalIndex());
418 >        atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));        
419 >      }
420 >    }  
421 >
422 >          
423 >    for (bond= mol->beginBond(bondIter); bond != NULL;
424 >         bond = mol->nextBond(bondIter)) {
425 >
426        a = bond->getAtomA()->getGlobalIndex();
427 <      b = bond->getAtomB()->getGlobalIndex();        
428 <      exclude_.addPair(a, b);
427 >      b = bond->getAtomB()->getGlobalIndex();  
428 >
429 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
430 >        oneTwoInteractions_.addPair(a, b);
431 >      } else {
432 >        excludedInteractions_.addPair(a, b);
433 >      }
434      }
435  
436 <    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
436 >    for (bend= mol->beginBend(bendIter); bend != NULL;
437 >         bend = mol->nextBend(bendIter)) {
438 >
439        a = bend->getAtomA()->getGlobalIndex();
440        b = bend->getAtomB()->getGlobalIndex();        
441        c = bend->getAtomC()->getGlobalIndex();
442 +      
443 +      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
444 +        oneTwoInteractions_.addPair(a, b);      
445 +        oneTwoInteractions_.addPair(b, c);
446 +      } else {
447 +        excludedInteractions_.addPair(a, b);
448 +        excludedInteractions_.addPair(b, c);
449 +      }
450  
451 <      exclude_.addPair(a, b);
452 <      exclude_.addPair(a, c);
453 <      exclude_.addPair(b, c);        
451 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
452 >        oneThreeInteractions_.addPair(a, c);      
453 >      } else {
454 >        excludedInteractions_.addPair(a, c);
455 >      }
456      }
457  
458 <    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
458 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
459 >         torsion = mol->nextTorsion(torsionIter)) {
460 >
461        a = torsion->getAtomA()->getGlobalIndex();
462        b = torsion->getAtomB()->getGlobalIndex();        
463        c = torsion->getAtomC()->getGlobalIndex();        
464 <      d = torsion->getAtomD()->getGlobalIndex();        
464 >      d = torsion->getAtomD()->getGlobalIndex();      
465  
466 <      exclude_.addPair(a, b);
467 <      exclude_.addPair(a, c);
468 <      exclude_.addPair(a, d);
469 <      exclude_.addPair(b, c);
470 <      exclude_.addPair(b, d);
471 <      exclude_.addPair(c, d);        
466 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
467 >        oneTwoInteractions_.addPair(a, b);      
468 >        oneTwoInteractions_.addPair(b, c);
469 >        oneTwoInteractions_.addPair(c, d);
470 >      } else {
471 >        excludedInteractions_.addPair(a, b);
472 >        excludedInteractions_.addPair(b, c);
473 >        excludedInteractions_.addPair(c, d);
474 >      }
475 >
476 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
477 >        oneThreeInteractions_.addPair(a, c);      
478 >        oneThreeInteractions_.addPair(b, d);      
479 >      } else {
480 >        excludedInteractions_.addPair(a, c);
481 >        excludedInteractions_.addPair(b, d);
482 >      }
483 >
484 >      if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
485 >        oneFourInteractions_.addPair(a, d);      
486 >      } else {
487 >        excludedInteractions_.addPair(a, d);
488 >      }
489      }
490  
491 <    Molecule::RigidBodyIterator rbIter;
492 <    RigidBody* rb;
493 <    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
494 <      std::vector<Atom*> atoms = rb->getAtoms();
495 <      for (int i = 0; i < atoms.size() -1 ; ++i) {
496 <        for (int j = i + 1; j < atoms.size(); ++j) {
491 >    for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
492 >         inversion = mol->nextInversion(inversionIter)) {
493 >
494 >      a = inversion->getAtomA()->getGlobalIndex();
495 >      b = inversion->getAtomB()->getGlobalIndex();        
496 >      c = inversion->getAtomC()->getGlobalIndex();        
497 >      d = inversion->getAtomD()->getGlobalIndex();        
498 >
499 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
500 >        oneTwoInteractions_.addPair(a, b);      
501 >        oneTwoInteractions_.addPair(a, c);
502 >        oneTwoInteractions_.addPair(a, d);
503 >      } else {
504 >        excludedInteractions_.addPair(a, b);
505 >        excludedInteractions_.addPair(a, c);
506 >        excludedInteractions_.addPair(a, d);
507 >      }
508 >
509 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
510 >        oneThreeInteractions_.addPair(b, c);    
511 >        oneThreeInteractions_.addPair(b, d);    
512 >        oneThreeInteractions_.addPair(c, d);      
513 >      } else {
514 >        excludedInteractions_.addPair(b, c);
515 >        excludedInteractions_.addPair(b, d);
516 >        excludedInteractions_.addPair(c, d);
517 >      }
518 >    }
519 >
520 >    for (rb = mol->beginRigidBody(rbIter); rb != NULL;
521 >         rb = mol->nextRigidBody(rbIter)) {
522 >      vector<Atom*> atoms = rb->getAtoms();
523 >      for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
524 >        for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
525            a = atoms[i]->getGlobalIndex();
526            b = atoms[j]->getGlobalIndex();
527 <          exclude_.addPair(a, b);
527 >          excludedInteractions_.addPair(a, b);
528          }
529        }
530      }        
531  
532    }
533  
534 <  void SimInfo::removeExcludePairs(Molecule* mol) {
535 <    std::vector<Bond*>::iterator bondIter;
536 <    std::vector<Bend*>::iterator bendIter;
537 <    std::vector<Torsion*>::iterator torsionIter;
534 >  void SimInfo::removeInteractionPairs(Molecule* mol) {
535 >    ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
536 >    vector<Bond*>::iterator bondIter;
537 >    vector<Bend*>::iterator bendIter;
538 >    vector<Torsion*>::iterator torsionIter;
539 >    vector<Inversion*>::iterator inversionIter;
540      Bond* bond;
541      Bend* bend;
542      Torsion* torsion;
543 +    Inversion* inversion;
544      int a;
545      int b;
546      int c;
547      int d;
548 +
549 +    map<int, set<int> > atomGroups;
550 +    Molecule::RigidBodyIterator rbIter;
551 +    RigidBody* rb;
552 +    Molecule::IntegrableObjectIterator ii;
553 +    StuntDouble* sd;
554      
555 <    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
555 >    for (sd = mol->beginIntegrableObject(ii); sd != NULL;
556 >         sd = mol->nextIntegrableObject(ii)) {
557 >      
558 >      if (sd->isRigidBody()) {
559 >        rb = static_cast<RigidBody*>(sd);
560 >        vector<Atom*> atoms = rb->getAtoms();
561 >        set<int> rigidAtoms;
562 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
563 >          rigidAtoms.insert(atoms[i]->getGlobalIndex());
564 >        }
565 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
566 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
567 >        }      
568 >      } else {
569 >        set<int> oneAtomSet;
570 >        oneAtomSet.insert(sd->getGlobalIndex());
571 >        atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));        
572 >      }
573 >    }  
574 >
575 >    for (bond= mol->beginBond(bondIter); bond != NULL;
576 >         bond = mol->nextBond(bondIter)) {
577 >      
578        a = bond->getAtomA()->getGlobalIndex();
579 <      b = bond->getAtomB()->getGlobalIndex();        
580 <      exclude_.removePair(a, b);
579 >      b = bond->getAtomB()->getGlobalIndex();  
580 >    
581 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
582 >        oneTwoInteractions_.removePair(a, b);
583 >      } else {
584 >        excludedInteractions_.removePair(a, b);
585 >      }
586      }
587  
588 <    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
588 >    for (bend= mol->beginBend(bendIter); bend != NULL;
589 >         bend = mol->nextBend(bendIter)) {
590 >
591        a = bend->getAtomA()->getGlobalIndex();
592        b = bend->getAtomB()->getGlobalIndex();        
593        c = bend->getAtomC()->getGlobalIndex();
594 +      
595 +      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
596 +        oneTwoInteractions_.removePair(a, b);      
597 +        oneTwoInteractions_.removePair(b, c);
598 +      } else {
599 +        excludedInteractions_.removePair(a, b);
600 +        excludedInteractions_.removePair(b, c);
601 +      }
602  
603 <      exclude_.removePair(a, b);
604 <      exclude_.removePair(a, c);
605 <      exclude_.removePair(b, c);        
603 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
604 >        oneThreeInteractions_.removePair(a, c);      
605 >      } else {
606 >        excludedInteractions_.removePair(a, c);
607 >      }
608      }
609  
610 <    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
610 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
611 >         torsion = mol->nextTorsion(torsionIter)) {
612 >
613        a = torsion->getAtomA()->getGlobalIndex();
614        b = torsion->getAtomB()->getGlobalIndex();        
615        c = torsion->getAtomC()->getGlobalIndex();        
616 <      d = torsion->getAtomD()->getGlobalIndex();        
616 >      d = torsion->getAtomD()->getGlobalIndex();      
617 >  
618 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
619 >        oneTwoInteractions_.removePair(a, b);      
620 >        oneTwoInteractions_.removePair(b, c);
621 >        oneTwoInteractions_.removePair(c, d);
622 >      } else {
623 >        excludedInteractions_.removePair(a, b);
624 >        excludedInteractions_.removePair(b, c);
625 >        excludedInteractions_.removePair(c, d);
626 >      }
627  
628 <      exclude_.removePair(a, b);
629 <      exclude_.removePair(a, c);
630 <      exclude_.removePair(a, d);
631 <      exclude_.removePair(b, c);
632 <      exclude_.removePair(b, d);
633 <      exclude_.removePair(c, d);        
628 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
629 >        oneThreeInteractions_.removePair(a, c);      
630 >        oneThreeInteractions_.removePair(b, d);      
631 >      } else {
632 >        excludedInteractions_.removePair(a, c);
633 >        excludedInteractions_.removePair(b, d);
634 >      }
635 >
636 >      if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
637 >        oneFourInteractions_.removePair(a, d);      
638 >      } else {
639 >        excludedInteractions_.removePair(a, d);
640 >      }
641      }
642  
643 <    Molecule::RigidBodyIterator rbIter;
644 <    RigidBody* rb;
645 <    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
646 <      std::vector<Atom*> atoms = rb->getAtoms();
647 <      for (int i = 0; i < atoms.size() -1 ; ++i) {
648 <        for (int j = i + 1; j < atoms.size(); ++j) {
643 >    for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
644 >         inversion = mol->nextInversion(inversionIter)) {
645 >
646 >      a = inversion->getAtomA()->getGlobalIndex();
647 >      b = inversion->getAtomB()->getGlobalIndex();        
648 >      c = inversion->getAtomC()->getGlobalIndex();        
649 >      d = inversion->getAtomD()->getGlobalIndex();        
650 >
651 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
652 >        oneTwoInteractions_.removePair(a, b);      
653 >        oneTwoInteractions_.removePair(a, c);
654 >        oneTwoInteractions_.removePair(a, d);
655 >      } else {
656 >        excludedInteractions_.removePair(a, b);
657 >        excludedInteractions_.removePair(a, c);
658 >        excludedInteractions_.removePair(a, d);
659 >      }
660 >
661 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
662 >        oneThreeInteractions_.removePair(b, c);    
663 >        oneThreeInteractions_.removePair(b, d);    
664 >        oneThreeInteractions_.removePair(c, d);      
665 >      } else {
666 >        excludedInteractions_.removePair(b, c);
667 >        excludedInteractions_.removePair(b, d);
668 >        excludedInteractions_.removePair(c, d);
669 >      }
670 >    }
671 >
672 >    for (rb = mol->beginRigidBody(rbIter); rb != NULL;
673 >         rb = mol->nextRigidBody(rbIter)) {
674 >      vector<Atom*> atoms = rb->getAtoms();
675 >      for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
676 >        for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
677            a = atoms[i]->getGlobalIndex();
678            b = atoms[j]->getGlobalIndex();
679 <          exclude_.removePair(a, b);
679 >          excludedInteractions_.removePair(a, b);
680          }
681        }
682      }        
683 <
683 >    
684    }
685 <
686 <
685 >  
686 >  
687    void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
688      int curStampId;
689 <
689 >    
690      //index from 0
691      curStampId = moleculeStamps_.size();
692  
# Line 449 | Line 694 | namespace oopse {
694      molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
695    }
696  
452  void SimInfo::update() {
697  
698 <    setupSimType();
699 <
700 < #ifdef IS_MPI
701 <    setupFortranParallel();
702 < #endif
703 <
704 <    setupFortranSim();
705 <
706 <    //setup fortran force field
463 <    /** @deprecate */    
464 <    int isError = 0;
465 <    initFortranFF( &fInfo_.SIM_uses_RF , &isError );
466 <    if(isError){
467 <      sprintf( painCave.errMsg,
468 <               "ForceField error: There was an error initializing the forceField in fortran.\n" );
469 <      painCave.isFatal = 1;
470 <      simError();
471 <    }
472 <  
473 <    
474 <    setupCutoff();
475 <
698 >  /**
699 >   * update
700 >   *
701 >   *  Performs the global checks and variable settings after the
702 >   *  objects have been created.
703 >   *
704 >   */
705 >  void SimInfo::update() {  
706 >    setupSimVariables();
707      calcNdf();
708      calcNdfRaw();
709      calcNdfTrans();
479
480    fortranInitialized_ = true;
710    }
711 <
712 <  std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
711 >  
712 >  /**
713 >   * getSimulatedAtomTypes
714 >   *
715 >   * Returns an STL set of AtomType* that are actually present in this
716 >   * simulation.  Must query all processors to assemble this information.
717 >   *
718 >   */
719 >  set<AtomType*> SimInfo::getSimulatedAtomTypes() {
720      SimInfo::MoleculeIterator mi;
721      Molecule* mol;
722      Molecule::AtomIterator ai;
723      Atom* atom;
724 <    std::set<AtomType*> atomTypes;
725 <
724 >    set<AtomType*> atomTypes;
725 >    
726      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
727 <
728 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
727 >      for(atom = mol->beginAtom(ai); atom != NULL;
728 >          atom = mol->nextAtom(ai)) {
729          atomTypes.insert(atom->getAtomType());
730 <      }
731 <        
730 >      }      
731 >    }    
732 >    
733 > #ifdef IS_MPI
734 >
735 >    // loop over the found atom types on this processor, and add their
736 >    // numerical idents to a vector:
737 >    
738 >    vector<int> foundTypes;
739 >    set<AtomType*>::iterator i;
740 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
741 >      foundTypes.push_back( (*i)->getIdent() );
742 >
743 >    // count_local holds the number of found types on this processor
744 >    int count_local = foundTypes.size();
745 >
746 >    int nproc = MPI::COMM_WORLD.Get_size();
747 >
748 >    // we need arrays to hold the counts and displacement vectors for
749 >    // all processors
750 >    vector<int> counts(nproc, 0);
751 >    vector<int> disps(nproc, 0);
752 >
753 >    // fill the counts array
754 >    MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0],
755 >                              1, MPI::INT);
756 >  
757 >    // use the processor counts to compute the displacement array
758 >    disps[0] = 0;    
759 >    int totalCount = counts[0];
760 >    for (int iproc = 1; iproc < nproc; iproc++) {
761 >      disps[iproc] = disps[iproc-1] + counts[iproc-1];
762 >      totalCount += counts[iproc];
763      }
764  
765 <    return atomTypes;        
766 <  }
765 >    // we need a (possibly redundant) set of all found types:
766 >    vector<int> ftGlobal(totalCount);
767 >    
768 >    // now spray out the foundTypes to all the other processors:    
769 >    MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
770 >                               &ftGlobal[0], &counts[0], &disps[0],
771 >                               MPI::INT);
772  
773 <  void SimInfo::setupSimType() {
502 <    std::set<AtomType*>::iterator i;
503 <    std::set<AtomType*> atomTypes;
504 <    atomTypes = getUniqueAtomTypes();
505 <    
506 <    int useLennardJones = 0;
507 <    int useElectrostatic = 0;
508 <    int useEAM = 0;
509 <    int useCharge = 0;
510 <    int useDirectional = 0;
511 <    int useDipole = 0;
512 <    int useGayBerne = 0;
513 <    int useSticky = 0;
514 <    int useStickyPower = 0;
515 <    int useShape = 0;
516 <    int useFLARB = 0; //it is not in AtomType yet
517 <    int useDirectionalAtom = 0;    
518 <    int useElectrostatics = 0;
519 <    //usePBC and useRF are from simParams
520 <    int usePBC = simParams_->getPBC();
521 <    int useRF = simParams_->getUseRF();
773 >    vector<int>::iterator j;
774  
775 <    //loop over all of the atom types
776 <    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
777 <      useLennardJones |= (*i)->isLennardJones();
526 <      useElectrostatic |= (*i)->isElectrostatic();
527 <      useEAM |= (*i)->isEAM();
528 <      useCharge |= (*i)->isCharge();
529 <      useDirectional |= (*i)->isDirectional();
530 <      useDipole |= (*i)->isDipole();
531 <      useGayBerne |= (*i)->isGayBerne();
532 <      useSticky |= (*i)->isSticky();
533 <      useStickyPower |= (*i)->isStickyPower();
534 <      useShape |= (*i)->isShape();
535 <    }
775 >    // foundIdents is a stl set, so inserting an already found ident
776 >    // will have no effect.
777 >    set<int> foundIdents;
778  
779 <    if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
780 <      useDirectionalAtom = 1;
781 <    }
779 >    for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
780 >      foundIdents.insert((*j));
781 >    
782 >    // now iterate over the foundIdents and get the actual atom types
783 >    // that correspond to these:
784 >    set<int>::iterator it;
785 >    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
786 >      atomTypes.insert( forceField_->getAtomType((*it)) );
787 >
788 > #endif
789  
790 <    if (useCharge || useDipole) {
791 <      useElectrostatics = 1;
543 <    }
790 >    return atomTypes;        
791 >  }
792  
545 #ifdef IS_MPI    
546    int temp;
793  
794 <    temp = usePBC;
795 <    MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
794 >  int getGlobalCountOfType(AtomType* atype) {
795 >    /*
796 >    set<AtomType*> atypes = getSimulatedAtomTypes();
797 >    map<AtomType*, int> counts_;
798  
799 <    temp = useDirectionalAtom;
800 <    MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
799 >    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
800 >      for(atom = mol->beginAtom(ai); atom != NULL;
801 >          atom = mol->nextAtom(ai)) {
802 >        atom->getAtomType();
803 >      }      
804 >    }    
805 >    */
806 >    return 0;
807 >  }
808  
809 <    temp = useLennardJones;
810 <    MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
809 >  void SimInfo::setupSimVariables() {
810 >    useAtomicVirial_ = simParams_->getUseAtomicVirial();
811 >    // we only call setAccumulateBoxDipole if the accumulateBoxDipole
812 >    // parameter is true
813 >    calcBoxDipole_ = false;
814 >    if ( simParams_->haveAccumulateBoxDipole() )
815 >      if ( simParams_->getAccumulateBoxDipole() ) {
816 >        calcBoxDipole_ = true;      
817 >      }
818 >    
819 >    set<AtomType*>::iterator i;
820 >    set<AtomType*> atomTypes;
821 >    atomTypes = getSimulatedAtomTypes();    
822 >    bool usesElectrostatic = false;
823 >    bool usesMetallic = false;
824 >    bool usesDirectional = false;
825 >    bool usesFluctuatingCharges =  false;
826 >    //loop over all of the atom types
827 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
828 >      usesElectrostatic |= (*i)->isElectrostatic();
829 >      usesMetallic |= (*i)->isMetal();
830 >      usesDirectional |= (*i)->isDirectional();
831 >      usesFluctuatingCharges |= (*i)->isFluctuatingCharge();
832 >    }
833  
834 <    temp = useElectrostatics;
835 <    MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
834 > #ifdef IS_MPI
835 >    bool temp;
836 >    temp = usesDirectional;
837 >    MPI::COMM_WORLD.Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI::BOOL,
838 >                              MPI::LOR);
839 >        
840 >    temp = usesMetallic;
841 >    MPI::COMM_WORLD.Allreduce(&temp, &usesMetallicAtoms_, 1, MPI::BOOL,
842 >                              MPI::LOR);
843 >    
844 >    temp = usesElectrostatic;
845 >    MPI::COMM_WORLD.Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI::BOOL,
846 >                              MPI::LOR);
847  
848 <    temp = useCharge;
849 <    MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
848 >    temp = usesFluctuatingCharges;
849 >    MPI::COMM_WORLD.Allreduce(&temp, &usesFluctuatingCharges_, 1, MPI::BOOL,
850 >                              MPI::LOR);
851 > #else
852  
853 <    temp = useDipole;
854 <    MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
853 >    usesDirectionalAtoms_ = usesDirectional;
854 >    usesMetallicAtoms_ = usesMetallic;
855 >    usesElectrostaticAtoms_ = usesElectrostatic;
856 >    usesFluctuatingCharges_ = usesFluctuatingCharges;
857  
858 <    temp = useSticky;
567 <    MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
568 <
569 <    temp = useStickyPower;
570 <    MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
858 > #endif
859      
860 <    temp = useGayBerne;
861 <    MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
860 >    requiresPrepair_ = usesMetallicAtoms_ ? true : false;
861 >    requiresSkipCorrection_ = usesElectrostaticAtoms_ ? true : false;
862 >    requiresSelfCorrection_ = usesElectrostaticAtoms_ ? true : false;    
863 >  }
864  
575    temp = useEAM;
576    MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
865  
866 <    temp = useShape;
867 <    MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);  
866 >  vector<int> SimInfo::getGlobalAtomIndices() {
867 >    SimInfo::MoleculeIterator mi;
868 >    Molecule* mol;
869 >    Molecule::AtomIterator ai;
870 >    Atom* atom;
871  
872 <    temp = useFLARB;
582 <    MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
583 <
584 <    temp = useRF;
585 <    MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
872 >    vector<int> GlobalAtomIndices(getNAtoms(), 0);
873      
874 < #endif
874 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
875 >      
876 >      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
877 >        GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex();
878 >      }
879 >    }
880 >    return GlobalAtomIndices;
881 >  }
882  
589    fInfo_.SIM_uses_PBC = usePBC;    
590    fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
591    fInfo_.SIM_uses_LennardJones = useLennardJones;
592    fInfo_.SIM_uses_Electrostatics = useElectrostatics;    
593    fInfo_.SIM_uses_Charges = useCharge;
594    fInfo_.SIM_uses_Dipoles = useDipole;
595    fInfo_.SIM_uses_Sticky = useSticky;
596    fInfo_.SIM_uses_StickyPower = useStickyPower;
597    fInfo_.SIM_uses_GayBerne = useGayBerne;
598    fInfo_.SIM_uses_EAM = useEAM;
599    fInfo_.SIM_uses_Shapes = useShape;
600    fInfo_.SIM_uses_FLARB = useFLARB;
601    fInfo_.SIM_uses_RF = useRF;
883  
884 <    if( fInfo_.SIM_uses_Dipoles && fInfo_.SIM_uses_RF) {
884 >  vector<int> SimInfo::getGlobalGroupIndices() {
885 >    SimInfo::MoleculeIterator mi;
886 >    Molecule* mol;
887 >    Molecule::CutoffGroupIterator ci;
888 >    CutoffGroup* cg;
889  
890 <      if (simParams_->haveDielectric()) {
891 <        fInfo_.dielect = simParams_->getDielectric();
892 <      } else {
893 <        sprintf(painCave.errMsg,
894 <                "SimSetup Error: No Dielectric constant was set.\n"
895 <                "\tYou are trying to use Reaction Field without"
896 <                "\tsetting a dielectric constant!\n");
897 <        painCave.isFatal = 1;
898 <        simError();
899 <      }
615 <        
616 <    } else {
617 <      fInfo_.dielect = 0.0;
890 >    vector<int> GlobalGroupIndices;
891 >    
892 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
893 >      
894 >      //local index of cutoff group is trivial, it only depends on the
895 >      //order of travesing
896 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
897 >           cg = mol->nextCutoffGroup(ci)) {
898 >        GlobalGroupIndices.push_back(cg->getGlobalIndex());
899 >      }        
900      }
901 <
901 >    return GlobalGroupIndices;
902    }
903  
622  void SimInfo::setupFortranSim() {
623    int isError;
624    int nExclude;
625    std::vector<int> fortranGlobalGroupMembership;
626    
627    nExclude = exclude_.getSize();
628    isError = 0;
904  
905 <    //globalGroupMembership_ is filled by SimCreator    
631 <    for (int i = 0; i < nGlobalAtoms_; i++) {
632 <      fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
633 <    }
905 >  void SimInfo::prepareTopology() {
906  
907      //calculate mass ratio of cutoff group
636    std::vector<double> mfact;
908      SimInfo::MoleculeIterator mi;
909      Molecule* mol;
910      Molecule::CutoffGroupIterator ci;
911      CutoffGroup* cg;
912      Molecule::AtomIterator ai;
913      Atom* atom;
914 <    double totalMass;
914 >    RealType totalMass;
915  
916 <    //to avoid memory reallocation, reserve enough space for mfact
917 <    mfact.reserve(getNCutoffGroups());
916 >    /**
917 >     * The mass factor is the relative mass of an atom to the total
918 >     * mass of the cutoff group it belongs to.  By default, all atoms
919 >     * are their own cutoff groups, and therefore have mass factors of
920 >     * 1.  We need some special handling for massless atoms, which
921 >     * will be treated as carrying the entire mass of the cutoff
922 >     * group.
923 >     */
924 >    massFactors_.clear();
925 >    massFactors_.resize(getNAtoms(), 1.0);
926      
927      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
928 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
928 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
929 >           cg = mol->nextCutoffGroup(ci)) {
930  
931          totalMass = cg->getMass();
932          for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
933 <          mfact.push_back(atom->getMass()/totalMass);
933 >          // Check for massless groups - set mfact to 1 if true
934 >          if (totalMass != 0)
935 >            massFactors_[atom->getLocalIndex()] = atom->getMass()/totalMass;
936 >          else
937 >            massFactors_[atom->getLocalIndex()] = 1.0;
938          }
655
939        }      
940      }
941  
942 <    //fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
660 <    std::vector<int> identArray;
942 >    // Build the identArray_ and regions_
943  
944 <    //to avoid memory reallocation, reserve enough space identArray
945 <    identArray.reserve(getNAtoms());
946 <    
947 <    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
944 >    identArray_.clear();
945 >    identArray_.reserve(getNAtoms());  
946 >    regions_.clear();
947 >    regions_.reserve(getNAtoms());
948 >
949 >    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {      
950 >      int reg = mol->getRegion();      
951        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
952 <        identArray.push_back(atom->getIdent());
952 >        identArray_.push_back(atom->getIdent());
953 >        regions_.push_back(reg);
954        }
955      }    
956 <
957 <    //fill molMembershipArray
672 <    //molMembershipArray is filled by SimCreator    
673 <    std::vector<int> molMembershipArray(nGlobalAtoms_);
674 <    for (int i = 0; i < nGlobalAtoms_; i++) {
675 <      molMembershipArray[i] = globalMolMembership_[i] + 1;
676 <    }
677 <    
678 <    //setup fortran simulation
679 <    int nGlobalExcludes = 0;
680 <    int* globalExcludes = NULL;
681 <    int* excludeList = exclude_.getExcludeList();
682 <    setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0], &nExclude, excludeList ,
683 <                   &nGlobalExcludes, globalExcludes, &molMembershipArray[0],
684 <                   &mfact[0], &nCutoffGroups_, &fortranGlobalGroupMembership[0], &isError);
685 <
686 <    if( isError ){
687 <
688 <      sprintf( painCave.errMsg,
689 <               "There was an error setting the simulation information in fortran.\n" );
690 <      painCave.isFatal = 1;
691 <      painCave.severity = OOPSE_ERROR;
692 <      simError();
693 <    }
694 <
695 < #ifdef IS_MPI
696 <    sprintf( checkPointMsg,
697 <             "succesfully sent the simulation information to fortran.\n");
698 <    MPIcheckPoint();
699 < #endif // is_mpi
700 <  }
701 <
702 <
703 < #ifdef IS_MPI
704 <  void SimInfo::setupFortranParallel() {
705 <    
706 <    //SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
707 <    std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
708 <    std::vector<int> localToGlobalCutoffGroupIndex;
709 <    SimInfo::MoleculeIterator mi;
710 <    Molecule::AtomIterator ai;
711 <    Molecule::CutoffGroupIterator ci;
712 <    Molecule* mol;
713 <    Atom* atom;
714 <    CutoffGroup* cg;
715 <    mpiSimData parallelData;
716 <    int isError;
717 <
718 <    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
719 <
720 <      //local index(index in DataStorge) of atom is important
721 <      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
722 <        localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
723 <      }
724 <
725 <      //local index of cutoff group is trivial, it only depends on the order of travesing
726 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
727 <        localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
728 <      }        
729 <        
730 <    }
731 <
732 <    //fill up mpiSimData struct
733 <    parallelData.nMolGlobal = getNGlobalMolecules();
734 <    parallelData.nMolLocal = getNMolecules();
735 <    parallelData.nAtomsGlobal = getNGlobalAtoms();
736 <    parallelData.nAtomsLocal = getNAtoms();
737 <    parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
738 <    parallelData.nGroupsLocal = getNCutoffGroups();
739 <    parallelData.myNode = worldRank;
740 <    MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
741 <
742 <    //pass mpiSimData struct and index arrays to fortran
743 <    setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
744 <                    &localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
745 <                    &localToGlobalCutoffGroupIndex[0], &isError);
746 <
747 <    if (isError) {
748 <      sprintf(painCave.errMsg,
749 <              "mpiRefresh errror: fortran didn't like something we gave it.\n");
750 <      painCave.isFatal = 1;
751 <      simError();
752 <    }
753 <
754 <    sprintf(checkPointMsg, " mpiRefresh successful.\n");
755 <    MPIcheckPoint();
756 <
757 <
956 >      
957 >    topologyDone_ = true;
958    }
959  
760 #endif
761
762  double SimInfo::calcMaxCutoffRadius() {
763
764
765    std::set<AtomType*> atomTypes;
766    std::set<AtomType*>::iterator i;
767    std::vector<double> cutoffRadius;
768
769    //get the unique atom types
770    atomTypes = getUniqueAtomTypes();
771
772    //query the max cutoff radius among these atom types
773    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
774      cutoffRadius.push_back(forceField_->getRcutFromAtomType(*i));
775    }
776
777    double maxCutoffRadius = *(std::max_element(cutoffRadius.begin(), cutoffRadius.end()));
778 #ifdef IS_MPI
779    //pick the max cutoff radius among the processors
780 #endif
781
782    return maxCutoffRadius;
783  }
784
785  void SimInfo::getCutoff(double& rcut, double& rsw) {
786    
787    if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
788        
789      if (!simParams_->haveRcut()){
790        sprintf(painCave.errMsg,
791                "SimCreator Warning: No value was set for the cutoffRadius.\n"
792                "\tOOPSE will use a default value of 15.0 angstroms"
793                "\tfor the cutoffRadius.\n");
794        painCave.isFatal = 0;
795        simError();
796        rcut = 15.0;
797      } else{
798        rcut = simParams_->getRcut();
799      }
800
801      if (!simParams_->haveRsw()){
802        sprintf(painCave.errMsg,
803                "SimCreator Warning: No value was set for switchingRadius.\n"
804                "\tOOPSE will use a default value of\n"
805                "\t0.95 * cutoffRadius for the switchingRadius\n");
806        painCave.isFatal = 0;
807        simError();
808        rsw = 0.95 * rcut;
809      } else{
810        rsw = simParams_->getRsw();
811      }
812
813    } else {
814      // if charge, dipole or reaction field is not used and the cutofff radius is not specified in
815      //meta-data file, the maximum cutoff radius calculated from forcefiled will be used
816        
817      if (simParams_->haveRcut()) {
818        rcut = simParams_->getRcut();
819      } else {
820        //set cutoff radius to the maximum cutoff radius based on atom types in the whole system
821        rcut = calcMaxCutoffRadius();
822      }
823
824      if (simParams_->haveRsw()) {
825        rsw  = simParams_->getRsw();
826      } else {
827        rsw = rcut;
828      }
829    
830    }
831  }
832
833  void SimInfo::setupCutoff() {
834    getCutoff(rcut_, rsw_);    
835    double rnblist = rcut_ + 1; // skin of neighbor list
836
837    //Pass these cutoff radius etc. to fortran. This function should be called once and only once
838    notifyFortranCutoffs(&rcut_, &rsw_, &rnblist);
839  }
840
960    void SimInfo::addProperty(GenericData* genData) {
961      properties_.addProperty(genData);  
962    }
963  
964 <  void SimInfo::removeProperty(const std::string& propName) {
964 >  void SimInfo::removeProperty(const string& propName) {
965      properties_.removeProperty(propName);  
966    }
967  
# Line 850 | Line 969 | namespace oopse {
969      properties_.clearProperties();
970    }
971  
972 <  std::vector<std::string> SimInfo::getPropertyNames() {
972 >  vector<string> SimInfo::getPropertyNames() {
973      return properties_.getPropertyNames();  
974    }
975        
976 <  std::vector<GenericData*> SimInfo::getProperties() {
976 >  vector<GenericData*> SimInfo::getProperties() {
977      return properties_.getProperties();
978    }
979  
980 <  GenericData* SimInfo::getPropertyByName(const std::string& propName) {
980 >  GenericData* SimInfo::getPropertyByName(const string& propName) {
981      return properties_.getPropertyByName(propName);
982    }
983  
# Line 872 | Line 991 | namespace oopse {
991      Molecule* mol;
992      RigidBody* rb;
993      Atom* atom;
994 +    CutoffGroup* cg;
995      SimInfo::MoleculeIterator mi;
996      Molecule::RigidBodyIterator rbIter;
997 <    Molecule::AtomIterator atomIter;;
997 >    Molecule::AtomIterator atomIter;
998 >    Molecule::CutoffGroupIterator cgIter;
999  
1000      for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
1001          
1002 <      for (atom = mol->beginAtom(atomIter); atom != NULL; atom = mol->nextAtom(atomIter)) {
1002 >      for (atom = mol->beginAtom(atomIter); atom != NULL;
1003 >           atom = mol->nextAtom(atomIter)) {
1004          atom->setSnapshotManager(sman_);
1005        }
1006          
1007 <      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
1007 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
1008 >           rb = mol->nextRigidBody(rbIter)) {
1009          rb->setSnapshotManager(sman_);
1010        }
1011 +
1012 +      for (cg = mol->beginCutoffGroup(cgIter); cg != NULL;
1013 +           cg = mol->nextCutoffGroup(cgIter)) {
1014 +        cg->setSnapshotManager(sman_);
1015 +      }
1016      }    
1017      
1018    }
1019  
892  Vector3d SimInfo::getComVel(){
893    SimInfo::MoleculeIterator i;
894    Molecule* mol;
1020  
1021 <    Vector3d comVel(0.0);
897 <    double totalMass = 0.0;
898 <    
899 <
900 <    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
901 <      double mass = mol->getMass();
902 <      totalMass += mass;
903 <      comVel += mass * mol->getComVel();
904 <    }  
1021 >  ostream& operator <<(ostream& o, SimInfo& info) {
1022  
906 #ifdef IS_MPI
907    double tmpMass = totalMass;
908    Vector3d tmpComVel(comVel);    
909    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
910    MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
911 #endif
912
913    comVel /= totalMass;
914
915    return comVel;
916  }
917
918  Vector3d SimInfo::getCom(){
919    SimInfo::MoleculeIterator i;
920    Molecule* mol;
921
922    Vector3d com(0.0);
923    double totalMass = 0.0;
924    
925    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
926      double mass = mol->getMass();
927      totalMass += mass;
928      com += mass * mol->getCom();
929    }  
930
931 #ifdef IS_MPI
932    double tmpMass = totalMass;
933    Vector3d tmpCom(com);    
934    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
935    MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
936 #endif
937
938    com /= totalMass;
939
940    return com;
941
942  }        
943
944  std::ostream& operator <<(std::ostream& o, SimInfo& info) {
945
1023      return o;
1024    }
1025    
1026 <  
1027 <   /*
1028 <   Returns center of mass and center of mass velocity in one function call.
1029 <   */
1030 <  
1031 <   void SimInfo::getComAll(Vector3d &com, Vector3d &comVel){
1032 <      SimInfo::MoleculeIterator i;
1033 <      Molecule* mol;
1034 <      
1035 <    
1036 <      double totalMass = 0.0;
1037 <    
1026 >  
1027 >  StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1028 >    if (index >= int(IOIndexToIntegrableObject.size())) {
1029 >      sprintf(painCave.errMsg,
1030 >              "SimInfo::getIOIndexToIntegrableObject Error: Integrable Object\n"
1031 >              "\tindex exceeds number of known objects!\n");
1032 >      painCave.isFatal = 1;
1033 >      simError();
1034 >      return NULL;
1035 >    } else
1036 >      return IOIndexToIntegrableObject.at(index);
1037 >  }
1038 >  
1039 >  void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1040 >    IOIndexToIntegrableObject= v;
1041 >  }
1042  
1043 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1044 <         double mass = mol->getMass();
964 <         totalMass += mass;
965 <         com += mass * mol->getCom();
966 <         comVel += mass * mol->getComVel();          
967 <      }  
968 <      
1043 >  int SimInfo::getNGlobalConstraints() {
1044 >    int nGlobalConstraints;
1045   #ifdef IS_MPI
1046 <      double tmpMass = totalMass;
1047 <      Vector3d tmpCom(com);  
1048 <      Vector3d tmpComVel(comVel);
1049 <      MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
974 <      MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
975 <      MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1046 >    MPI::COMM_WORLD.Allreduce(&nConstraints_, &nGlobalConstraints, 1,
1047 >                              MPI::INT, MPI::SUM);
1048 > #else
1049 >    nGlobalConstraints =  nConstraints_;
1050   #endif
1051 <      
1052 <      com /= totalMass;
979 <      comVel /= totalMass;
980 <   }        
981 <  
982 <   /*
983 <   Return intertia tensor for entire system and angular momentum Vector.
984 <    */
1051 >    return nGlobalConstraints;
1052 >  }
1053  
1054 <   void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
987 <      
988 <
989 <      double xx = 0.0;
990 <      double yy = 0.0;
991 <      double zz = 0.0;
992 <      double xy = 0.0;
993 <      double xz = 0.0;
994 <      double yz = 0.0;
995 <      Vector3d com(0.0);
996 <      Vector3d comVel(0.0);
997 <      
998 <      getComAll(com, comVel);
999 <      
1000 <      SimInfo::MoleculeIterator i;
1001 <      Molecule* mol;
1002 <      
1003 <      Vector3d thisq(0.0);
1004 <      Vector3d thisv(0.0);
1054 > }//end namespace OpenMD
1055  
1006      double thisMass = 0.0;
1007    
1008      
1009      
1010  
1011      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1012        
1013         thisq = mol->getCom()-com;
1014         thisv = mol->getComVel()-comVel;
1015         thisMass = mol->getMass();
1016         // Compute moment of intertia coefficients.
1017         xx += thisq[0]*thisq[0]*thisMass;
1018         yy += thisq[1]*thisq[1]*thisMass;
1019         zz += thisq[2]*thisq[2]*thisMass;
1020        
1021         // compute products of intertia
1022         xy += thisq[0]*thisq[1]*thisMass;
1023         xz += thisq[0]*thisq[2]*thisMass;
1024         yz += thisq[1]*thisq[2]*thisMass;
1025            
1026         angularMomentum += cross( thisq, thisv ) * thisMass;
1027            
1028      }  
1029      
1030      
1031      inertiaTensor(0,0) = yy + zz;
1032      inertiaTensor(0,1) = -xy;
1033      inertiaTensor(0,2) = -xz;
1034      inertiaTensor(1,0) = -xy;
1035      inertiaTensor(2,0) = xx + zz;
1036      inertiaTensor(1,2) = -yz;
1037      inertiaTensor(2,0) = -xz;
1038      inertiaTensor(2,1) = -yz;
1039      inertiaTensor(2,2) = xx + yy;
1040      
1041 #ifdef IS_MPI
1042      Mat3x3d tmpI(inertiaTensor);
1043      Vector3d tmpAngMom;
1044      MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1045      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1046 #endif
1047              
1048      return;
1049   }
1050
1051   //Returns the angular momentum of the system
1052   Vector3d SimInfo::getAngularMomentum(){
1053      
1054      Vector3d com(0.0);
1055      Vector3d comVel(0.0);
1056      Vector3d angularMomentum(0.0);
1057      
1058      getComAll(com,comVel);
1059      
1060      SimInfo::MoleculeIterator i;
1061      Molecule* mol;
1062      
1063      Vector3d thisq(0.0);
1064      Vector3d thisv(0.0);
1065      
1066      double thisMass = 0.0;
1067      
1068      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {        
1069         thisq = mol->getCom()-com;
1070         thisv = mol->getComVel()-comVel;
1071         thisMass = mol->getMass();
1072         angularMomentum += cross( thisq, thisv ) * thisMass;
1073        
1074      }  
1075      
1076 #ifdef IS_MPI
1077      Vector3d tmpAngMom;
1078      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1079 #endif
1080      
1081      return angularMomentum;
1082   }
1083  
1084  
1085 }//end namespace oopse
1086

Comparing trunk/src/brains/SimInfo.cpp (property svn:keywords):
Revision 555 by chuckv, Mon May 30 14:01:52 2005 UTC vs.
Revision 1940 by gezelter, Fri Nov 1 19:31:41 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines