--- branches/development/src/brains/SimInfo.cpp 2011/07/08 20:25:32 1587 +++ branches/development/src/brains/SimInfo.cpp 2012/06/07 12:53:46 1750 @@ -36,7 +36,8 @@ * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). - * [4] Vardeman & Gezelter, in progress (2009). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ /** @@ -58,8 +59,11 @@ #include "utils/simError.h" #include "selection/SelectionManager.hpp" #include "io/ForceFieldOptions.hpp" -#include "UseTheForce/ForceField.hpp" +#include "brains/ForceField.hpp" #include "nonbonded/SwitchingFunction.hpp" +#ifdef IS_MPI +#include +#endif using namespace std; namespace OpenMD { @@ -68,10 +72,10 @@ namespace OpenMD { forceField_(ff), simParams_(simParams), ndf_(0), fdf_local(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0), nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0), - nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0), + nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0), nGlobalFluctuatingCharges_(0), nAtoms_(0), nBonds_(0), nBends_(0), nTorsions_(0), nInversions_(0), nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0), - nConstraints_(0), sman_(NULL), topologyDone_(false), + nConstraints_(0), nFluctuatingCharges_(0), sman_(NULL), topologyDone_(false), calcBoxDipole_(false), useAtomicVirial_(true) { MoleculeStamp* molStamp; @@ -221,13 +225,17 @@ namespace OpenMD { void SimInfo::calcNdf() { - int ndf_local; + int ndf_local, nfq_local; MoleculeIterator i; vector::iterator j; + vector::iterator k; + Molecule* mol; StuntDouble* integrableObject; + Atom* atom; ndf_local = 0; + nfq_local = 0; for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) { for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL; @@ -242,17 +250,26 @@ namespace OpenMD { ndf_local += 3; } } - + } + for (atom = mol->beginFluctuatingCharge(k); atom != NULL; + atom = mol->nextFluctuatingCharge(k)) { + if (atom->isFluctuatingCharge()) { + nfq_local++; + } } } + ndfLocal_ = ndf_local; + // n_constraints is local, so subtract them on each processor ndf_local -= nConstraints_; #ifdef IS_MPI MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); + MPI_Allreduce(&nfq_local,&nGlobalFluctuatingCharges_,1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); #else ndf_ = ndf_local; + nGlobalFluctuatingCharges_ = nfq_local; #endif // nZconstraints_ is global, as are the 3 COM translations for the @@ -694,17 +711,18 @@ namespace OpenMD { Atom* atom; set atomTypes; - for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) { - for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) { + for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) { + for(atom = mol->beginAtom(ai); atom != NULL; + atom = mol->nextAtom(ai)) { atomTypes.insert(atom->getAtomType()); } } - + #ifdef IS_MPI // loop over the found atom types on this processor, and add their // numerical idents to a vector: - + vector foundTypes; set::iterator i; for (i = atomTypes.begin(); i != atomTypes.end(); ++i) @@ -713,41 +731,50 @@ namespace OpenMD { // count_local holds the number of found types on this processor int count_local = foundTypes.size(); - // count holds the total number of found types on all processors - // (some will be redundant with the ones found locally): - int count; - MPI::COMM_WORLD.Allreduce(&count_local, &count, 1, MPI::INT, MPI::SUM); + int nproc = MPI::COMM_WORLD.Get_size(); - // create a vector to hold the globally found types, and resize it: - vector ftGlobal; - ftGlobal.resize(count); - vector counts; + // we need arrays to hold the counts and displacement vectors for + // all processors + vector counts(nproc, 0); + vector disps(nproc, 0); - int nproc = MPI::COMM_WORLD.Get_size(); - counts.resize(nproc); - vector disps; - disps.resize(nproc); + // fill the counts array + MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0], + 1, MPI::INT); + + // use the processor counts to compute the displacement array + disps[0] = 0; + int totalCount = counts[0]; + for (int iproc = 1; iproc < nproc; iproc++) { + disps[iproc] = disps[iproc-1] + counts[iproc-1]; + totalCount += counts[iproc]; + } - // now spray out the foundTypes to all the other processors: + // we need a (possibly redundant) set of all found types: + vector ftGlobal(totalCount); + // now spray out the foundTypes to all the other processors: MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT, - &ftGlobal[0], &counts[0], &disps[0], MPI::INT); + &ftGlobal[0], &counts[0], &disps[0], + MPI::INT); + vector::iterator j; + // foundIdents is a stl set, so inserting an already found ident // will have no effect. set foundIdents; - vector::iterator j; + for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j) foundIdents.insert((*j)); // now iterate over the foundIdents and get the actual atom types // that correspond to these: set::iterator it; - for (it = foundIdents.begin(); it != foundIdents.end(); ++it) + for (it = foundIdents.begin(); it != foundIdents.end(); ++it) atomTypes.insert( forceField_->getAtomType((*it)) ); #endif - + return atomTypes; } @@ -766,11 +793,13 @@ namespace OpenMD { int usesElectrostatic = 0; int usesMetallic = 0; int usesDirectional = 0; + int usesFluctuatingCharges = 0; //loop over all of the atom types for (i = atomTypes.begin(); i != atomTypes.end(); ++i) { usesElectrostatic |= (*i)->isElectrostatic(); usesMetallic |= (*i)->isMetal(); usesDirectional |= (*i)->isDirectional(); + usesFluctuatingCharges |= (*i)->isFluctuatingCharge(); } #ifdef IS_MPI @@ -783,11 +812,15 @@ namespace OpenMD { temp = usesElectrostatic; MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD); + + temp = usesFluctuatingCharges; + MPI_Allreduce(&temp, &usesFluctuatingCharges_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD); #else usesDirectionalAtoms_ = usesDirectional; usesMetallicAtoms_ = usesMetallic; usesElectrostaticAtoms_ = usesElectrostatic; + usesFluctuatingCharges_ = usesFluctuatingCharges; #endif @@ -1180,7 +1213,7 @@ namespace OpenMD { det = intTensor.determinant(); sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_; - volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det); + volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,geomCnst)*sqrt(det); return; } @@ -1196,7 +1229,7 @@ namespace OpenMD { detI = intTensor.determinant(); sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_; - volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI); + volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,geomCnst)*sqrt(detI); return; } /*