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 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
Revision 1953 by gezelter, Thu Dec 5 18:19:26 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>
# 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), nInversions_(0),
77 <    nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
78 <    nConstraints_(0), sman_(NULL), fortranInitialized_(false),
79 <    calcBoxDipole_(false), useAtomicVirial_(true) {
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 >      }
102  
103 <
99 <      MoleculeStamp* molStamp;
100 <      int nMolWithSameStamp;
101 <      int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
102 <      int nGroups = 0;      //total cutoff groups defined in meta-data file
103 <      CutoffGroupStamp* cgStamp;    
104 <      RigidBodyStamp* rbStamp;
105 <      int nRigidAtoms = 0;
106 <
107 <      std::vector<Component*> components = simParams->getComponents();
103 >      nMolWithSameStamp = (*i)->getNMol();
104        
105 <      for (std::vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
106 <        molStamp = (*i)->getMoleculeStamp();
107 <        nMolWithSameStamp = (*i)->getNMol();
108 <        
109 <        addMoleculeStamp(molStamp, nMolWithSameStamp);
110 <
111 <        //calculate atoms in molecules
112 <        nGlobalAtoms_ += molStamp->getNAtoms() *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();
125 <        }
126 <
127 <        nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
128 <
129 <        nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;            
130 <
131 <        //calculate atoms in rigid bodies
132 <        int nAtomsInRigidBodies = 0;
133 <        int nRigidBodiesInStamp = molStamp->getNRigidBodies();
134 <        
135 <        for (int j=0; j < nRigidBodiesInStamp; j++) {
136 <          rbStamp = molStamp->getRigidBodyStamp(j);
137 <          nAtomsInRigidBodies += rbStamp->getNMembers();
138 <        }
139 <
140 <        nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
141 <        nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;            
142 <        
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 <      //every free atom (atom does not belong to cutoff groups) is a cutoff
124 <      //group therefore the total number of cutoff groups in the system is
125 <      //equal to the total number of atoms minus number of atoms belong to
126 <      //cutoff group defined in meta-data file plus the number of cutoff
127 <      //groups defined in meta-data file
128 <      nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
129 <
130 <      //every free atom (atom does not belong to rigid bodies) is an
131 <      //integrable object therefore the total number of integrable objects
132 <      //in the system is equal to the total number of atoms minus number of
133 <      //atoms belong to rigid body defined in meta-data file plus the number
134 <      //of rigid bodies defined in meta-data file
135 <      nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
136 <                                                + nGlobalRigidBodies_;
137 <  
138 <      nGlobalMols_ = molStampIds_.size();
161 <      molToProcMap_.resize(nGlobalMols_);
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 173 | Line 170 | namespace oopse {
170      delete forceField_;
171    }
172  
176  int SimInfo::getNGlobalConstraints() {
177    int nGlobalConstraints;
178 #ifdef IS_MPI
179    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
180                  MPI_COMM_WORLD);    
181 #else
182    nGlobalConstraints =  nConstraints_;
183 #endif
184    return nGlobalConstraints;
185  }
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();
# Line 201 | Line 188 | namespace oopse {
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 228 | Line 215 | namespace oopse {
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::COMM_WORLD.Allreduce(&ndf_local, &ndf_, 1, MPI::INT,MPI::SUM);
285 >    MPI::COMM_WORLD.Allreduce(&nfq_local, &nGlobalFluctuatingCharges_, 1,
286 >                              MPI::INT, MPI::SUM);
287   #else
288      ndf_ = ndf_local;
289 +    nGlobalFluctuatingCharges_ = nfq_local;
290   #endif
291  
292      // nZconstraints_ is global, as are the 3 COM translations for the
# Line 296 | Line 297 | namespace oopse {
297  
298    int SimInfo::getFdf() {
299   #ifdef IS_MPI
300 <    MPI_Allreduce(&fdf_local,&fdf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
300 >    MPI::COMM_WORLD.Allreduce(&fdf_local, &fdf_, 1, MPI::INT, MPI::SUM);
301   #else
302      fdf_ = fdf_local;
303   #endif
304      return fdf_;
305    }
306 +  
307 +  unsigned int SimInfo::getNLocalCutoffGroups(){
308 +    int nLocalCutoffAtoms = 0;
309 +    Molecule* mol;
310 +    MoleculeIterator mi;
311 +    CutoffGroup* cg;
312 +    Molecule::CutoffGroupIterator ci;
313      
314 +    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
315 +      
316 +      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
317 +           cg = mol->nextCutoffGroup(ci)) {
318 +        nLocalCutoffAtoms += cg->getNumAtom();
319 +        
320 +      }        
321 +    }
322 +    
323 +    return nAtoms_ - nLocalCutoffAtoms + nCutoffGroups_;
324 +  }
325 +    
326    void SimInfo::calcNdfRaw() {
327      int ndfRaw_local;
328  
329      MoleculeIterator i;
330 <    std::vector<StuntDouble*>::iterator j;
330 >    vector<StuntDouble*>::iterator j;
331      Molecule* mol;
332 <    StuntDouble* integrableObject;
332 >    StuntDouble* sd;
333  
334      // Raw degrees of freedom that we have to set
335      ndfRaw_local = 0;
336      
337      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
318      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
319           integrableObject = mol->nextIntegrableObject(j)) {
338  
339 +      for (sd = mol->beginIntegrableObject(j); sd != NULL;
340 +           sd = mol->nextIntegrableObject(j)) {
341 +
342          ndfRaw_local += 3;
343  
344 <        if (integrableObject->isDirectional()) {
345 <          if (integrableObject->isLinear()) {
344 >        if (sd->isDirectional()) {
345 >          if (sd->isLinear()) {
346              ndfRaw_local += 2;
347            } else {
348              ndfRaw_local += 3;
# Line 332 | Line 353 | namespace oopse {
353      }
354      
355   #ifdef IS_MPI
356 <    MPI_Allreduce(&ndfRaw_local,&ndfRaw_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
356 >    MPI::COMM_WORLD.Allreduce(&ndfRaw_local, &ndfRaw_, 1, MPI::INT, MPI::SUM);
357   #else
358      ndfRaw_ = ndfRaw_local;
359   #endif
# Line 345 | Line 366 | namespace oopse {
366  
367  
368   #ifdef IS_MPI
369 <    MPI_Allreduce(&ndfTrans_local,&ndfTrans_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
369 >    MPI::COMM_WORLD.Allreduce(&ndfTrans_local, &ndfTrans_, 1,
370 >                              MPI::INT, MPI::SUM);
371   #else
372      ndfTrans_ = ndfTrans_local;
373   #endif
# Line 354 | Line 376 | namespace oopse {
376  
377    }
378  
379 <  void SimInfo::addExcludePairs(Molecule* mol) {
380 <    std::vector<Bond*>::iterator bondIter;
381 <    std::vector<Bend*>::iterator bendIter;
382 <    std::vector<Torsion*>::iterator torsionIter;
383 <    std::vector<Inversion*>::iterator inversionIter;
379 >  void SimInfo::addInteractionPairs(Molecule* mol) {
380 >    ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
381 >    vector<Bond*>::iterator bondIter;
382 >    vector<Bend*>::iterator bendIter;
383 >    vector<Torsion*>::iterator torsionIter;
384 >    vector<Inversion*>::iterator inversionIter;
385      Bond* bond;
386      Bend* bend;
387      Torsion* torsion;
# Line 368 | Line 391 | namespace oopse {
391      int c;
392      int d;
393  
394 <    std::map<int, std::set<int> > atomGroups;
394 >    // atomGroups can be used to add special interaction maps between
395 >    // groups of atoms that are in two separate rigid bodies.
396 >    // However, most site-site interactions between two rigid bodies
397 >    // are probably not special, just the ones between the physically
398 >    // bonded atoms.  Interactions *within* a single rigid body should
399 >    // always be excluded.  These are done at the bottom of this
400 >    // function.
401  
402 +    map<int, set<int> > atomGroups;
403      Molecule::RigidBodyIterator rbIter;
404      RigidBody* rb;
405      Molecule::IntegrableObjectIterator ii;
406 <    StuntDouble* integrableObject;
406 >    StuntDouble* sd;
407      
408 <    for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
409 <           integrableObject = mol->nextIntegrableObject(ii)) {
410 <
411 <      if (integrableObject->isRigidBody()) {
412 <          rb = static_cast<RigidBody*>(integrableObject);
413 <          std::vector<Atom*> atoms = rb->getAtoms();
414 <          std::set<int> rigidAtoms;
415 <          for (int i = 0; i < atoms.size(); ++i) {
416 <            rigidAtoms.insert(atoms[i]->getGlobalIndex());
417 <          }
418 <          for (int i = 0; i < atoms.size(); ++i) {
419 <            atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
420 <          }      
408 >    for (sd = mol->beginIntegrableObject(ii); sd != NULL;
409 >         sd = mol->nextIntegrableObject(ii)) {
410 >      
411 >      if (sd->isRigidBody()) {
412 >        rb = static_cast<RigidBody*>(sd);
413 >        vector<Atom*> atoms = rb->getAtoms();
414 >        set<int> rigidAtoms;
415 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
416 >          rigidAtoms.insert(atoms[i]->getGlobalIndex());
417 >        }
418 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
419 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
420 >        }      
421        } else {
422 <        std::set<int> oneAtomSet;
423 <        oneAtomSet.insert(integrableObject->getGlobalIndex());
424 <        atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
422 >        set<int> oneAtomSet;
423 >        oneAtomSet.insert(sd->getGlobalIndex());
424 >        atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));        
425        }
426      }  
427  
428 <    
429 <    
430 <    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
428 >          
429 >    for (bond= mol->beginBond(bondIter); bond != NULL;
430 >         bond = mol->nextBond(bondIter)) {
431 >
432        a = bond->getAtomA()->getGlobalIndex();
433 <      b = bond->getAtomB()->getGlobalIndex();        
434 <      exclude_.addPair(a, b);
433 >      b = bond->getAtomB()->getGlobalIndex();  
434 >
435 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
436 >        oneTwoInteractions_.addPair(a, b);
437 >      } else {
438 >        excludedInteractions_.addPair(a, b);
439 >      }
440      }
441  
442 <    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
442 >    for (bend= mol->beginBend(bendIter); bend != NULL;
443 >         bend = mol->nextBend(bendIter)) {
444 >
445        a = bend->getAtomA()->getGlobalIndex();
446        b = bend->getAtomB()->getGlobalIndex();        
447        c = bend->getAtomC()->getGlobalIndex();
410      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
411      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
412      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
413
414      exclude_.addPairs(rigidSetA, rigidSetB);
415      exclude_.addPairs(rigidSetA, rigidSetC);
416      exclude_.addPairs(rigidSetB, rigidSetC);
448        
449 <      //exclude_.addPair(a, b);
450 <      //exclude_.addPair(a, c);
451 <      //exclude_.addPair(b, c);        
449 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
450 >        oneTwoInteractions_.addPair(a, b);      
451 >        oneTwoInteractions_.addPair(b, c);
452 >      } else {
453 >        excludedInteractions_.addPair(a, b);
454 >        excludedInteractions_.addPair(b, c);
455 >      }
456 >
457 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
458 >        oneThreeInteractions_.addPair(a, c);      
459 >      } else {
460 >        excludedInteractions_.addPair(a, c);
461 >      }
462      }
463  
464 <    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
464 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
465 >         torsion = mol->nextTorsion(torsionIter)) {
466 >
467        a = torsion->getAtomA()->getGlobalIndex();
468        b = torsion->getAtomB()->getGlobalIndex();        
469        c = torsion->getAtomC()->getGlobalIndex();        
470 <      d = torsion->getAtomD()->getGlobalIndex();        
428 <      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
429 <      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
430 <      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
431 <      std::set<int> rigidSetD = getRigidSet(d, atomGroups);
470 >      d = torsion->getAtomD()->getGlobalIndex();      
471  
472 <      exclude_.addPairs(rigidSetA, rigidSetB);
473 <      exclude_.addPairs(rigidSetA, rigidSetC);
474 <      exclude_.addPairs(rigidSetA, rigidSetD);
475 <      exclude_.addPairs(rigidSetB, rigidSetC);
476 <      exclude_.addPairs(rigidSetB, rigidSetD);
477 <      exclude_.addPairs(rigidSetC, rigidSetD);
472 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
473 >        oneTwoInteractions_.addPair(a, b);      
474 >        oneTwoInteractions_.addPair(b, c);
475 >        oneTwoInteractions_.addPair(c, d);
476 >      } else {
477 >        excludedInteractions_.addPair(a, b);
478 >        excludedInteractions_.addPair(b, c);
479 >        excludedInteractions_.addPair(c, d);
480 >      }
481  
482 <      /*
483 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
484 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
485 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
486 <      exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
487 <      exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
488 <      exclude_.addPairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
489 <        
490 <      
491 <      exclude_.addPair(a, b);
492 <      exclude_.addPair(a, c);
493 <      exclude_.addPair(a, d);
494 <      exclude_.addPair(b, c);
453 <      exclude_.addPair(b, d);
454 <      exclude_.addPair(c, d);        
455 <      */
482 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
483 >        oneThreeInteractions_.addPair(a, c);      
484 >        oneThreeInteractions_.addPair(b, d);      
485 >      } else {
486 >        excludedInteractions_.addPair(a, c);
487 >        excludedInteractions_.addPair(b, d);
488 >      }
489 >
490 >      if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
491 >        oneFourInteractions_.addPair(a, d);      
492 >      } else {
493 >        excludedInteractions_.addPair(a, d);
494 >      }
495      }
496  
497      for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
498           inversion = mol->nextInversion(inversionIter)) {
499 +
500        a = inversion->getAtomA()->getGlobalIndex();
501        b = inversion->getAtomB()->getGlobalIndex();        
502        c = inversion->getAtomC()->getGlobalIndex();        
503        d = inversion->getAtomD()->getGlobalIndex();        
464      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
465      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
466      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
467      std::set<int> rigidSetD = getRigidSet(d, atomGroups);
504  
505 <      exclude_.addPairs(rigidSetA, rigidSetB);
506 <      exclude_.addPairs(rigidSetA, rigidSetC);
507 <      exclude_.addPairs(rigidSetA, rigidSetD);
508 <      exclude_.addPairs(rigidSetB, rigidSetC);
509 <      exclude_.addPairs(rigidSetB, rigidSetD);
510 <      exclude_.addPairs(rigidSetC, rigidSetD);
505 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
506 >        oneTwoInteractions_.addPair(a, b);      
507 >        oneTwoInteractions_.addPair(a, c);
508 >        oneTwoInteractions_.addPair(a, d);
509 >      } else {
510 >        excludedInteractions_.addPair(a, b);
511 >        excludedInteractions_.addPair(a, c);
512 >        excludedInteractions_.addPair(a, d);
513 >      }
514  
515 <      /*
516 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
517 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
518 <      exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
519 <      exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
520 <      exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
521 <      exclude_.addPairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
522 <        
523 <      
485 <      exclude_.addPair(a, b);
486 <      exclude_.addPair(a, c);
487 <      exclude_.addPair(a, d);
488 <      exclude_.addPair(b, c);
489 <      exclude_.addPair(b, d);
490 <      exclude_.addPair(c, d);        
491 <      */
515 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
516 >        oneThreeInteractions_.addPair(b, c);    
517 >        oneThreeInteractions_.addPair(b, d);    
518 >        oneThreeInteractions_.addPair(c, d);      
519 >      } else {
520 >        excludedInteractions_.addPair(b, c);
521 >        excludedInteractions_.addPair(b, d);
522 >        excludedInteractions_.addPair(c, d);
523 >      }
524      }
525  
526 <    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
527 <      std::vector<Atom*> atoms = rb->getAtoms();
528 <      for (int i = 0; i < atoms.size() -1 ; ++i) {
529 <        for (int j = i + 1; j < atoms.size(); ++j) {
526 >    for (rb = mol->beginRigidBody(rbIter); rb != NULL;
527 >         rb = mol->nextRigidBody(rbIter)) {
528 >      vector<Atom*> atoms = rb->getAtoms();
529 >      for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
530 >        for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
531            a = atoms[i]->getGlobalIndex();
532            b = atoms[j]->getGlobalIndex();
533 <          exclude_.addPair(a, b);
533 >          excludedInteractions_.addPair(a, b);
534          }
535        }
536      }        
537  
538    }
539  
540 <  void SimInfo::removeExcludePairs(Molecule* mol) {
541 <    std::vector<Bond*>::iterator bondIter;
542 <    std::vector<Bend*>::iterator bendIter;
543 <    std::vector<Torsion*>::iterator torsionIter;
544 <    std::vector<Inversion*>::iterator inversionIter;
540 >  void SimInfo::removeInteractionPairs(Molecule* mol) {
541 >    ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
542 >    vector<Bond*>::iterator bondIter;
543 >    vector<Bend*>::iterator bendIter;
544 >    vector<Torsion*>::iterator torsionIter;
545 >    vector<Inversion*>::iterator inversionIter;
546      Bond* bond;
547      Bend* bend;
548      Torsion* torsion;
# Line 518 | Line 552 | namespace oopse {
552      int c;
553      int d;
554  
555 <    std::map<int, std::set<int> > atomGroups;
522 <
555 >    map<int, set<int> > atomGroups;
556      Molecule::RigidBodyIterator rbIter;
557      RigidBody* rb;
558      Molecule::IntegrableObjectIterator ii;
559 <    StuntDouble* integrableObject;
559 >    StuntDouble* sd;
560      
561 <    for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
562 <           integrableObject = mol->nextIntegrableObject(ii)) {
563 <
564 <      if (integrableObject->isRigidBody()) {
565 <          rb = static_cast<RigidBody*>(integrableObject);
566 <          std::vector<Atom*> atoms = rb->getAtoms();
567 <          std::set<int> rigidAtoms;
568 <          for (int i = 0; i < atoms.size(); ++i) {
569 <            rigidAtoms.insert(atoms[i]->getGlobalIndex());
570 <          }
571 <          for (int i = 0; i < atoms.size(); ++i) {
572 <            atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
573 <          }      
561 >    for (sd = mol->beginIntegrableObject(ii); sd != NULL;
562 >         sd = mol->nextIntegrableObject(ii)) {
563 >      
564 >      if (sd->isRigidBody()) {
565 >        rb = static_cast<RigidBody*>(sd);
566 >        vector<Atom*> atoms = rb->getAtoms();
567 >        set<int> rigidAtoms;
568 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
569 >          rigidAtoms.insert(atoms[i]->getGlobalIndex());
570 >        }
571 >        for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
572 >          atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
573 >        }      
574        } else {
575 <        std::set<int> oneAtomSet;
576 <        oneAtomSet.insert(integrableObject->getGlobalIndex());
577 <        atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
575 >        set<int> oneAtomSet;
576 >        oneAtomSet.insert(sd->getGlobalIndex());
577 >        atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));        
578        }
579      }  
580  
581 <    
582 <    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
581 >    for (bond= mol->beginBond(bondIter); bond != NULL;
582 >         bond = mol->nextBond(bondIter)) {
583 >      
584        a = bond->getAtomA()->getGlobalIndex();
585 <      b = bond->getAtomB()->getGlobalIndex();        
586 <      exclude_.removePair(a, b);
585 >      b = bond->getAtomB()->getGlobalIndex();  
586 >    
587 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
588 >        oneTwoInteractions_.removePair(a, b);
589 >      } else {
590 >        excludedInteractions_.removePair(a, b);
591 >      }
592      }
593  
594 <    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
594 >    for (bend= mol->beginBend(bendIter); bend != NULL;
595 >         bend = mol->nextBend(bendIter)) {
596 >
597        a = bend->getAtomA()->getGlobalIndex();
598        b = bend->getAtomB()->getGlobalIndex();        
599        c = bend->getAtomC()->getGlobalIndex();
559
560      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
561      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
562      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
563
564      exclude_.removePairs(rigidSetA, rigidSetB);
565      exclude_.removePairs(rigidSetA, rigidSetC);
566      exclude_.removePairs(rigidSetB, rigidSetC);
600        
601 <      //exclude_.removePair(a, b);
602 <      //exclude_.removePair(a, c);
603 <      //exclude_.removePair(b, c);        
601 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
602 >        oneTwoInteractions_.removePair(a, b);      
603 >        oneTwoInteractions_.removePair(b, c);
604 >      } else {
605 >        excludedInteractions_.removePair(a, b);
606 >        excludedInteractions_.removePair(b, c);
607 >      }
608 >
609 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
610 >        oneThreeInteractions_.removePair(a, c);      
611 >      } else {
612 >        excludedInteractions_.removePair(a, c);
613 >      }
614      }
615  
616 <    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
616 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
617 >         torsion = mol->nextTorsion(torsionIter)) {
618 >
619        a = torsion->getAtomA()->getGlobalIndex();
620        b = torsion->getAtomB()->getGlobalIndex();        
621        c = torsion->getAtomC()->getGlobalIndex();        
622 <      d = torsion->getAtomD()->getGlobalIndex();        
622 >      d = torsion->getAtomD()->getGlobalIndex();      
623 >  
624 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
625 >        oneTwoInteractions_.removePair(a, b);      
626 >        oneTwoInteractions_.removePair(b, c);
627 >        oneTwoInteractions_.removePair(c, d);
628 >      } else {
629 >        excludedInteractions_.removePair(a, b);
630 >        excludedInteractions_.removePair(b, c);
631 >        excludedInteractions_.removePair(c, d);
632 >      }
633  
634 <      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
635 <      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
636 <      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
637 <      std::set<int> rigidSetD = getRigidSet(d, atomGroups);
634 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
635 >        oneThreeInteractions_.removePair(a, c);      
636 >        oneThreeInteractions_.removePair(b, d);      
637 >      } else {
638 >        excludedInteractions_.removePair(a, c);
639 >        excludedInteractions_.removePair(b, d);
640 >      }
641  
642 <      exclude_.removePairs(rigidSetA, rigidSetB);
643 <      exclude_.removePairs(rigidSetA, rigidSetC);
644 <      exclude_.removePairs(rigidSetA, rigidSetD);
645 <      exclude_.removePairs(rigidSetB, rigidSetC);
646 <      exclude_.removePairs(rigidSetB, rigidSetD);
589 <      exclude_.removePairs(rigidSetC, rigidSetD);
590 <
591 <      /*
592 <      exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
593 <      exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
594 <      exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
595 <      exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
596 <      exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
597 <      exclude_.removePairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
598 <
599 <      
600 <      exclude_.removePair(a, b);
601 <      exclude_.removePair(a, c);
602 <      exclude_.removePair(a, d);
603 <      exclude_.removePair(b, c);
604 <      exclude_.removePair(b, d);
605 <      exclude_.removePair(c, d);        
606 <      */
642 >      if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
643 >        oneFourInteractions_.removePair(a, d);      
644 >      } else {
645 >        excludedInteractions_.removePair(a, d);
646 >      }
647      }
648  
649 <    for (inversion= mol->beginInversion(inversionIter); inversion != NULL; inversion = mol->nextInversion(inversionIter)) {
649 >    for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
650 >         inversion = mol->nextInversion(inversionIter)) {
651 >
652        a = inversion->getAtomA()->getGlobalIndex();
653        b = inversion->getAtomB()->getGlobalIndex();        
654        c = inversion->getAtomC()->getGlobalIndex();        
655        d = inversion->getAtomD()->getGlobalIndex();        
656  
657 <      std::set<int> rigidSetA = getRigidSet(a, atomGroups);
658 <      std::set<int> rigidSetB = getRigidSet(b, atomGroups);
659 <      std::set<int> rigidSetC = getRigidSet(c, atomGroups);
660 <      std::set<int> rigidSetD = getRigidSet(d, atomGroups);
657 >      if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
658 >        oneTwoInteractions_.removePair(a, b);      
659 >        oneTwoInteractions_.removePair(a, c);
660 >        oneTwoInteractions_.removePair(a, d);
661 >      } else {
662 >        excludedInteractions_.removePair(a, b);
663 >        excludedInteractions_.removePair(a, c);
664 >        excludedInteractions_.removePair(a, d);
665 >      }
666  
667 <      exclude_.removePairs(rigidSetA, rigidSetB);
668 <      exclude_.removePairs(rigidSetA, rigidSetC);
669 <      exclude_.removePairs(rigidSetA, rigidSetD);
670 <      exclude_.removePairs(rigidSetB, rigidSetC);
671 <      exclude_.removePairs(rigidSetB, rigidSetD);
672 <      exclude_.removePairs(rigidSetC, rigidSetD);
673 <
674 <      /*
675 <      exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
629 <      exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
630 <      exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
631 <      exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
632 <      exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
633 <      exclude_.removePairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
634 <
635 <      
636 <      exclude_.removePair(a, b);
637 <      exclude_.removePair(a, c);
638 <      exclude_.removePair(a, d);
639 <      exclude_.removePair(b, c);
640 <      exclude_.removePair(b, d);
641 <      exclude_.removePair(c, d);        
642 <      */
667 >      if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
668 >        oneThreeInteractions_.removePair(b, c);    
669 >        oneThreeInteractions_.removePair(b, d);    
670 >        oneThreeInteractions_.removePair(c, d);      
671 >      } else {
672 >        excludedInteractions_.removePair(b, c);
673 >        excludedInteractions_.removePair(b, d);
674 >        excludedInteractions_.removePair(c, d);
675 >      }
676      }
677  
678 <    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
679 <      std::vector<Atom*> atoms = rb->getAtoms();
680 <      for (int i = 0; i < atoms.size() -1 ; ++i) {
681 <        for (int j = i + 1; j < atoms.size(); ++j) {
678 >    for (rb = mol->beginRigidBody(rbIter); rb != NULL;
679 >         rb = mol->nextRigidBody(rbIter)) {
680 >      vector<Atom*> atoms = rb->getAtoms();
681 >      for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
682 >        for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
683            a = atoms[i]->getGlobalIndex();
684            b = atoms[j]->getGlobalIndex();
685 <          exclude_.removePair(a, b);
685 >          excludedInteractions_.removePair(a, b);
686          }
687        }
688      }        
689 <
689 >    
690    }
691 <
692 <
691 >  
692 >  
693    void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
694      int curStampId;
695 <
695 >    
696      //index from 0
697      curStampId = moleculeStamps_.size();
698  
# Line 666 | Line 700 | namespace oopse {
700      molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
701    }
702  
669  void SimInfo::update() {
703  
704 <    setupSimType();
705 <
706 < #ifdef IS_MPI
707 <    setupFortranParallel();
708 < #endif
709 <
710 <    setupFortranSim();
711 <
712 <    //setup fortran force field
680 <    /** @deprecate */    
681 <    int isError = 0;
682 <    
683 <    setupCutoff();
684 <    
685 <    setupElectrostaticSummationMethod( isError );
686 <    setupSwitchingFunction();
687 <    setupAccumulateBoxDipole();
688 <
689 <    if(isError){
690 <      sprintf( painCave.errMsg,
691 <               "ForceField error: There was an error initializing the forceField in fortran.\n" );
692 <      painCave.isFatal = 1;
693 <      simError();
694 <    }
695 <
704 >  /**
705 >   * update
706 >   *
707 >   *  Performs the global checks and variable settings after the
708 >   *  objects have been created.
709 >   *
710 >   */
711 >  void SimInfo::update() {  
712 >    setupSimVariables();
713      calcNdf();
714      calcNdfRaw();
715      calcNdfTrans();
699
700    fortranInitialized_ = true;
716    }
717 <
718 <  std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
717 >  
718 >  /**
719 >   * getSimulatedAtomTypes
720 >   *
721 >   * Returns an STL set of AtomType* that are actually present in this
722 >   * simulation.  Must query all processors to assemble this information.
723 >   *
724 >   */
725 >  set<AtomType*> SimInfo::getSimulatedAtomTypes() {
726      SimInfo::MoleculeIterator mi;
727      Molecule* mol;
728      Molecule::AtomIterator ai;
729      Atom* atom;
730 <    std::set<AtomType*> atomTypes;
731 <
730 >    set<AtomType*> atomTypes;
731 >    
732      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
733 <
734 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
733 >      for(atom = mol->beginAtom(ai); atom != NULL;
734 >          atom = mol->nextAtom(ai)) {
735          atomTypes.insert(atom->getAtomType());
736 <      }
737 <        
716 <    }
717 <
718 <    return atomTypes;        
719 <  }
720 <
721 <  void SimInfo::setupSimType() {
722 <    std::set<AtomType*>::iterator i;
723 <    std::set<AtomType*> atomTypes;
724 <    atomTypes = getUniqueAtomTypes();
736 >      }      
737 >    }    
738      
739 <    int useLennardJones = 0;
727 <    int useElectrostatic = 0;
728 <    int useEAM = 0;
729 <    int useSC = 0;
730 <    int useCharge = 0;
731 <    int useDirectional = 0;
732 <    int useDipole = 0;
733 <    int useGayBerne = 0;
734 <    int useSticky = 0;
735 <    int useStickyPower = 0;
736 <    int useShape = 0;
737 <    int useFLARB = 0; //it is not in AtomType yet
738 <    int useDirectionalAtom = 0;    
739 <    int useElectrostatics = 0;
740 <    //usePBC and useRF are from simParams
741 <    int usePBC = simParams_->getUsePeriodicBoundaryConditions();
742 <    int useRF;
743 <    int useSF;
744 <    int useSP;
745 <    int useBoxDipole;
739 > #ifdef IS_MPI
740  
741 <    std::string myMethod;
742 <
749 <    // set the useRF logical
750 <    useRF = 0;
751 <    useSF = 0;
752 <    useSP = 0;
753 <
754 <
755 <    if (simParams_->haveElectrostaticSummationMethod()) {
756 <      std::string myMethod = simParams_->getElectrostaticSummationMethod();
757 <      toUpper(myMethod);
758 <      if (myMethod == "REACTION_FIELD"){
759 <        useRF = 1;
760 <      } else if (myMethod == "SHIFTED_FORCE"){
761 <        useSF = 1;
762 <      } else if (myMethod == "SHIFTED_POTENTIAL"){
763 <        useSP = 1;
764 <      }
765 <    }
741 >    // loop over the found atom types on this processor, and add their
742 >    // numerical idents to a vector:
743      
744 <    if (simParams_->haveAccumulateBoxDipole())
745 <      if (simParams_->getAccumulateBoxDipole())
746 <        useBoxDipole = 1;
744 >    vector<int> foundTypes;
745 >    set<AtomType*>::iterator i;
746 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
747 >      foundTypes.push_back( (*i)->getIdent() );
748  
749 <    useAtomicVirial_ = simParams_->getUseAtomicVirial();
749 >    // count_local holds the number of found types on this processor
750 >    int count_local = foundTypes.size();
751  
752 <    //loop over all of the atom types
774 <    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
775 <      useLennardJones |= (*i)->isLennardJones();
776 <      useElectrostatic |= (*i)->isElectrostatic();
777 <      useEAM |= (*i)->isEAM();
778 <      useSC |= (*i)->isSC();
779 <      useCharge |= (*i)->isCharge();
780 <      useDirectional |= (*i)->isDirectional();
781 <      useDipole |= (*i)->isDipole();
782 <      useGayBerne |= (*i)->isGayBerne();
783 <      useSticky |= (*i)->isSticky();
784 <      useStickyPower |= (*i)->isStickyPower();
785 <      useShape |= (*i)->isShape();
786 <    }
752 >    int nproc = MPI::COMM_WORLD.Get_size();
753  
754 <    if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
755 <      useDirectionalAtom = 1;
756 <    }
754 >    // we need arrays to hold the counts and displacement vectors for
755 >    // all processors
756 >    vector<int> counts(nproc, 0);
757 >    vector<int> disps(nproc, 0);
758  
759 <    if (useCharge || useDipole) {
760 <      useElectrostatics = 1;
759 >    // fill the counts array
760 >    MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0],
761 >                              1, MPI::INT);
762 >  
763 >    // use the processor counts to compute the displacement array
764 >    disps[0] = 0;    
765 >    int totalCount = counts[0];
766 >    for (int iproc = 1; iproc < nproc; iproc++) {
767 >      disps[iproc] = disps[iproc-1] + counts[iproc-1];
768 >      totalCount += counts[iproc];
769      }
770  
771 < #ifdef IS_MPI    
772 <    int temp;
771 >    // we need a (possibly redundant) set of all found types:
772 >    vector<int> ftGlobal(totalCount);
773 >    
774 >    // now spray out the foundTypes to all the other processors:    
775 >    MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
776 >                               &ftGlobal[0], &counts[0], &disps[0],
777 >                               MPI::INT);
778  
779 <    temp = usePBC;
800 <    MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
779 >    vector<int>::iterator j;
780  
781 <    temp = useDirectionalAtom;
782 <    MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
781 >    // foundIdents is a stl set, so inserting an already found ident
782 >    // will have no effect.
783 >    set<int> foundIdents;
784  
785 <    temp = useLennardJones;
786 <    MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
785 >    for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
786 >      foundIdents.insert((*j));
787 >    
788 >    // now iterate over the foundIdents and get the actual atom types
789 >    // that correspond to these:
790 >    set<int>::iterator it;
791 >    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
792 >      atomTypes.insert( forceField_->getAtomType((*it)) );
793 >
794 > #endif
795  
796 <    temp = useElectrostatics;
797 <    MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
796 >    return atomTypes;        
797 >  }
798  
811    temp = useCharge;
812    MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
799  
800 <    temp = useDipole;
801 <    MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
802 <
803 <    temp = useSticky;
818 <    MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
800 >  int getGlobalCountOfType(AtomType* atype) {
801 >    /*
802 >    set<AtomType*> atypes = getSimulatedAtomTypes();
803 >    map<AtomType*, int> counts_;
804  
805 <    temp = useStickyPower;
806 <    MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
805 >    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
806 >      for(atom = mol->beginAtom(ai); atom != NULL;
807 >          atom = mol->nextAtom(ai)) {
808 >        atom->getAtomType();
809 >      }      
810 >    }    
811 >    */
812 >    return 0;
813 >  }
814 >
815 >  void SimInfo::setupSimVariables() {
816 >    useAtomicVirial_ = simParams_->getUseAtomicVirial();
817 >    // we only call setAccumulateBoxDipole if the accumulateBoxDipole
818 >    // parameter is true
819 >    calcBoxDipole_ = false;
820 >    if ( simParams_->haveAccumulateBoxDipole() )
821 >      if ( simParams_->getAccumulateBoxDipole() ) {
822 >        calcBoxDipole_ = true;      
823 >      }
824      
825 <    temp = useGayBerne;
826 <    MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
825 >    set<AtomType*>::iterator i;
826 >    set<AtomType*> atomTypes;
827 >    atomTypes = getSimulatedAtomTypes();    
828 >    bool usesElectrostatic = false;
829 >    bool usesMetallic = false;
830 >    bool usesDirectional = false;
831 >    bool usesFluctuatingCharges =  false;
832 >    //loop over all of the atom types
833 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
834 >      usesElectrostatic |= (*i)->isElectrostatic();
835 >      usesMetallic |= (*i)->isMetal();
836 >      usesDirectional |= (*i)->isDirectional();
837 >      usesFluctuatingCharges |= (*i)->isFluctuatingCharge();
838 >    }
839  
840 <    temp = useEAM;
841 <    MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
842 <
843 <    temp = useSC;
844 <    MPI_Allreduce(&temp, &useSC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
840 > #ifdef IS_MPI
841 >    bool temp;
842 >    temp = usesDirectional;
843 >    MPI::COMM_WORLD.Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI::BOOL,
844 >                              MPI::LOR);
845 >        
846 >    temp = usesMetallic;
847 >    MPI::COMM_WORLD.Allreduce(&temp, &usesMetallicAtoms_, 1, MPI::BOOL,
848 >                              MPI::LOR);
849      
850 <    temp = useShape;
851 <    MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);  
850 >    temp = usesElectrostatic;
851 >    MPI::COMM_WORLD.Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI::BOOL,
852 >                              MPI::LOR);
853  
854 <    temp = useFLARB;
855 <    MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
854 >    temp = usesFluctuatingCharges;
855 >    MPI::COMM_WORLD.Allreduce(&temp, &usesFluctuatingCharges_, 1, MPI::BOOL,
856 >                              MPI::LOR);
857 > #else
858  
859 <    temp = useRF;
860 <    MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
859 >    usesDirectionalAtoms_ = usesDirectional;
860 >    usesMetallicAtoms_ = usesMetallic;
861 >    usesElectrostaticAtoms_ = usesElectrostatic;
862 >    usesFluctuatingCharges_ = usesFluctuatingCharges;
863  
864 <    temp = useSF;
865 <    MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);  
864 > #endif
865 >    
866 >    requiresPrepair_ = usesMetallicAtoms_ ? true : false;
867 >    requiresSkipCorrection_ = usesElectrostaticAtoms_ ? true : false;
868 >    requiresSelfCorrection_ = usesElectrostaticAtoms_ ? true : false;    
869 >  }
870  
844    temp = useSP;
845    MPI_Allreduce(&temp, &useSP, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
871  
872 <    temp = useBoxDipole;
873 <    MPI_Allreduce(&temp, &useBoxDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
872 >  vector<int> SimInfo::getGlobalAtomIndices() {
873 >    SimInfo::MoleculeIterator mi;
874 >    Molecule* mol;
875 >    Molecule::AtomIterator ai;
876 >    Atom* atom;
877  
878 <    temp = useAtomicVirial_;
879 <    MPI_Allreduce(&temp, &useAtomicVirial_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
878 >    vector<int> GlobalAtomIndices(getNAtoms(), 0);
879 >    
880 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
881 >      
882 >      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
883 >        GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex();
884 >      }
885 >    }
886 >    return GlobalAtomIndices;
887 >  }
888  
853 #endif
889  
890 <    fInfo_.SIM_uses_PBC = usePBC;    
891 <    fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
892 <    fInfo_.SIM_uses_LennardJones = useLennardJones;
893 <    fInfo_.SIM_uses_Electrostatics = useElectrostatics;    
894 <    fInfo_.SIM_uses_Charges = useCharge;
860 <    fInfo_.SIM_uses_Dipoles = useDipole;
861 <    fInfo_.SIM_uses_Sticky = useSticky;
862 <    fInfo_.SIM_uses_StickyPower = useStickyPower;
863 <    fInfo_.SIM_uses_GayBerne = useGayBerne;
864 <    fInfo_.SIM_uses_EAM = useEAM;
865 <    fInfo_.SIM_uses_SC = useSC;
866 <    fInfo_.SIM_uses_Shapes = useShape;
867 <    fInfo_.SIM_uses_FLARB = useFLARB;
868 <    fInfo_.SIM_uses_RF = useRF;
869 <    fInfo_.SIM_uses_SF = useSF;
870 <    fInfo_.SIM_uses_SP = useSP;
871 <    fInfo_.SIM_uses_BoxDipole = useBoxDipole;
872 <    fInfo_.SIM_uses_AtomicVirial = useAtomicVirial_;
873 <  }
890 >  vector<int> SimInfo::getGlobalGroupIndices() {
891 >    SimInfo::MoleculeIterator mi;
892 >    Molecule* mol;
893 >    Molecule::CutoffGroupIterator ci;
894 >    CutoffGroup* cg;
895  
896 <  void SimInfo::setupFortranSim() {
876 <    int isError;
877 <    int nExclude;
878 <    std::vector<int> fortranGlobalGroupMembership;
896 >    vector<int> GlobalGroupIndices;
897      
898 <    nExclude = exclude_.getSize();
899 <    isError = 0;
900 <
901 <    //globalGroupMembership_ is filled by SimCreator    
902 <    for (int i = 0; i < nGlobalAtoms_; i++) {
903 <      fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
898 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
899 >      
900 >      //local index of cutoff group is trivial, it only depends on the
901 >      //order of travesing
902 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
903 >           cg = mol->nextCutoffGroup(ci)) {
904 >        GlobalGroupIndices.push_back(cg->getGlobalIndex());
905 >      }        
906      }
907 +    return GlobalGroupIndices;
908 +  }
909  
910 +
911 +  void SimInfo::prepareTopology() {
912 +
913      //calculate mass ratio of cutoff group
889    std::vector<RealType> mfact;
914      SimInfo::MoleculeIterator mi;
915      Molecule* mol;
916      Molecule::CutoffGroupIterator ci;
# Line 895 | Line 919 | namespace oopse {
919      Atom* atom;
920      RealType totalMass;
921  
922 <    //to avoid memory reallocation, reserve enough space for mfact
923 <    mfact.reserve(getNCutoffGroups());
922 >    /**
923 >     * The mass factor is the relative mass of an atom to the total
924 >     * mass of the cutoff group it belongs to.  By default, all atoms
925 >     * are their own cutoff groups, and therefore have mass factors of
926 >     * 1.  We need some special handling for massless atoms, which
927 >     * will be treated as carrying the entire mass of the cutoff
928 >     * group.
929 >     */
930 >    massFactors_.clear();
931 >    massFactors_.resize(getNAtoms(), 1.0);
932      
933      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
934 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
934 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
935 >           cg = mol->nextCutoffGroup(ci)) {
936  
937          totalMass = cg->getMass();
938          for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
939            // Check for massless groups - set mfact to 1 if true
940 <          if (totalMass != 0)
941 <            mfact.push_back(atom->getMass()/totalMass);
940 >          if (totalMass != 0)
941 >            massFactors_[atom->getLocalIndex()] = atom->getMass()/totalMass;
942            else
943 <            mfact.push_back( 1.0 );
943 >            massFactors_[atom->getLocalIndex()] = 1.0;
944          }
912
945        }      
946      }
947  
948 <    //fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
917 <    std::vector<int> identArray;
948 >    // Build the identArray_ and regions_
949  
950 <    //to avoid memory reallocation, reserve enough space identArray
951 <    identArray.reserve(getNAtoms());
952 <    
953 <    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
950 >    identArray_.clear();
951 >    identArray_.reserve(getNAtoms());  
952 >    regions_.clear();
953 >    regions_.reserve(getNAtoms());
954 >
955 >    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {      
956 >      int reg = mol->getRegion();      
957        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
958 <        identArray.push_back(atom->getIdent());
958 >        identArray_.push_back(atom->getIdent());
959 >        regions_.push_back(reg);
960        }
961      }    
962 <
963 <    //fill molMembershipArray
929 <    //molMembershipArray is filled by SimCreator    
930 <    std::vector<int> molMembershipArray(nGlobalAtoms_);
931 <    for (int i = 0; i < nGlobalAtoms_; i++) {
932 <      molMembershipArray[i] = globalMolMembership_[i] + 1;
933 <    }
934 <    
935 <    //setup fortran simulation
936 <    int nGlobalExcludes = 0;
937 <    int* globalExcludes = NULL;
938 <    int* excludeList = exclude_.getExcludeList();
939 <    setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0],
940 <                   &nExclude, excludeList , &nGlobalExcludes, globalExcludes,
941 <                   &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
942 <                   &fortranGlobalGroupMembership[0], &isError);
943 <    
944 <    if( isError ){
945 <      
946 <      sprintf( painCave.errMsg,
947 <               "There was an error setting the simulation information in fortran.\n" );
948 <      painCave.isFatal = 1;
949 <      painCave.severity = OOPSE_ERROR;
950 <      simError();
951 <    }
952 <    
953 <    
954 <    sprintf( checkPointMsg,
955 <             "succesfully sent the simulation information to fortran.\n");
956 <    
957 <    errorCheckPoint();
958 <    
959 <    // Setup number of neighbors in neighbor list if present
960 <    if (simParams_->haveNeighborListNeighbors()) {
961 <      int nlistNeighbors = simParams_->getNeighborListNeighbors();
962 <      setNeighbors(&nlistNeighbors);
963 <    }
964 <  
965 <
966 <  }
967 <
968 <
969 <  void SimInfo::setupFortranParallel() {
970 < #ifdef IS_MPI    
971 <    //SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
972 <    std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
973 <    std::vector<int> localToGlobalCutoffGroupIndex;
974 <    SimInfo::MoleculeIterator mi;
975 <    Molecule::AtomIterator ai;
976 <    Molecule::CutoffGroupIterator ci;
977 <    Molecule* mol;
978 <    Atom* atom;
979 <    CutoffGroup* cg;
980 <    mpiSimData parallelData;
981 <    int isError;
982 <
983 <    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
984 <
985 <      //local index(index in DataStorge) of atom is important
986 <      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
987 <        localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
988 <      }
989 <
990 <      //local index of cutoff group is trivial, it only depends on the order of travesing
991 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
992 <        localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
993 <      }        
994 <        
995 <    }
996 <
997 <    //fill up mpiSimData struct
998 <    parallelData.nMolGlobal = getNGlobalMolecules();
999 <    parallelData.nMolLocal = getNMolecules();
1000 <    parallelData.nAtomsGlobal = getNGlobalAtoms();
1001 <    parallelData.nAtomsLocal = getNAtoms();
1002 <    parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
1003 <    parallelData.nGroupsLocal = getNCutoffGroups();
1004 <    parallelData.myNode = worldRank;
1005 <    MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
1006 <
1007 <    //pass mpiSimData struct and index arrays to fortran
1008 <    setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
1009 <                    &localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
1010 <                    &localToGlobalCutoffGroupIndex[0], &isError);
1011 <
1012 <    if (isError) {
1013 <      sprintf(painCave.errMsg,
1014 <              "mpiRefresh errror: fortran didn't like something we gave it.\n");
1015 <      painCave.isFatal = 1;
1016 <      simError();
1017 <    }
1018 <
1019 <    sprintf(checkPointMsg, " mpiRefresh successful.\n");
1020 <    errorCheckPoint();
1021 <
1022 < #endif
1023 <  }
1024 <
1025 <  void SimInfo::setupCutoff() {          
1026 <    
1027 <    ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
1028 <
1029 <    // Check the cutoff policy
1030 <    int cp =  TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
1031 <
1032 <    // Set LJ shifting bools to false
1033 <    ljsp_ = false;
1034 <    ljsf_ = false;
1035 <
1036 <    std::string myPolicy;
1037 <    if (forceFieldOptions_.haveCutoffPolicy()){
1038 <      myPolicy = forceFieldOptions_.getCutoffPolicy();
1039 <    }else if (simParams_->haveCutoffPolicy()) {
1040 <      myPolicy = simParams_->getCutoffPolicy();
1041 <    }
1042 <
1043 <    if (!myPolicy.empty()){
1044 <      toUpper(myPolicy);
1045 <      if (myPolicy == "MIX") {
1046 <        cp = MIX_CUTOFF_POLICY;
1047 <      } else {
1048 <        if (myPolicy == "MAX") {
1049 <          cp = MAX_CUTOFF_POLICY;
1050 <        } else {
1051 <          if (myPolicy == "TRADITIONAL") {            
1052 <            cp = TRADITIONAL_CUTOFF_POLICY;
1053 <          } else {
1054 <            // throw error        
1055 <            sprintf( painCave.errMsg,
1056 <                     "SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
1057 <            painCave.isFatal = 1;
1058 <            simError();
1059 <          }    
1060 <        }          
1061 <      }
1062 <    }          
1063 <    notifyFortranCutoffPolicy(&cp);
1064 <
1065 <    // Check the Skin Thickness for neighborlists
1066 <    RealType skin;
1067 <    if (simParams_->haveSkinThickness()) {
1068 <      skin = simParams_->getSkinThickness();
1069 <      notifyFortranSkinThickness(&skin);
1070 <    }            
1071 <        
1072 <    // Check if the cutoff was set explicitly:
1073 <    if (simParams_->haveCutoffRadius()) {
1074 <      rcut_ = simParams_->getCutoffRadius();
1075 <      if (simParams_->haveSwitchingRadius()) {
1076 <        rsw_  = simParams_->getSwitchingRadius();
1077 <      } else {
1078 <        if (fInfo_.SIM_uses_Charges |
1079 <            fInfo_.SIM_uses_Dipoles |
1080 <            fInfo_.SIM_uses_RF) {
1081 <          
1082 <          rsw_ = 0.85 * rcut_;
1083 <          sprintf(painCave.errMsg,
1084 <                  "SimCreator Warning: No value was set for the switchingRadius.\n"
1085 <                  "\tOOPSE will use a default value of 85 percent of the cutoffRadius.\n"
1086 <                  "\tswitchingRadius = %f. for this simulation\n", rsw_);
1087 <        painCave.isFatal = 0;
1088 <        simError();
1089 <        } else {
1090 <          rsw_ = rcut_;
1091 <          sprintf(painCave.errMsg,
1092 <                  "SimCreator Warning: No value was set for the switchingRadius.\n"
1093 <                  "\tOOPSE will use the same value as the cutoffRadius.\n"
1094 <                  "\tswitchingRadius = %f. for this simulation\n", rsw_);
1095 <          painCave.isFatal = 0;
1096 <          simError();
1097 <        }
1098 <      }
1099 <
1100 <      if (simParams_->haveElectrostaticSummationMethod()) {
1101 <        std::string myMethod = simParams_->getElectrostaticSummationMethod();
1102 <        toUpper(myMethod);
1103 <        
1104 <        if (myMethod == "SHIFTED_POTENTIAL") {
1105 <          ljsp_ = true;
1106 <        } else if (myMethod == "SHIFTED_FORCE") {
1107 <          ljsf_ = true;
1108 <        }
1109 <      }
1110 <      notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1111 <      
1112 <    } else {
1113 <      
1114 <      // For electrostatic atoms, we'll assume a large safe value:
1115 <      if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
1116 <        sprintf(painCave.errMsg,
1117 <                "SimCreator Warning: No value was set for the cutoffRadius.\n"
1118 <                "\tOOPSE will use a default value of 15.0 angstroms"
1119 <                "\tfor the cutoffRadius.\n");
1120 <        painCave.isFatal = 0;
1121 <        simError();
1122 <        rcut_ = 15.0;
1123 <      
1124 <        if (simParams_->haveElectrostaticSummationMethod()) {
1125 <          std::string myMethod = simParams_->getElectrostaticSummationMethod();
1126 <          toUpper(myMethod);
1127 <      
1128 <      // For the time being, we're tethering the LJ shifted behavior to the
1129 <      // electrostaticSummationMethod keyword options
1130 <          if (myMethod == "SHIFTED_POTENTIAL") {
1131 <            ljsp_ = true;
1132 <          } else if (myMethod == "SHIFTED_FORCE") {
1133 <            ljsf_ = true;
1134 <          }
1135 <          if (myMethod == "SHIFTED_POTENTIAL" || myMethod == "SHIFTED_FORCE") {
1136 <            if (simParams_->haveSwitchingRadius()){
1137 <              sprintf(painCave.errMsg,
1138 <                      "SimInfo Warning: A value was set for the switchingRadius\n"
1139 <                      "\teven though the electrostaticSummationMethod was\n"
1140 <                      "\tset to %s\n", myMethod.c_str());
1141 <              painCave.isFatal = 1;
1142 <              simError();            
1143 <            }
1144 <          }
1145 <        }
1146 <      
1147 <        if (simParams_->haveSwitchingRadius()){
1148 <          rsw_ = simParams_->getSwitchingRadius();
1149 <        } else {        
1150 <          sprintf(painCave.errMsg,
1151 <                  "SimCreator Warning: No value was set for switchingRadius.\n"
1152 <                  "\tOOPSE will use a default value of\n"
1153 <                  "\t0.85 * cutoffRadius for the switchingRadius\n");
1154 <          painCave.isFatal = 0;
1155 <          simError();
1156 <          rsw_ = 0.85 * rcut_;
1157 <        }
1158 <
1159 <        notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1160 <
1161 <      } else {
1162 <        // We didn't set rcut explicitly, and we don't have electrostatic atoms, so
1163 <        // We'll punt and let fortran figure out the cutoffs later.
1164 <        
1165 <        notifyFortranYouAreOnYourOwn();
1166 <
1167 <      }
1168 <    }
1169 <  }
1170 <
1171 <  void SimInfo::setupElectrostaticSummationMethod( int isError ) {    
1172 <    
1173 <    int errorOut;
1174 <    int esm =  NONE;
1175 <    int sm = UNDAMPED;
1176 <    RealType alphaVal;
1177 <    RealType dielectric;
1178 <    
1179 <    errorOut = isError;
1180 <
1181 <    if (simParams_->haveElectrostaticSummationMethod()) {
1182 <      std::string myMethod = simParams_->getElectrostaticSummationMethod();
1183 <      toUpper(myMethod);
1184 <      if (myMethod == "NONE") {
1185 <        esm = NONE;
1186 <      } else {
1187 <        if (myMethod == "SWITCHING_FUNCTION") {
1188 <          esm = SWITCHING_FUNCTION;
1189 <        } else {
1190 <          if (myMethod == "SHIFTED_POTENTIAL") {
1191 <            esm = SHIFTED_POTENTIAL;
1192 <          } else {
1193 <            if (myMethod == "SHIFTED_FORCE") {            
1194 <              esm = SHIFTED_FORCE;
1195 <            } else {
1196 <              if (myMethod == "REACTION_FIELD") {
1197 <                esm = REACTION_FIELD;
1198 <                dielectric = simParams_->getDielectric();
1199 <                if (!simParams_->haveDielectric()) {
1200 <                  // throw warning
1201 <                  sprintf( painCave.errMsg,
1202 <                           "SimInfo warning: dielectric was not specified in the input file\n\tfor the reaction field correction method.\n"
1203 <                           "\tA default value of %f will be used for the dielectric.\n", dielectric);
1204 <                  painCave.isFatal = 0;
1205 <                  simError();
1206 <                }
1207 <              } else {
1208 <                // throw error        
1209 <                sprintf( painCave.errMsg,
1210 <                         "SimInfo error: Unknown electrostaticSummationMethod.\n"
1211 <                         "\t(Input file specified %s .)\n"
1212 <                         "\telectrostaticSummationMethod must be one of: \"none\",\n"
1213 <                         "\t\"shifted_potential\", \"shifted_force\", or \n"
1214 <                         "\t\"reaction_field\".\n", myMethod.c_str() );
1215 <                painCave.isFatal = 1;
1216 <                simError();
1217 <              }    
1218 <            }          
1219 <          }
1220 <        }
1221 <      }
1222 <    }
1223 <    
1224 <    if (simParams_->haveElectrostaticScreeningMethod()) {
1225 <      std::string myScreen = simParams_->getElectrostaticScreeningMethod();
1226 <      toUpper(myScreen);
1227 <      if (myScreen == "UNDAMPED") {
1228 <        sm = UNDAMPED;
1229 <      } else {
1230 <        if (myScreen == "DAMPED") {
1231 <          sm = DAMPED;
1232 <          if (!simParams_->haveDampingAlpha()) {
1233 <            // first set a cutoff dependent alpha value
1234 <            // we assume alpha depends linearly with rcut from 0 to 20.5 ang
1235 <            alphaVal = 0.5125 - rcut_* 0.025;
1236 <            // for values rcut > 20.5, alpha is zero
1237 <            if (alphaVal < 0) alphaVal = 0;
1238 <
1239 <            // throw warning
1240 <            sprintf( painCave.errMsg,
1241 <                     "SimInfo warning: dampingAlpha was not specified in the input file.\n"
1242 <                     "\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1243 <            painCave.isFatal = 0;
1244 <            simError();
1245 <          } else {
1246 <            alphaVal = simParams_->getDampingAlpha();
1247 <          }
1248 <          
1249 <        } else {
1250 <          // throw error        
1251 <          sprintf( painCave.errMsg,
1252 <                   "SimInfo error: Unknown electrostaticScreeningMethod.\n"
1253 <                   "\t(Input file specified %s .)\n"
1254 <                   "\telectrostaticScreeningMethod must be one of: \"undamped\"\n"
1255 <                   "or \"damped\".\n", myScreen.c_str() );
1256 <          painCave.isFatal = 1;
1257 <          simError();
1258 <        }
1259 <      }
1260 <    }
1261 <    
1262 <    // let's pass some summation method variables to fortran
1263 <    setElectrostaticSummationMethod( &esm );
1264 <    setFortranElectrostaticMethod( &esm );
1265 <    setScreeningMethod( &sm );
1266 <    setDampingAlpha( &alphaVal );
1267 <    setReactionFieldDielectric( &dielectric );
1268 <    initFortranFF( &errorOut );
962 >      
963 >    topologyDone_ = true;
964    }
965  
1271  void SimInfo::setupSwitchingFunction() {    
1272    int ft = CUBIC;
1273
1274    if (simParams_->haveSwitchingFunctionType()) {
1275      std::string funcType = simParams_->getSwitchingFunctionType();
1276      toUpper(funcType);
1277      if (funcType == "CUBIC") {
1278        ft = CUBIC;
1279      } else {
1280        if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1281          ft = FIFTH_ORDER_POLY;
1282        } else {
1283          // throw error        
1284          sprintf( painCave.errMsg,
1285                   "SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1286          painCave.isFatal = 1;
1287          simError();
1288        }          
1289      }
1290    }
1291
1292    // send switching function notification to switcheroo
1293    setFunctionType(&ft);
1294
1295  }
1296
1297  void SimInfo::setupAccumulateBoxDipole() {    
1298
1299    // we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1300    if ( simParams_->haveAccumulateBoxDipole() )
1301      if ( simParams_->getAccumulateBoxDipole() ) {
1302        setAccumulateBoxDipole();
1303        calcBoxDipole_ = true;
1304      }
1305
1306  }
1307
966    void SimInfo::addProperty(GenericData* genData) {
967      properties_.addProperty(genData);  
968    }
969  
970 <  void SimInfo::removeProperty(const std::string& propName) {
970 >  void SimInfo::removeProperty(const string& propName) {
971      properties_.removeProperty(propName);  
972    }
973  
# Line 1317 | Line 975 | namespace oopse {
975      properties_.clearProperties();
976    }
977  
978 <  std::vector<std::string> SimInfo::getPropertyNames() {
978 >  vector<string> SimInfo::getPropertyNames() {
979      return properties_.getPropertyNames();  
980    }
981        
982 <  std::vector<GenericData*> SimInfo::getProperties() {
982 >  vector<GenericData*> SimInfo::getProperties() {
983      return properties_.getProperties();
984    }
985  
986 <  GenericData* SimInfo::getPropertyByName(const std::string& propName) {
986 >  GenericData* SimInfo::getPropertyByName(const string& propName) {
987      return properties_.getPropertyByName(propName);
988    }
989  
# Line 1336 | Line 994 | namespace oopse {
994      delete sman_;
995      sman_ = sman;
996  
1339    Molecule* mol;
1340    RigidBody* rb;
1341    Atom* atom;
997      SimInfo::MoleculeIterator mi;
998 +    Molecule::AtomIterator ai;
999      Molecule::RigidBodyIterator rbIter;
1000 <    Molecule::AtomIterator atomIter;;
1000 >    Molecule::CutoffGroupIterator cgIter;
1001 >    Molecule::BondIterator bondIter;
1002 >    Molecule::BendIterator bendIter;
1003 >    Molecule::TorsionIterator torsionIter;
1004 >    Molecule::InversionIterator inversionIter;
1005  
1006 +    Molecule* mol;
1007 +    Atom* atom;
1008 +    RigidBody* rb;
1009 +    CutoffGroup* cg;
1010 +    Bond* bond;
1011 +    Bend* bend;
1012 +    Torsion* torsion;
1013 +    Inversion* inversion;    
1014 +
1015      for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
1016          
1017 <      for (atom = mol->beginAtom(atomIter); atom != NULL; atom = mol->nextAtom(atomIter)) {
1017 >      for (atom = mol->beginAtom(ai); atom != NULL;
1018 >           atom = mol->nextAtom(ai)) {
1019          atom->setSnapshotManager(sman_);
1020 <      }
1021 <        
1022 <      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
1020 >      }        
1021 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
1022 >           rb = mol->nextRigidBody(rbIter)) {
1023          rb->setSnapshotManager(sman_);
1024        }
1025 <    }    
1026 <    
1025 >      for (cg = mol->beginCutoffGroup(cgIter); cg != NULL;
1026 >           cg = mol->nextCutoffGroup(cgIter)) {
1027 >        cg->setSnapshotManager(sman_);
1028 >      }
1029 >      for (bond = mol->beginBond(bondIter); bond != NULL;
1030 >           bond = mol->nextBond(bondIter)) {
1031 >        bond->setSnapshotManager(sman_);
1032 >      }
1033 >      for (bend = mol->beginBend(bendIter); bend != NULL;
1034 >           bend = mol->nextBend(bendIter)) {
1035 >        bend->setSnapshotManager(sman_);
1036 >      }
1037 >      for (torsion = mol->beginTorsion(torsionIter); torsion != NULL;
1038 >           torsion = mol->nextTorsion(torsionIter)) {
1039 >        torsion->setSnapshotManager(sman_);
1040 >      }
1041 >      for (inversion = mol->beginInversion(inversionIter); inversion != NULL;
1042 >           inversion = mol->nextInversion(inversionIter)) {
1043 >        inversion->setSnapshotManager(sman_);
1044 >      }
1045 >    }
1046    }
1047  
1359  Vector3d SimInfo::getComVel(){
1360    SimInfo::MoleculeIterator i;
1361    Molecule* mol;
1048  
1049 <    Vector3d comVel(0.0);
1364 <    RealType totalMass = 0.0;
1365 <    
1366 <
1367 <    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1368 <      RealType mass = mol->getMass();
1369 <      totalMass += mass;
1370 <      comVel += mass * mol->getComVel();
1371 <    }  
1372 <
1373 < #ifdef IS_MPI
1374 <    RealType tmpMass = totalMass;
1375 <    Vector3d tmpComVel(comVel);    
1376 <    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1377 <    MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1378 < #endif
1379 <
1380 <    comVel /= totalMass;
1381 <
1382 <    return comVel;
1383 <  }
1384 <
1385 <  Vector3d SimInfo::getCom(){
1386 <    SimInfo::MoleculeIterator i;
1387 <    Molecule* mol;
1388 <
1389 <    Vector3d com(0.0);
1390 <    RealType totalMass = 0.0;
1391 <    
1392 <    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1393 <      RealType mass = mol->getMass();
1394 <      totalMass += mass;
1395 <      com += mass * mol->getCom();
1396 <    }  
1397 <
1398 < #ifdef IS_MPI
1399 <    RealType tmpMass = totalMass;
1400 <    Vector3d tmpCom(com);    
1401 <    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1402 <    MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1403 < #endif
1049 >  ostream& operator <<(ostream& o, SimInfo& info) {
1050  
1405    com /= totalMass;
1406
1407    return com;
1408
1409  }        
1410
1411  std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1412
1051      return o;
1052    }
1053    
1054 <  
1417 <   /*
1418 <   Returns center of mass and center of mass velocity in one function call.
1419 <   */
1420 <  
1421 <   void SimInfo::getComAll(Vector3d &com, Vector3d &comVel){
1422 <      SimInfo::MoleculeIterator i;
1423 <      Molecule* mol;
1424 <      
1425 <    
1426 <      RealType totalMass = 0.0;
1427 <    
1428 <
1429 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1430 <         RealType mass = mol->getMass();
1431 <         totalMass += mass;
1432 <         com += mass * mol->getCom();
1433 <         comVel += mass * mol->getComVel();          
1434 <      }  
1435 <      
1436 < #ifdef IS_MPI
1437 <      RealType tmpMass = totalMass;
1438 <      Vector3d tmpCom(com);  
1439 <      Vector3d tmpComVel(comVel);
1440 <      MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1441 <      MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1442 <      MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1443 < #endif
1444 <      
1445 <      com /= totalMass;
1446 <      comVel /= totalMass;
1447 <   }        
1448 <  
1449 <   /*
1450 <   Return intertia tensor for entire system and angular momentum Vector.
1451 <
1452 <
1453 <       [  Ixx -Ixy  -Ixz ]
1454 <  J =| -Iyx  Iyy  -Iyz |
1455 <       [ -Izx -Iyz   Izz ]
1456 <    */
1457 <
1458 <   void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1459 <      
1460 <
1461 <      RealType xx = 0.0;
1462 <      RealType yy = 0.0;
1463 <      RealType zz = 0.0;
1464 <      RealType xy = 0.0;
1465 <      RealType xz = 0.0;
1466 <      RealType yz = 0.0;
1467 <      Vector3d com(0.0);
1468 <      Vector3d comVel(0.0);
1469 <      
1470 <      getComAll(com, comVel);
1471 <      
1472 <      SimInfo::MoleculeIterator i;
1473 <      Molecule* mol;
1474 <      
1475 <      Vector3d thisq(0.0);
1476 <      Vector3d thisv(0.0);
1477 <
1478 <      RealType thisMass = 0.0;
1479 <    
1480 <      
1481 <      
1482 <  
1483 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1484 <        
1485 <         thisq = mol->getCom()-com;
1486 <         thisv = mol->getComVel()-comVel;
1487 <         thisMass = mol->getMass();
1488 <         // Compute moment of intertia coefficients.
1489 <         xx += thisq[0]*thisq[0]*thisMass;
1490 <         yy += thisq[1]*thisq[1]*thisMass;
1491 <         zz += thisq[2]*thisq[2]*thisMass;
1492 <        
1493 <         // compute products of intertia
1494 <         xy += thisq[0]*thisq[1]*thisMass;
1495 <         xz += thisq[0]*thisq[2]*thisMass;
1496 <         yz += thisq[1]*thisq[2]*thisMass;
1497 <            
1498 <         angularMomentum += cross( thisq, thisv ) * thisMass;
1499 <            
1500 <      }  
1501 <      
1502 <      
1503 <      inertiaTensor(0,0) = yy + zz;
1504 <      inertiaTensor(0,1) = -xy;
1505 <      inertiaTensor(0,2) = -xz;
1506 <      inertiaTensor(1,0) = -xy;
1507 <      inertiaTensor(1,1) = xx + zz;
1508 <      inertiaTensor(1,2) = -yz;
1509 <      inertiaTensor(2,0) = -xz;
1510 <      inertiaTensor(2,1) = -yz;
1511 <      inertiaTensor(2,2) = xx + yy;
1512 <      
1513 < #ifdef IS_MPI
1514 <      Mat3x3d tmpI(inertiaTensor);
1515 <      Vector3d tmpAngMom;
1516 <      MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1517 <      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1518 < #endif
1519 <              
1520 <      return;
1521 <   }
1522 <
1523 <   //Returns the angular momentum of the system
1524 <   Vector3d SimInfo::getAngularMomentum(){
1525 <      
1526 <      Vector3d com(0.0);
1527 <      Vector3d comVel(0.0);
1528 <      Vector3d angularMomentum(0.0);
1529 <      
1530 <      getComAll(com,comVel);
1531 <      
1532 <      SimInfo::MoleculeIterator i;
1533 <      Molecule* mol;
1534 <      
1535 <      Vector3d thisr(0.0);
1536 <      Vector3d thisp(0.0);
1537 <      
1538 <      RealType thisMass;
1539 <      
1540 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {        
1541 <        thisMass = mol->getMass();
1542 <        thisr = mol->getCom()-com;
1543 <        thisp = (mol->getComVel()-comVel)*thisMass;
1544 <        
1545 <        angularMomentum += cross( thisr, thisp );
1546 <        
1547 <      }  
1548 <      
1549 < #ifdef IS_MPI
1550 <      Vector3d tmpAngMom;
1551 <      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1552 < #endif
1553 <      
1554 <      return angularMomentum;
1555 <   }
1556 <  
1054 >  
1055    StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1056 <    return IOIndexToIntegrableObject.at(index);
1056 >    if (index >= int(IOIndexToIntegrableObject.size())) {
1057 >      sprintf(painCave.errMsg,
1058 >              "SimInfo::getIOIndexToIntegrableObject Error: Integrable Object\n"
1059 >              "\tindex exceeds number of known objects!\n");
1060 >      painCave.isFatal = 1;
1061 >      simError();
1062 >      return NULL;
1063 >    } else
1064 >      return IOIndexToIntegrableObject.at(index);
1065    }
1066    
1067 <  void SimInfo::setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v) {
1067 >  void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1068      IOIndexToIntegrableObject= v;
1069    }
1070  
1071 <  /* Returns the Volume of the simulation based on a ellipsoid with semi-axes
1072 <     based on the radius of gyration V=4/3*Pi*R_1*R_2*R_3
1073 <     where R_i are related to the principle inertia moments R_i = sqrt(C*I_i/N), this reduces to
1074 <     V = 4/3*Pi*(C/N)^3/2*sqrt(det(I)). See S.E. Baltazar et. al. Comp. Mat. Sci. 37 (2006) 526-536.
1075 <  */
1076 <  void SimInfo::getGyrationalVolume(RealType &volume){
1077 <    Mat3x3d intTensor;
1078 <    RealType det;
1079 <    Vector3d dummyAngMom;
1574 <    RealType sysconstants;
1575 <    RealType geomCnst;
1576 <
1577 <    geomCnst = 3.0/2.0;
1578 <    /* Get the inertial tensor and angular momentum for free*/
1579 <    getInertiaTensor(intTensor,dummyAngMom);
1580 <    
1581 <    det = intTensor.determinant();
1582 <    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1583 <    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det);
1584 <    return;
1071 >  int SimInfo::getNGlobalConstraints() {
1072 >    int nGlobalConstraints;
1073 > #ifdef IS_MPI
1074 >    MPI::COMM_WORLD.Allreduce(&nConstraints_, &nGlobalConstraints, 1,
1075 >                              MPI::INT, MPI::SUM);
1076 > #else
1077 >    nGlobalConstraints =  nConstraints_;
1078 > #endif
1079 >    return nGlobalConstraints;
1080    }
1081  
1082 <  void SimInfo::getGyrationalVolume(RealType &volume, RealType &detI){
1588 <    Mat3x3d intTensor;
1589 <    Vector3d dummyAngMom;
1590 <    RealType sysconstants;
1591 <    RealType geomCnst;
1082 > }//end namespace OpenMD
1083  
1593    geomCnst = 3.0/2.0;
1594    /* Get the inertial tensor and angular momentum for free*/
1595    getInertiaTensor(intTensor,dummyAngMom);
1596    
1597    detI = intTensor.determinant();
1598    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1599    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI);
1600    return;
1601  }
1602 /*
1603   void SimInfo::setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v) {
1604      assert( v.size() == nAtoms_ + nRigidBodies_);
1605      sdByGlobalIndex_ = v;
1606    }
1607
1608    StuntDouble* SimInfo::getStuntDoubleFromGlobalIndex(int index) {
1609      //assert(index < nAtoms_ + nRigidBodies_);
1610      return sdByGlobalIndex_.at(index);
1611    }  
1612 */  
1613 }//end namespace oopse
1614

Comparing trunk/src/brains/SimInfo.cpp (property svn:keywords):
Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
Revision 1953 by gezelter, Thu Dec 5 18:19:26 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines