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

Comparing trunk/src/restraints/RestraintForceManager.cpp (file contents):
Revision 1938 by gezelter, Thu Oct 31 15:32:17 2013 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC

# Line 136 | Line 136 | namespace OpenMD {
136            // this proc doesn't have the molecule.  Do a quick check to
137            // make sure another processor is supposed to have it.
138          
139 <          int myrank = MPI::COMM_WORLD.Get_rank();
139 >          int myrank;
140 >          MPI_Comm_rank( MPI_COMM_WORLD, &myrank);
141 >
142            if (info_->getMolToProc(molIndex) == myrank) {
143          
144              // If we were supposed to have it but got a null, then freak out.
# Line 158 | Line 160 | namespace OpenMD {
160   #ifdef IS_MPI
161          // only handle this molecular restraint if this processor owns the
162          // molecule
163 <        int myrank = MPI::COMM_WORLD.Get_rank();
163 >        int myrank;
164 >        MPI_Comm_rank( MPI_COMM_WORLD, &myrank);
165          if (info_->getMolToProc(molIndex) == myrank) {
166  
167   #endif
# Line 315 | Line 318 | namespace OpenMD {
318      restPot_local = doRestraints(1.0);
319  
320   #ifdef IS_MPI    
321 <    MPI::COMM_WORLD.Allreduce(&restPot_local, &restPot, 1,
322 <                              MPI::REALTYPE, MPI::SUM);
321 >    MPI_Allreduce(&restPot_local, &restPot, 1,
322 >                  MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
323   #else
324      restPot = restPot_local;
325   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines