ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/Thermo.cpp
(Generate patch)

Comparing trunk/src/brains/Thermo.cpp (file contents):
Revision 1291 by gezelter, Thu Sep 11 19:40:59 2008 UTC vs.
Revision 1292 by chuckv, Fri Sep 12 20:51:22 2008 UTC

# Line 250 | Line 250 | namespace oopse {
250  
251   #ifdef IS_MPI        
252  
253 <        mol1 = info_.globalMolMembership_[tap.first];
254 <        mol2 = info_.globalMolMembership_[tap.second];
253 >        int mol1 = info_->getGlobalMolMembership(tap.first);
254 >        int mol2 = info_->getGlobalMolMembership(tap.second);
255          
256          int proc1 = info_->getMolToProc(mol1);
257          int proc2 = info_->getMolToProc(mol2);
258  
259 +        RealType data[3];
260          if (proc1 == worldRank) {
260          RealType data[3];
261            StuntDouble* sd1 = info_->getIOIndexToIntegrableObject(tap.first);
262            pos1 = sd1->getPos();
263            data[0] = pos1.x();
# Line 268 | Line 268 | namespace oopse {
268            MPI_Bcast(data, 3, MPI_REALTYPE, proc1, MPI_COMM_WORLD);
269            pos1 = Vector3d(data);
270          }
271 <          
271 >
272 >
273          if (proc2 == worldRank) {
273          RealType data[3];
274            StuntDouble* sd2 = info_->getIOIndexToIntegrableObject(tap.second);
275            pos2 = sd2->getPos();
276            data[0] = pos2.x();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines