# | 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 58 | Line 59 | |
59 | #include "utils/simError.h" | |
60 | #include "selection/SelectionManager.hpp" | |
61 | #include "io/ForceFieldOptions.hpp" | |
62 | < | #include "UseTheForce/ForceField.hpp" |
62 | > | #include "brains/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 68 | Line 72 | namespace OpenMD { | |
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), |
75 | > | nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0), nGlobalFluctuatingCharges_(0), |
76 | nAtoms_(0), nBonds_(0), nBends_(0), nTorsions_(0), nInversions_(0), | |
77 | nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0), | |
78 | < | nConstraints_(0), sman_(NULL), topologyDone_(false), |
78 | > | nConstraints_(0), nFluctuatingCharges_(0), sman_(NULL), topologyDone_(false), |
79 | calcBoxDipole_(false), useAtomicVirial_(true) { | |
80 | ||
81 | MoleculeStamp* molStamp; | |
# | Line 221 | Line 225 | namespace OpenMD { | |
225 | ||
226 | ||
227 | void SimInfo::calcNdf() { | |
228 | < | int ndf_local; |
228 | > | int ndf_local, nfq_local; |
229 | MoleculeIterator i; | |
230 | vector<StuntDouble*>::iterator j; | |
231 | + | vector<Atom*>::iterator k; |
232 | + | |
233 | Molecule* mol; | |
234 | StuntDouble* integrableObject; | |
235 | + | Atom* atom; |
236 | ||
237 | ndf_local = 0; | |
238 | + | nfq_local = 0; |
239 | ||
240 | for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) { | |
241 | for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL; | |
# | Line 242 | Line 250 | namespace OpenMD { | |
250 | ndf_local += 3; | |
251 | } | |
252 | } | |
253 | < | |
253 | > | } |
254 | > | for (atom = mol->beginFluctuatingCharge(k); atom != NULL; |
255 | > | atom = mol->nextFluctuatingCharge(k)) { |
256 | > | if (atom->isFluctuatingCharge()) { |
257 | > | nfq_local++; |
258 | > | } |
259 | } | |
260 | } | |
261 | ||
262 | + | ndfLocal_ = ndf_local; |
263 | + | |
264 | // n_constraints is local, so subtract them on each processor | |
265 | ndf_local -= nConstraints_; | |
266 | ||
267 | #ifdef IS_MPI | |
268 | MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); | |
269 | + | MPI_Allreduce(&nfq_local,&nGlobalFluctuatingCharges_,1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); |
270 | #else | |
271 | ndf_ = ndf_local; | |
272 | + | nGlobalFluctuatingCharges_ = nfq_local; |
273 | #endif | |
274 | ||
275 | // nZconstraints_ is global, as are the 3 COM translations for the | |
# | Line 694 | Line 711 | namespace OpenMD { | |
711 | Atom* atom; | |
712 | set<AtomType*> atomTypes; | |
713 | ||
714 | < | for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) { |
715 | < | for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) { |
714 | > | for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) { |
715 | > | for(atom = mol->beginAtom(ai); atom != NULL; |
716 | > | atom = mol->nextAtom(ai)) { |
717 | atomTypes.insert(atom->getAtomType()); | |
718 | } | |
719 | } | |
720 | < | |
720 | > | |
721 | #ifdef IS_MPI | |
722 | ||
723 | // loop over the found atom types on this processor, and add their | |
724 | // numerical idents to a vector: | |
725 | < | |
725 | > | |
726 | vector<int> foundTypes; | |
727 | set<AtomType*>::iterator i; | |
728 | for (i = atomTypes.begin(); i != atomTypes.end(); ++i) | |
# | Line 713 | Line 731 | namespace OpenMD { | |
731 | // count_local holds the number of found types on this processor | |
732 | int count_local = foundTypes.size(); | |
733 | ||
734 | < | // 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); |
734 | > | int nproc = MPI::COMM_WORLD.Get_size(); |
735 | ||
736 | < | // create a vector to hold the globally found types, and resize it: |
737 | < | vector<int> ftGlobal; |
738 | < | ftGlobal.resize(count); |
739 | < | vector<int> counts; |
736 | > | // we need arrays to hold the counts and displacement vectors for |
737 | > | // all processors |
738 | > | vector<int> counts(nproc, 0); |
739 | > | vector<int> disps(nproc, 0); |
740 | ||
741 | < | int nproc = MPI::COMM_WORLD.Get_size(); |
742 | < | counts.resize(nproc); |
743 | < | vector<int> disps; |
744 | < | disps.resize(nproc); |
741 | > | // fill the counts array |
742 | > | MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0], |
743 | > | 1, MPI::INT); |
744 | > | |
745 | > | // use the processor counts to compute the displacement array |
746 | > | disps[0] = 0; |
747 | > | int totalCount = counts[0]; |
748 | > | for (int iproc = 1; iproc < nproc; iproc++) { |
749 | > | disps[iproc] = disps[iproc-1] + counts[iproc-1]; |
750 | > | totalCount += counts[iproc]; |
751 | > | } |
752 | ||
753 | < | // now spray out the foundTypes to all the other processors: |
753 | > | // we need a (possibly redundant) set of all found types: |
754 | > | vector<int> ftGlobal(totalCount); |
755 | ||
756 | + | // now spray out the foundTypes to all the other processors: |
757 | MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT, | |
758 | < | &ftGlobal[0], &counts[0], &disps[0], MPI::INT); |
758 | > | &ftGlobal[0], &counts[0], &disps[0], |
759 | > | MPI::INT); |
760 | ||
761 | + | vector<int>::iterator j; |
762 | + | |
763 | // foundIdents is a stl set, so inserting an already found ident | |
764 | // will have no effect. | |
765 | set<int> foundIdents; | |
766 | < | vector<int>::iterator j; |
766 | > | |
767 | for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j) | |
768 | foundIdents.insert((*j)); | |
769 | ||
770 | // now iterate over the foundIdents and get the actual atom types | |
771 | // that correspond to these: | |
772 | set<int>::iterator it; | |
773 | < | for (it = foundIdents.begin(); it != foundIdents.end(); ++it) |
773 | > | for (it = foundIdents.begin(); it != foundIdents.end(); ++it) |
774 | atomTypes.insert( forceField_->getAtomType((*it)) ); | |
775 | ||
776 | #endif | |
777 | < | |
777 | > | |
778 | return atomTypes; | |
779 | } | |
780 | ||
# | Line 766 | Line 793 | namespace OpenMD { | |
793 | int usesElectrostatic = 0; | |
794 | int usesMetallic = 0; | |
795 | int usesDirectional = 0; | |
796 | + | int usesFluctuatingCharges = 0; |
797 | //loop over all of the atom types | |
798 | for (i = atomTypes.begin(); i != atomTypes.end(); ++i) { | |
799 | usesElectrostatic |= (*i)->isElectrostatic(); | |
800 | usesMetallic |= (*i)->isMetal(); | |
801 | usesDirectional |= (*i)->isDirectional(); | |
802 | + | usesFluctuatingCharges |= (*i)->isFluctuatingCharge(); |
803 | } | |
804 | ||
805 | #ifdef IS_MPI | |
# | Line 783 | Line 812 | namespace OpenMD { | |
812 | ||
813 | temp = usesElectrostatic; | |
814 | MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD); | |
815 | + | |
816 | + | temp = usesFluctuatingCharges; |
817 | + | MPI_Allreduce(&temp, &usesFluctuatingCharges_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD); |
818 | #else | |
819 | ||
820 | usesDirectionalAtoms_ = usesDirectional; | |
821 | usesMetallicAtoms_ = usesMetallic; | |
822 | usesElectrostaticAtoms_ = usesElectrostatic; | |
823 | + | usesFluctuatingCharges_ = usesFluctuatingCharges; |
824 | ||
825 | #endif | |
826 | ||
# | Line 1180 | Line 1213 | namespace OpenMD { | |
1213 | ||
1214 | det = intTensor.determinant(); | |
1215 | sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_; | |
1216 | < | volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det); |
1216 | > | volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,geomCnst)*sqrt(det); |
1217 | return; | |
1218 | } | |
1219 | ||
# | Line 1196 | Line 1229 | namespace OpenMD { | |
1229 | ||
1230 | detI = intTensor.determinant(); | |
1231 | sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_; | |
1232 | < | volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI); |
1232 | > | volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,geomCnst)*sqrt(detI); |
1233 | return; | |
1234 | } | |
1235 | /* |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |