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

Comparing trunk/src/io/DumpReader.cpp (file contents):
Revision 1790 by gezelter, Thu Aug 30 17:18:22 2012 UTC vs.
Revision 1796 by gezelter, Mon Sep 10 18:38:44 2012 UTC

#	Line 141 \| Line 141 \| namespace OpenMD {
141		prevPos = currPos;
142		bool foundOpenSnapshotTag = false;
143		bool foundClosedSnapshotTag = false;
144	<	bool foundOpenSiteDataTag = false;
144	>
145		while(inFile_->getline(buffer, bufferSize)) {
146		++lineNo;
147
#	Line 202 \| Line 202 \| namespace OpenMD {
202		#ifdef IS_MPI
203		}
204
205	<	MPI_Bcast(&nframes_, 1, MPI_INT, 0, MPI_COMM_WORLD);
205	>	MPI::COMM_WORLD.Bcast(&nframes_, 1, MPI::INT, 0);
206
207		#endif // is_mpi
208
#	Line 286 \| Line 286 \| namespace OpenMD {
286		}
287
288		int sendBufferSize = sendBuffer.size();
289	<	MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
290	<	MPI_Bcast((void *)sendBuffer.c_str(), sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
289	>	MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode);
290	>	MPI::COMM_WORLD.Bcast((void *)sendBuffer.c_str(), sendBufferSize,
291	>	MPI::CHAR, masterNode);
292
293		sstream.str(sendBuffer);
294		} else {
295		int sendBufferSize;
296	<	MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
296	>	MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode);
297		char * recvBuffer = new char[sendBufferSize+1];
298		assert(recvBuffer);
299		recvBuffer[sendBufferSize] = '\0';
300	<	MPI_Bcast(recvBuffer, sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
300	>	MPI::COMM_WORLD.Bcast(recvBuffer, sendBufferSize, MPI::CHAR, masterNode);
301		sstream.str(recvBuffer);
302		delete [] recvBuffer;
303		}

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