--- trunk/mdtools/md_code/DumpWriter.cpp	2003/01/30 20:03:37	254
+++ trunk/mdtools/md_code/DumpWriter.cpp	2003/02/03 21:15:59	261
@@ -5,6 +5,7 @@
 #ifdef IS_MPI
 #include <mpi.h>
 #include "mpiSimulation.hpp"
+#define TAKE_THIS_TAG 0
 #endif //is_mpi
 
 #include "ReadWrite.hpp"
@@ -16,16 +17,16 @@ DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
 
 DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
 
+  entry_plug = the_entry_plug;
+
 #ifdef IS_MPI
   if(worldRank == 0 ){
 #endif // is_mpi
     
-    entry_plug = the_entry_plug;
+ 
     
     strcpy( outName, entry_plug->sampleName );
     
-    std::cerr << "Opening " << outName << " for dumping.\n";
-
     outFile.open(outName, ios::out | ios::trunc );
     
     if( !outFile ){
@@ -41,6 +42,10 @@ DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
 
 #ifdef IS_MPI
   }
+
+  sprintf( checkPointMsg,
+	   "Sucessfully opened output file for dumping.\n");
+  MPIcheckPoint();
 #endif // is_mpi
 }
 
@@ -60,7 +65,7 @@ void DumpWriter::writeDump( double currentTime ){
 void DumpWriter::writeDump( double currentTime ){
   
   const int BUFFERSIZE = 2000;
-  char tempBuffer[500];
+  char tempBuffer[BUFFERSIZE];
   char writeLine[BUFFERSIZE];
 
   int i;
@@ -81,6 +86,7 @@ void DumpWriter::writeDump( double currentTime ){
     
   for( i=0; i<nAtoms; i++ ){
       
+
     sprintf( tempBuffer,
 	     "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
 	     atoms[i]->getType(),
@@ -175,24 +181,28 @@ void DumpWriter::writeDump( double currentTime ){
     }
     outFile.flush();
   }
+
+  sprintf( checkPointMsg,
+	   "Sucessfully wrote node 0's dump configuration.\n");
+  MPIcheckPoint();
     
   for (procIndex = 1; procIndex < mpiSim->getNumberProcessors();
        procIndex++){
 
     if( worldRank == 0 ){
-	
+      
       mpiErr = MPI_Recv(&nodeAtomsStart,1,MPI_INT,procIndex,
-			MPI_ANY_TAG,MPI_COMM_WORLD,istatus);
-
+			TAKE_THIS_TAG,MPI_COMM_WORLD,istatus);
+      
       mpiErr = MPI_Recv(&nodeAtomsEnd,1,MPI_INT,procIndex,
-			MPI_ANY_TAG,MPI_COMM_WORLD, istatus);
-	
+			TAKE_THIS_TAG,MPI_COMM_WORLD, istatus);
+      
       // Make sure where node 0 is writing to, matches where the
       // receiving node expects it to be.
-	
+      
       if (masterIndex != nodeAtomsStart){
 	sendError = 1;
-	mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,MPI_ANY_TAG,
+	mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,TAKE_THIS_TAG,
 			  MPI_COMM_WORLD);
 	sprintf(painCave.errMsg,
 		"DumpWriter error: atoms start index (%d) for "
@@ -201,18 +211,18 @@ void DumpWriter::writeDump( double currentTime ){
 	painCave.isFatal = 1;
 	simError();
       }
-	
+      
       sendError = 0;
-      mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,MPI_ANY_TAG,
+      mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,TAKE_THIS_TAG,
 			MPI_COMM_WORLD);
-
+      
       // recieve the nodes writeLines
-
+      
       for ( i = nodeAtomsStart; i <= nodeAtomsEnd; i++){
-	  
+	
 	mpiErr = MPI_Recv(writeLine,BUFFERSIZE,MPI_CHAR,procIndex,
-			  MPI_ANY_TAG,MPI_COMM_WORLD,istatus );
-
+			  TAKE_THIS_TAG,MPI_COMM_WORLD,istatus );
+	
 	outFile << writeLine;
 	masterIndex++;
       }
@@ -222,20 +232,22 @@ void DumpWriter::writeDump( double currentTime ){
 
       nodeAtomsStart = mpiSim->getMyAtomStart();
       nodeAtomsEnd = mpiSim->getMyAtomEnd();
-	
-      mpiErr = MPI_Send(&nodeAtomsStart,1,MPI_INT,0,MPI_ANY_TAG,
+
+      mpiErr = MPI_Send(&nodeAtomsStart,1,MPI_INT,0,TAKE_THIS_TAG,
 			MPI_COMM_WORLD);
-      mpiErr = MPI_Send(&nodeAtomsEnd,1,MPI_INT,0,MPI_ANY_TAG,
+      mpiErr = MPI_Send(&nodeAtomsEnd,1,MPI_INT,0,TAKE_THIS_TAG,
 			MPI_COMM_WORLD);
 	
-      mpiErr = MPI_Recv(&sendError,1,MPI_INT,0,MPI_ANY_TAG,
+      sendError = -1;
+      mpiErr = MPI_Recv(&sendError,1,MPI_INT,0,TAKE_THIS_TAG,
 			MPI_COMM_WORLD, istatus);
+
       if (sendError) MPIcheckPoint();
 
       // send current node's configuration line by line.
 
       for( i=0; i<nAtoms; i++ ){
-	  
+
 	sprintf( tempBuffer,
 		 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
 		 atoms[i]->getType(),
@@ -244,7 +256,7 @@ void DumpWriter::writeDump( double currentTime ){
 		 atoms[i]->getZ(),
 		 atoms[i]->get_vx(),
 		 atoms[i]->get_vy(),
-		 atoms[i]->get_vz());
+		 atoms[i]->get_vz()); // check here.
 	strcpy( writeLine, tempBuffer );
 	  
 	if( atoms[i]->isDirectional() ){
@@ -266,7 +278,7 @@ void DumpWriter::writeDump( double currentTime ){
 	else
 	  strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
 	  
-	mpiErr = MPI_Send(writeLine,BUFFERSIZE,MPI_CHAR,0,MPI_ANY_TAG,
+	mpiErr = MPI_Send(writeLine,BUFFERSIZE,MPI_CHAR,0,TAKE_THIS_TAG,
 			  MPI_COMM_WORLD);
       }
     }
@@ -391,6 +403,7 @@ void DumpWriter::writeFinal(){
 	     << entry_plug->box_z << "\n";
     
     masterIndex = 0;
+    
     for( i=0; i<nAtoms; i++ ){
       
       sprintf( tempBuffer,
@@ -423,7 +436,7 @@ void DumpWriter::writeFinal(){
       else
 	strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
 	
-      outFile << writeLine;
+      finalOut << writeLine;
       masterIndex++;
     }
     finalOut.flush();
@@ -435,17 +448,17 @@ void DumpWriter::writeFinal(){
     if( worldRank == 0 ){
 	
       mpiErr = MPI_Recv(&nodeAtomsStart,1,MPI_INT,procIndex,
-			MPI_ANY_TAG,MPI_COMM_WORLD,istatus);
+			TAKE_THIS_TAG,MPI_COMM_WORLD,istatus);
 
       mpiErr = MPI_Recv(&nodeAtomsEnd,1,MPI_INT,procIndex,
-			MPI_ANY_TAG,MPI_COMM_WORLD, istatus);
+			TAKE_THIS_TAG,MPI_COMM_WORLD, istatus);
 	
       // Make sure where node 0 is writing to, matches where the
       // receiving node expects it to be.
 	
       if (masterIndex != nodeAtomsStart){
 	sendError = 1;
-	mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,MPI_ANY_TAG,
+	mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,TAKE_THIS_TAG,
 			  MPI_COMM_WORLD);
 	sprintf(painCave.errMsg,
 		"DumpWriter error: atoms start index (%d) for "
@@ -456,7 +469,7 @@ void DumpWriter::writeFinal(){
       }
 	
       sendError = 0;
-      mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,MPI_ANY_TAG,
+      mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,TAKE_THIS_TAG,
 			MPI_COMM_WORLD);
 
       // recieve the nodes writeLines
@@ -464,7 +477,7 @@ void DumpWriter::writeFinal(){
       for ( i = nodeAtomsStart; i <= nodeAtomsEnd; i++){
 	  
 	mpiErr = MPI_Recv(writeLine,BUFFERSIZE,MPI_CHAR,procIndex,
-			  MPI_ANY_TAG,MPI_COMM_WORLD,istatus );
+			  TAKE_THIS_TAG,MPI_COMM_WORLD,istatus );
 
 	finalOut << writeLine;
 	masterIndex++;
@@ -478,12 +491,12 @@ void DumpWriter::writeFinal(){
       nodeAtomsStart = mpiSim->getMyAtomStart();
       nodeAtomsEnd = mpiSim->getMyAtomEnd();
 	
-      mpiErr = MPI_Send(&nodeAtomsStart,1,MPI_INT,0,MPI_ANY_TAG,
+      mpiErr = MPI_Send(&nodeAtomsStart,1,MPI_INT,0,TAKE_THIS_TAG,
 			MPI_COMM_WORLD);
-      mpiErr = MPI_Send(&nodeAtomsEnd,1,MPI_INT,0,MPI_ANY_TAG,
+      mpiErr = MPI_Send(&nodeAtomsEnd,1,MPI_INT,0,TAKE_THIS_TAG,
 			MPI_COMM_WORLD);
 	
-      mpiErr = MPI_Recv(&sendError,1,MPI_INT,0,MPI_ANY_TAG,
+      mpiErr = MPI_Recv(&sendError,1,MPI_INT,0,TAKE_THIS_TAG,
 			MPI_COMM_WORLD, istatus);
       if (sendError) MPIcheckPoint();
 
@@ -521,7 +534,7 @@ void DumpWriter::writeFinal(){
 	else
 	  strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
 	  
-	mpiErr = MPI_Send(writeLine,BUFFERSIZE,MPI_CHAR,0,MPI_ANY_TAG,
+	mpiErr = MPI_Send(writeLine,BUFFERSIZE,MPI_CHAR,0,TAKE_THIS_TAG,
 			  MPI_COMM_WORLD);
       }
     }