--- branches/development/src/io/DumpReader.cpp	2012/07/09 14:15:52	1769
+++ branches/development/src/io/DumpReader.cpp	2012/09/13 14:10:11	1798
@@ -75,7 +75,8 @@ namespace OpenMD { 
     if (worldRank == 0) { 
 #endif 
       
-      inFile_ = new std::ifstream(filename_.c_str()); 
+      inFile_ = new std::ifstream(filename_.c_str(),   
+                                  ifstream::in | ifstream::binary); 
       
       if (inFile_->fail()) { 
 	sprintf(painCave.errMsg, 
@@ -201,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 
     
@@ -226,7 +227,9 @@ namespace OpenMD { 
       needVel_ = false; 
     } 
      
-    if (storageLayout & DataStorage::dslAmat || storageLayout & DataStorage::dslElectroFrame) { 
+    if (storageLayout & DataStorage::dslAmat || 
+        storageLayout & DataStorage::dslDipole || 
+        storageLayout & DataStorage::dslQuadrupole) { 
       needQuaternion_ = true; 
     } else { 
       needQuaternion_ = false; 
@@ -285,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;
     }