ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/parallel/ForceDecomposition.cpp
(Generate patch)

Comparing trunk/src/parallel/ForceDecomposition.cpp (file contents):
Revision 1929 by gezelter, Mon Aug 19 13:12:00 2013 UTC vs.
Revision 1971 by gezelter, Fri Feb 28 13:25:13 2014 UTC

# Line 39 | Line 39
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42 < #include "parallel/ForceDecomposition.hpp"
43 < #include "math/Vector3.hpp"
42 >
43   #ifdef IS_MPI
44   #include <mpi.h>
45   #endif
46  
47 + #include "parallel/ForceDecomposition.hpp"
48 + #include "math/Vector3.hpp"
49 +
50   using namespace std;
51   namespace OpenMD {
52  
# Line 98 | Line 100 | namespace OpenMD {
100  
101    void ForceDecomposition::fillSelfData(SelfData &sdat, int atom1) {
102  
103 <    sdat.atype = atypesLocal[atom1];
103 >    //sdat.atype = atypesLocal[atom1];
104      sdat.atid = idents[atom1];
105  
106      sdat.pot = &embeddingPot;
# Line 166 | Line 168 | namespace OpenMD {
168      }
169  
170   #ifdef IS_MPI
171 <    MPI::COMM_WORLD.Allreduce(&dispmax, &dispmax, 1, MPI::REALTYPE, MPI::MAX);
171 >    MPI_Allreduce(MPI_IN_PLACE, &dispmax, 1, MPI_REALTYPE, MPI_MAX,
172 >                  MPI_COMM_WORLD);
173   #endif
174  
175      // a conservative test of list skin crossings

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines