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

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1769 by gezelter, Mon Jul 9 14:15:52 2012 UTC vs.
Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC

# Line 35 | Line 35
35   *                                                                      
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
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   */
# Line 88 | Line 88 | namespace OpenMD {
88      
89      vector<Component*> components = simParams->getComponents();
90      
91 <    for (vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
91 >    for (vector<Component*>::iterator i = components.begin();
92 >         i !=components.end(); ++i) {
93        molStamp = (*i)->getMoleculeStamp();
94        nMolWithSameStamp = (*i)->getNMol();
95        
# Line 267 | Line 268 | namespace OpenMD {
268      ndf_local -= nConstraints_;
269  
270   #ifdef IS_MPI
271 <    MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
272 <    MPI_Allreduce(&nfq_local,&nGlobalFluctuatingCharges_,1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
271 >    MPI::COMM_WORLD.Allreduce(&ndf_local, &ndf_, 1, MPI::INT,MPI::SUM);
272 >    MPI::COMM_WORLD.Allreduce(&nfq_local, &nGlobalFluctuatingCharges_, 1,
273 >                              MPI::INT, MPI::SUM);
274   #else
275      ndf_ = ndf_local;
276      nGlobalFluctuatingCharges_ = nfq_local;
# Line 282 | Line 284 | namespace OpenMD {
284  
285    int SimInfo::getFdf() {
286   #ifdef IS_MPI
287 <    MPI_Allreduce(&fdf_local,&fdf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
287 >    MPI::COMM_WORLD.Allreduce(&fdf_local, &fdf_, 1, MPI::INT, MPI::SUM);
288   #else
289      fdf_ = fdf_local;
290   #endif
# Line 338 | Line 340 | namespace OpenMD {
340      }
341      
342   #ifdef IS_MPI
343 <    MPI_Allreduce(&ndfRaw_local,&ndfRaw_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
343 >    MPI::COMM_WORLD.Allreduce(&ndfRaw_local, &ndfRaw_, 1, MPI::INT, MPI::SUM);
344   #else
345      ndfRaw_ = ndfRaw_local;
346   #endif
# Line 351 | Line 353 | namespace OpenMD {
353  
354  
355   #ifdef IS_MPI
356 <    MPI_Allreduce(&ndfTrans_local,&ndfTrans_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
356 >    MPI::COMM_WORLD.Allreduce(&ndfTrans_local, &ndfTrans_, 1,
357 >                              MPI::INT, MPI::SUM);
358   #else
359      ndfTrans_ = ndfTrans_local;
360   #endif
# Line 779 | Line 782 | namespace OpenMD {
782      return atomTypes;        
783    }
784  
785 +
786 +  int getGlobalCountOfType(AtomType* atype) {
787 +    /*
788 +    set<AtomType*> atypes = getSimulatedAtomTypes();
789 +    map<AtomType*, int> counts_;
790 +
791 +    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
792 +      for(atom = mol->beginAtom(ai); atom != NULL;
793 +          atom = mol->nextAtom(ai)) {
794 +        atom->getAtomType();
795 +      }      
796 +    }    
797 +    */
798 +    return 0;
799 +  }
800 +
801    void SimInfo::setupSimVariables() {
802      useAtomicVirial_ = simParams_->getUseAtomicVirial();
803 <    // we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
803 >    // we only call setAccumulateBoxDipole if the accumulateBoxDipole
804 >    // parameter is true
805      calcBoxDipole_ = false;
806      if ( simParams_->haveAccumulateBoxDipole() )
807        if ( simParams_->getAccumulateBoxDipole() ) {
# Line 875 | Line 895 | namespace OpenMD {
895  
896  
897    void SimInfo::prepareTopology() {
878 –    int nExclude, nOneTwo, nOneThree, nOneFour;
898  
899      //calculate mass ratio of cutoff group
900      SimInfo::MoleculeIterator mi;
# Line 924 | Line 943 | namespace OpenMD {
943      
944      //scan topology
945  
927 –    nExclude = excludedInteractions_.getSize();
928 –    nOneTwo = oneTwoInteractions_.getSize();
929 –    nOneThree = oneThreeInteractions_.getSize();
930 –    nOneFour = oneFourInteractions_.getSize();
931 –
946      int* excludeList = excludedInteractions_.getPairList();
947      int* oneTwoList = oneTwoInteractions_.getPairList();
948      int* oneThreeList = oneThreeInteractions_.getPairList();
# Line 979 | Line 993 | namespace OpenMD {
993  
994      for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
995          
996 <      for (atom = mol->beginAtom(atomIter); atom != NULL; atom = mol->nextAtom(atomIter)) {
996 >      for (atom = mol->beginAtom(atomIter); atom != NULL;
997 >           atom = mol->nextAtom(atomIter)) {
998          atom->setSnapshotManager(sman_);
999        }
1000          
1001 <      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
1001 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
1002 >           rb = mol->nextRigidBody(rbIter)) {
1003          rb->setSnapshotManager(sman_);
1004        }
1005  
1006 <      for (cg = mol->beginCutoffGroup(cgIter); cg != NULL; cg = mol->nextCutoffGroup(cgIter)) {
1006 >      for (cg = mol->beginCutoffGroup(cgIter); cg != NULL;
1007 >           cg = mol->nextCutoffGroup(cgIter)) {
1008          cg->setSnapshotManager(sman_);
1009        }
1010      }    
# Line 1002 | Line 1019 | namespace OpenMD {
1019    
1020    
1021    StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1022 <    return IOIndexToIntegrableObject.at(index);
1022 >    if (index >= int(IOIndexToIntegrableObject.size())) {
1023 >      sprintf(painCave.errMsg,
1024 >              "SimInfo::getIOIndexToIntegrableObject Error: Integrable Object\n"
1025 >              "\tindex exceeds number of known objects!\n");
1026 >      painCave.isFatal = 1;
1027 >      simError();
1028 >      return NULL;
1029 >    } else
1030 >      return IOIndexToIntegrableObject.at(index);
1031    }
1032    
1033    void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1034      IOIndexToIntegrableObject= v;
1035    }
1011 – /*
1012 –   void SimInfo::setStuntDoubleFromGlobalIndex(vector<StuntDouble*> v) {
1013 –      assert( v.size() == nAtoms_ + nRigidBodies_);
1014 –      sdByGlobalIndex_ = v;
1015 –    }
1036  
1017 –    StuntDouble* SimInfo::getStuntDoubleFromGlobalIndex(int index) {
1018 –      //assert(index < nAtoms_ + nRigidBodies_);
1019 –      return sdByGlobalIndex_.at(index);
1020 –    }  
1021 – */  
1037    int SimInfo::getNGlobalConstraints() {
1038      int nGlobalConstraints;
1039   #ifdef IS_MPI
1040 <    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
1041 <                  MPI_COMM_WORLD);    
1040 >    MPI::COMM_WORLD.Allreduce(&nConstraints_, &nGlobalConstraints, 1,
1041 >                              MPI::INT, MPI::SUM);
1042   #else
1043      nGlobalConstraints =  nConstraints_;
1044   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines