--- trunk/OOPSE/libmdtools/DumpReader.cpp	2004/04/22 03:29:30	1129
+++ trunk/OOPSE/libmdtools/DumpReader.cpp	2004/06/07 14:26:33	1252
@@ -84,16 +84,11 @@ void DumpReader::scanFile( void ){
 
 void DumpReader::scanFile( void ){
 
-  int vectorSize;
-  int i, j, k;
+  int i, j;
   int lineNum = 0;
   char readBuffer[2000];
-  char* foo;
   fpos_t *currPos;
-  double time;
 
-
-
 #ifdef IS_MPI
   if( worldRank == 0 ){
 #endif // is_mpi
@@ -176,7 +171,8 @@ void DumpReader :: readSet( int whichFrame ){
 
 void DumpReader :: readSet( int whichFrame ){
 
-   int i, j;
+  int i;
+  unsigned int j;
 
 #ifdef IS_MPI
   int done, which_node, which_atom; // loop counter
@@ -327,7 +323,7 @@ void DumpReader :: readSet( int whichFrame ){
       simError();
     }
 
-    for (i=0 ; i < mpiSim->getTotNmol(); i++) {
+    for (i=0 ; i < mpiSim->getNMolGlobal(); i++) {
       which_node = MolToProcMap[i];
       if(which_node == 0){
        //molecules belong to master node
@@ -368,7 +364,7 @@ void DumpReader :: readSet( int whichFrame ){
         MPI_Recv(&nCurObj, 1, MPI_INT, which_node,
 	       TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
       
-       for(j=0; j < integrableObjects.size(); j++){
+       for(j=0; j < nCurObj; j++){
         
           eof_test = fgets(read_buffer, sizeof(read_buffer), inFile);
           if(eof_test == NULL){
@@ -405,7 +401,7 @@ void DumpReader :: readSet( int whichFrame ){
       simError();
     }
   
-    for (i=0 ; i < mpiSim->getTotNmol(); i++) {
+    for (i=0 ; i < mpiSim->getNMolGlobal(); i++) {
       which_node = MolToProcMap[i];
       
       if(which_node == worldRank){
@@ -744,7 +740,7 @@ void DumpReader::nodeZeroError( void ){
   int j, myStatus;
 
   myStatus = 0;
-  for (j = 0; j < mpiSim->getNumberProcessors(); j++) {
+  for (j = 0; j < mpiSim->getNProcessors(); j++) {
     MPI_Send( &myStatus, 1, MPI_INT, j,
 	      TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
   }
@@ -760,4 +756,4 @@ void DumpReader::anonymousNodeDie( void ){
   MPI_Finalize();
   exit (0);
 }
-#endif
\ No newline at end of file
+#endif