--- trunk/OOPSE/libmdtools/DumpWriter.cpp	2004/01/10 02:15:35	919
+++ trunk/OOPSE/libmdtools/DumpWriter.cpp	2004/01/12 22:54:42	927
@@ -160,13 +160,12 @@ void DumpWriter::writeDump( double currentTime ){
 
 #else // is_mpi
 
-  cout << "master" <<endl;
   /* code to find maximum tag value */
   
-  int tagub, flag, MAXTAG;
+  int *tagub, flag, MAXTAG;
   MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
   if (flag) {
-    MAXTAG = tagub;
+    MAXTAG = *tagub;
   } else {
     MAXTAG = 32767;
   }  
@@ -229,12 +228,13 @@ void DumpWriter::writeDump( double currentTime ){
         MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
 		 myPotato, MPI_COMM_WORLD, &istatus);
         
-        strncpy(atomTypeString, MPIatomTypeString, MINIBUFFERSIZE);
+        //strncpy(atomTypeString, MPIatomTypeString, MINIBUFFERSIZE);
         
         // Null terminate the atomTypeString just in case:
 
-        atomTypeString[strlen(atomTypeString) - 1] = '\0';
-
+        //atomTypeString[strlen(atomTypeString) - 1] = '\0';
+        atomTypeString = MPIatomTypeString;
+	
         myPotato++;
 
         MPI_Recv(&isDirectional, 1, MPI_INT, which_node,
@@ -310,50 +310,51 @@ void DumpWriter::writeDump( double currentTime ){
         
 	if(haveError) DieDieDie();
         
-        // If we've survived to here, format the line:
-        
-        if (!isDirectional) {
-
-          sprintf( tempBuffer,
-                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
-                   atomTypeString,
-                   atomData6[0],
-                   atomData6[1],
-                   atomData6[2],
-                   atomData6[3],
-                   atomData6[4],
-                   atomData6[5]);
-          
-          strcpy( writeLine, tempBuffer );
-          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
-
-        } else {
-          
-          sprintf( tempBuffer,
-                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
-                   atomTypeString,
-                   atomData13[0],
-                   atomData13[1],
-                   atomData13[2],
-                   atomData13[3],
-                   atomData13[4],
-                   atomData13[5],
-                   atomData13[6],
-                   atomData13[7],
-                   atomData13[8],
-                   atomData13[9],
-                   atomData13[10],
-                   atomData13[11],
-                   atomData13[12]);
-          
-          strcat( writeLine, tempBuffer );
-          
-        }
+      }
+      // If we've survived to here, format the line:
+      
+      if (!isDirectional) {
+	
+	sprintf( tempBuffer,
+		 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
+		 atomTypeString,
+		 atomData6[0],
+		 atomData6[1],
+		 atomData6[2],
+		 atomData6[3],
+		 atomData6[4],
+		 atomData6[5]);
+	
+	strcpy( writeLine, tempBuffer );
+	strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
+	
+      } else {
+	
+	sprintf( tempBuffer,
+		 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
+		 atomTypeString,
+		 atomData13[0],
+		 atomData13[1],
+		 atomData13[2],
+		 atomData13[3],
+		 atomData13[4],
+		 atomData13[5],
+		 atomData13[6],
+		 atomData13[7],
+		 atomData13[8],
+		 atomData13[9],
+		 atomData13[10],
+		 atomData13[11],
+		 atomData13[12]);
+	
+	strcpy( writeLine, tempBuffer );
         
-        outFile << writeLine;
-        outFile.flush();
       }
+      
+      outFile << writeLine;
+      outFile.flush();
     }
+    
 
     outFile.flush();
     sprintf( checkPointMsg,
@@ -661,12 +662,8 @@ void DumpWriter::writeFinal(double finalTime){
         MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
 		 myPotato, MPI_COMM_WORLD, &istatus);
         
-        strncpy(atomTypeString, MPIatomTypeString, MINIBUFFERSIZE);
-        
-        // Null terminate the atomTypeString just in case:
-
-        atomTypeString[strlen(atomTypeString) - 1] = '\0';
-
+        atomTypeString = MPIatomTypeString;
+                
         myPotato++;
 
         MPI_Recv(&isDirectional, 1, MPI_INT, which_node,
@@ -742,56 +739,58 @@ void DumpWriter::writeFinal(double finalTime){
         
 	if(haveError) DieDieDie();
         
-        // If we've survived to here, format the line:
-        
-        if (!isDirectional) {
+      }
 
-          sprintf( tempBuffer,
-                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
-                   atomTypeString,
-                   atomData6[0],
-                   atomData6[1],
-                   atomData6[2],
-                   atomData6[3],
-                   atomData6[4],
-                   atomData6[5]);
-          
-          strcpy( writeLine, tempBuffer );
-          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
 
-        } else {
-          
-          sprintf( tempBuffer,
-                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
-                   atomTypeString,
-                   atomData13[0],
-                   atomData13[1],
-                   atomData13[2],
-                   atomData13[3],
-                   atomData13[4],
-                   atomData13[5],
-                   atomData13[6],
-                   atomData13[7],
-                   atomData13[8],
-                   atomData13[9],
-                   atomData13[10],
-                   atomData13[11],
-                   atomData13[12]);
-          
-          strcat( writeLine, tempBuffer );
-          
-        }
+      // If we've survived to here, format the line:
+      
+      if (!isDirectional) {
+	
+	sprintf( tempBuffer,
+		 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
+		 atomTypeString,
+		 atomData6[0],
+		 atomData6[1],
+		 atomData6[2],
+		 atomData6[3],
+		 atomData6[4],
+		 atomData6[5]);
+	
+	strcpy( writeLine, tempBuffer );
+	strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
+	
+      } else {
+	
+	sprintf( tempBuffer,
+		 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
+		 atomTypeString,
+		 atomData13[0],
+		 atomData13[1],
+		 atomData13[2],
+		 atomData13[3],
+		 atomData13[4],
+		 atomData13[5],
+		 atomData13[6],
+		 atomData13[7],
+		 atomData13[8],
+		 atomData13[9],
+		 atomData13[10],
+		 atomData13[11],
+		 atomData13[12]);
+	
+	strcpy( writeLine, tempBuffer );
         
-        finalOut << writeLine;
-        finalOut.flush();
       }
+        
+      finalOut << writeLine;
+      finalOut.flush();
     }
-
+  
     finalOut.flush();
     sprintf( checkPointMsg,
              "Sucessfully took a dump.\n");
     delete[] potatoes;
-       
+    
     MPIcheckPoint();        
     
   } else {