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 1577 by gezelter, Wed Jun 8 20:26:56 2011 UTC vs.
Revision 1668 by gezelter, Fri Jan 6 19:03:05 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
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 60 | Line 61
61   #include "io/ForceFieldOptions.hpp"
62   #include "UseTheForce/ForceField.hpp"
63   #include "nonbonded/SwitchingFunction.hpp"
64 + #ifdef IS_MPI
65 + #include <mpi.h>
66 + #endif
67  
68   using namespace std;
69   namespace OpenMD {
# Line 694 | Line 698 | namespace OpenMD {
698      Atom* atom;
699      set<AtomType*> atomTypes;
700      
701 <    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {      
702 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
701 >    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
702 >      for(atom = mol->beginAtom(ai); atom != NULL;
703 >          atom = mol->nextAtom(ai)) {
704          atomTypes.insert(atom->getAtomType());
705        }      
706      }    
707 <
707 >    
708   #ifdef IS_MPI
709  
710      // loop over the found atom types on this processor, and add their
711      // numerical idents to a vector:
712 <
712 >    
713      vector<int> foundTypes;
714      set<AtomType*>::iterator i;
715      for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
# Line 713 | Line 718 | namespace OpenMD {
718      // count_local holds the number of found types on this processor
719      int count_local = foundTypes.size();
720  
716    // count holds the total number of found types on all processors
717    // (some will be redundant with the ones found locally):
718    int count;
719    MPI::COMM_WORLD.Allreduce(&count_local, &count, 1, MPI::INT, MPI::SUM);
720
721    // create a vector to hold the globally found types, and resize it:
722    vector<int> ftGlobal;
723    ftGlobal.resize(count);
724    vector<int> counts;
725
721      int nproc = MPI::COMM_WORLD.Get_size();
722 <    counts.resize(nproc);
723 <    vector<int> disps;
724 <    disps.resize(nproc);
722 >
723 >    // we need arrays to hold the counts and displacement vectors for
724 >    // all processors
725 >    vector<int> counts(nproc, 0);
726 >    vector<int> disps(nproc, 0);
727  
728 <    // now spray out the foundTypes to all the other processors:
728 >    // fill the counts array
729 >    MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0],
730 >                              1, MPI::INT);
731 >  
732 >    // use the processor counts to compute the displacement array
733 >    disps[0] = 0;    
734 >    int totalCount = counts[0];
735 >    for (int iproc = 1; iproc < nproc; iproc++) {
736 >      disps[iproc] = disps[iproc-1] + counts[iproc-1];
737 >      totalCount += counts[iproc];
738 >    }
739 >
740 >    // we need a (possibly redundant) set of all found types:
741 >    vector<int> ftGlobal(totalCount);
742      
743 +    // now spray out the foundTypes to all the other processors:    
744      MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
745 <                               &ftGlobal[0], &counts[0], &disps[0], MPI::INT);
745 >                               &ftGlobal[0], &counts[0], &disps[0],
746 >                               MPI::INT);
747  
748 +    vector<int>::iterator j;
749 +
750      // foundIdents is a stl set, so inserting an already found ident
751      // will have no effect.
752      set<int> foundIdents;
753 <    vector<int>::iterator j;
753 >
754      for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
755        foundIdents.insert((*j));
756      
757      // now iterate over the foundIdents and get the actual atom types
758      // that correspond to these:
759      set<int>::iterator it;
760 <    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
760 >    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
761        atomTypes.insert( forceField_->getAtomType((*it)) );
762  
763   #endif
764 <    
764 >
765      return atomTypes;        
766    }
767  
# Line 759 | Line 773 | namespace OpenMD {
773        if ( simParams_->getAccumulateBoxDipole() ) {
774          calcBoxDipole_ = true;      
775        }
776 <
776 >    
777      set<AtomType*>::iterator i;
778      set<AtomType*> atomTypes;
779      atomTypes = getSimulatedAtomTypes();    
# Line 772 | Line 786 | namespace OpenMD {
786        usesMetallic |= (*i)->isMetal();
787        usesDirectional |= (*i)->isDirectional();
788      }
789 <
789 >    
790   #ifdef IS_MPI    
791      int temp;
792      temp = usesDirectional;
793      MPI_Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
794 <
794 >    
795      temp = usesMetallic;
796      MPI_Allreduce(&temp, &usesMetallicAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
797 <
797 >    
798      temp = usesElectrostatic;
799      MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
800 + #else
801 +
802 +    usesDirectionalAtoms_ = usesDirectional;
803 +    usesMetallicAtoms_ = usesMetallic;
804 +    usesElectrostaticAtoms_ = usesElectrostatic;
805 +
806   #endif
807 +    
808 +    requiresPrepair_ = usesMetallicAtoms_ ? true : false;
809 +    requiresSkipCorrection_ = usesElectrostaticAtoms_ ? true : false;
810 +    requiresSelfCorrection_ = usesElectrostaticAtoms_ ? true : false;    
811    }
812  
813  
# Line 838 | Line 862 | namespace OpenMD {
862      Atom* atom;
863      RealType totalMass;
864  
865 <    //to avoid memory reallocation, reserve enough space for massFactors_
865 >    /**
866 >     * The mass factor is the relative mass of an atom to the total
867 >     * mass of the cutoff group it belongs to.  By default, all atoms
868 >     * are their own cutoff groups, and therefore have mass factors of
869 >     * 1.  We need some special handling for massless atoms, which
870 >     * will be treated as carrying the entire mass of the cutoff
871 >     * group.
872 >     */
873      massFactors_.clear();
874 <    massFactors_.reserve(getNCutoffGroups());
874 >    massFactors_.resize(getNAtoms(), 1.0);
875      
876      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
877        for (cg = mol->beginCutoffGroup(ci); cg != NULL;
# Line 849 | Line 880 | namespace OpenMD {
880          totalMass = cg->getMass();
881          for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
882            // Check for massless groups - set mfact to 1 if true
883 <          if (totalMass != 0)
884 <            massFactors_.push_back(atom->getMass()/totalMass);
883 >          if (totalMass != 0)
884 >            massFactors_[atom->getLocalIndex()] = atom->getMass()/totalMass;
885            else
886 <            massFactors_.push_back( 1.0 );
886 >            massFactors_[atom->getLocalIndex()] = 1.0;
887          }
888        }      
889      }
# Line 879 | Line 910 | namespace OpenMD {
910      int* oneThreeList = oneThreeInteractions_.getPairList();
911      int* oneFourList = oneFourInteractions_.getPairList();
912  
882    //setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray_[0],
883    //               &nExclude, excludeList,
884    //               &nOneTwo, oneTwoList,
885    //               &nOneThree, oneThreeList,
886    //               &nOneFour, oneFourList,
887    //               &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
888    //               &fortranGlobalGroupMembership[0], &isError);
889    
913      topologyDone_ = true;
914    }
915  
# Line 1171 | Line 1194 | namespace OpenMD {
1194      
1195      det = intTensor.determinant();
1196      sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1197 <    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det);
1197 >    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,geomCnst)*sqrt(det);
1198      return;
1199    }
1200  
# Line 1187 | Line 1210 | namespace OpenMD {
1210      
1211      detI = intTensor.determinant();
1212      sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1213 <    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI);
1213 >    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,geomCnst)*sqrt(detI);
1214      return;
1215    }
1216   /*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines