--- branches/development/src/io/DumpReader.cpp 2012/09/06 19:44:06 1794 +++ branches/development/src/io/DumpReader.cpp 2013/01/09 19:27:52 1825 @@ -141,7 +141,7 @@ namespace OpenMD { prevPos = currPos; bool foundOpenSnapshotTag = false; bool foundClosedSnapshotTag = false; - bool foundOpenSiteDataTag = false; + while(inFile_->getline(buffer, bufferSize)) { ++lineNo; @@ -202,7 +202,7 @@ namespace OpenMD { #ifdef IS_MPI } - MPI_Bcast(&nframes_, 1, MPI_INT, 0, MPI_COMM_WORLD); + MPI::COMM_WORLD.Bcast(&nframes_, 1, MPI::INT, 0); #endif // is_mpi @@ -288,17 +288,18 @@ namespace OpenMD { } int sendBufferSize = sendBuffer.size(); - MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD); - MPI_Bcast((void *)sendBuffer.c_str(), sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD); + MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode); + MPI::COMM_WORLD.Bcast((void *)sendBuffer.c_str(), sendBufferSize, + MPI::CHAR, masterNode); sstream.str(sendBuffer); } else { int sendBufferSize; - MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD); + MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode); char * recvBuffer = new char[sendBufferSize+1]; assert(recvBuffer); recvBuffer[sendBufferSize] = '\0'; - MPI_Bcast(recvBuffer, sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD); + MPI::COMM_WORLD.Bcast(recvBuffer, sendBufferSize, MPI::CHAR, masterNode); sstream.str(recvBuffer); delete [] recvBuffer; }