[ViewVC] Diff of: OpenMD/trunk/src/io/RestReader.cpp

Comparing trunk/src/io/RestReader.cpp (file contents):
Revision 1938 by gezelter, Thu Oct 31 15:32:17 2013 UTC vs.
Revision 1971 by gezelter, Fri Feb 28 13:25:13 2014 UTC

#	Line 68 \| Line 68 \| namespace OpenMD {
68		void RestReader::scanFile(){
69
70		std::streampos prevPos;
71	<	std::streampos currPos;
71	>	std::streampos currPos;
72
73		#ifdef IS_MPI
74
#	Line 95 \| Line 95 \| namespace OpenMD {
95
96		#ifdef IS_MPI
97		}
98	<	MPI::COMM_WORLD.Bcast(&framePos_, 1, MPI::INT, 0);
98	>	MPI_Bcast(&framePos_, 1, MPI_INT, 0, MPI_COMM_WORLD);
99		#endif // is_mpi
100		}
101
#	Line 130 \| Line 130 \| namespace OpenMD {
130		}
131
132		int sendBufferSize = sendBuffer.size();
133	<	MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode);
134	<	MPI::COMM_WORLD.Bcast((void *)sendBuffer.c_str(), sendBufferSize,
135	<	MPI::CHAR, masterNode);
133	>	MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
134	>	MPI_Bcast((void *)sendBuffer.c_str(), sendBufferSize,
135	>	MPI_CHAR, masterNode, MPI_COMM_WORLD);
136
137		sstream.str(sendBuffer);
138		} else {
139		int sendBufferSize;
140	<	MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode);
140	>	MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
141		char * recvBuffer = new char[sendBufferSize+1];
142		assert(recvBuffer);
143		recvBuffer[sendBufferSize] = '\0';
144	<	MPI::COMM_WORLD.Bcast(recvBuffer, sendBufferSize, MPI::CHAR, masterNode);
144	>	MPI_Bcast(recvBuffer, sendBufferSize, MPI_CHAR, masterNode,
145	>	MPI_COMM_WORLD);
146		sstream.str(recvBuffer);
147		delete [] recvBuffer;
148		}

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