[ViewVC] Diff of: OpenMD/trunk/src/selection/DistanceFinder.cpp

Comparing trunk/src/selection/DistanceFinder.cpp (file contents):
Revision 1968 by gezelter, Thu Dec 5 18:19:26 2013 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC

#	Line 120 \| Line 120 \| namespace OpenMD {
120		int mol;
121		int proc;
122		RealType data[3];
123	<	int worldRank = MPI::COMM_WORLD.Get_rank();
123	>	int worldRank;
124	>	MPI_Comm_rank( MPI_COMM_WORLD, &worldRank);
125		#endif
126
127		for (unsigned int j = 0; j < stuntdoubles_.size(); ++j) {
#	Line 151 \| Line 152 \| namespace OpenMD {
152		data[0] = centerPos.x();
153		data[1] = centerPos.y();
154		data[2] = centerPos.z();
155	<	MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc);
155	>	MPI_Bcast(data, 3, MPI_REALTYPE, proc, MPI_COMM_WORLD);
156		} else {
157	<	MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc);
157	>	MPI_Bcast(data, 3, MPI_REALTYPE, proc, MPI_COMM_WORLD);
158		centerPos = Vector3d(data);
159		}
160		#else
#	Line 229 \| Line 230 \| namespace OpenMD {
230		int mol;
231		int proc;
232		RealType data[3];
233	<	int worldRank = MPI::COMM_WORLD.Get_rank();
233	>	int worldRank;
234	>	MPI_Comm_rank( MPI_COMM_WORLD, &worldRank);
235		#endif
236
237		for (unsigned int j = 0; j < stuntdoubles_.size(); ++j) {
#	Line 260 \| Line 262 \| namespace OpenMD {
262		data[0] = centerPos.x();
263		data[1] = centerPos.y();
264		data[2] = centerPos.z();
265	<	MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc);
265	>	MPI_Bcast(data, 3, MPI_REALTYPE, proc, MPI_COMM_WORLD);
266		} else {
267	<	MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc);
267	>	MPI_Bcast(data, 3, MPI_REALTYPE, proc, MPI_COMM_WORLD);
268		centerPos = Vector3d(data);
269		}
270		#else

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