[ViewVC] Diff of: OpenMD/branches/development/src/brains/Thermo.cpp

Comparing branches/development/src/brains/Thermo.cpp (file contents):
Revision 1797 by gezelter, Wed Aug 29 18:13:11 2012 UTC vs.
Revision 1798 by gezelter, Thu Sep 13 14:10:11 2012 UTC

#	Line 828 \| Line 828 \| namespace OpenMD {
828		data[0] = pos1.x();
829		data[1] = pos1.y();
830		data[2] = pos1.z();
831	<	MPI_Bcast(data, 3, MPI_REALTYPE, proc1, MPI_COMM_WORLD);
831	>	MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc1);
832		} else {
833	<	MPI_Bcast(data, 3, MPI_REALTYPE, proc1, MPI_COMM_WORLD);
833	>	MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc1);
834		pos1 = Vector3d(data);
835		}
836
#	Line 839 \| Line 839 \| namespace OpenMD {
839		pos2 = sd2->getPos();
840		data[0] = pos2.x();
841		data[1] = pos2.y();
842	<	data[2] = pos2.z();
843	<	MPI_Bcast(data, 3, MPI_REALTYPE, proc2, MPI_COMM_WORLD);
842	>	data[2] = pos2.z();
843	>	MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc2);
844		} else {
845	<	MPI_Bcast(data, 3, MPI_REALTYPE, proc2, MPI_COMM_WORLD);
845	>	MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc2);
846		pos2 = Vector3d(data);
847		}
848		#else

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