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

Comparing trunk/src/brains/Thermo.cpp (file contents):
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 UTC vs.
Revision 1796 by gezelter, Mon Sep 10 18:38:44 2012 UTC

# Line 444 | Line 444 | namespace OpenMD {
444      RealType kinetic;
445      RealType potential;
446      RealType eatom;
447 –    RealType AvgE_a_ = 0;
447      // Convective portion of the heat flux
448      Vector3d heatFluxJc = V3Zero;
449  
# Line 832 | Line 831 | namespace OpenMD {
831            data[0] = pos1.x();
832            data[1] = pos1.y();
833            data[2] = pos1.z();          
834 <          MPI_Bcast(data, 3, MPI_REALTYPE, proc1, MPI_COMM_WORLD);
834 >          MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc1);
835          } else {
836 <          MPI_Bcast(data, 3, MPI_REALTYPE, proc1, MPI_COMM_WORLD);
836 >          MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc1);
837            pos1 = Vector3d(data);
838          }
839  
# Line 843 | Line 842 | namespace OpenMD {
842            pos2 = sd2->getPos();
843            data[0] = pos2.x();
844            data[1] = pos2.y();
845 <          data[2] = pos2.z();          
846 <          MPI_Bcast(data, 3, MPI_REALTYPE, proc2, MPI_COMM_WORLD);
845 >          data[2] = pos2.z();  
846 >          MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc2);
847          } else {
848 <          MPI_Bcast(data, 3, MPI_REALTYPE, proc2, MPI_COMM_WORLD);
848 >          MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc2);
849            pos2 = Vector3d(data);
850          }
851   #else

Diff Legend

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