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 |
|
/** |
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 { |
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) |
718 |
|
// count_local holds the number of found types on this processor |
719 |
|
int count_local = foundTypes.size(); |
720 |
|
|
721 |
< |
// 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); |
721 |
> |
int nproc = MPI::COMM_WORLD.Get_size(); |
722 |
|
|
723 |
< |
// create a vector to hold the globally found types, and resize it: |
724 |
< |
vector<int> ftGlobal; |
725 |
< |
ftGlobal.resize(count); |
726 |
< |
vector<int> counts; |
727 |
< |
|
728 |
< |
int nproc = MPI::COMM_WORLD.Get_size(); |
729 |
< |
counts.resize(nproc); |
730 |
< |
vector<int> disps; |
731 |
< |
disps.resize(nproc); |
732 |
< |
|
733 |
< |
// now spray out the foundTypes to all the other processors: |
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 |
> |
// 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 |
|
|
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 |
|
|
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 |
|
/* |