--- trunk/mdtools/md_code/InitializeFromFile.cpp	2003/01/30 20:03:37	254
+++ trunk/mdtools/md_code/InitializeFromFile.cpp	2003/01/31 21:04:27	260
@@ -13,6 +13,8 @@
 
 #ifdef IS_MPI
 #include "mpiSimulation.hpp"
+
+#define TAKE_THIS_TAG 0
 #endif // is_mpi
 
 InitializeFromFile :: InitializeFromFile( char *in_name ){
@@ -213,17 +215,17 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
 	 procIndex++){
     if (worldRank == 0) {
 
-      mpiErr = MPI_Recv(&nodeAtomsStart,1,MPI_INT,procIndex,MPI_ANY_TAG,MPI_COMM_WORLD,
+      mpiErr = MPI_Recv(&nodeAtomsStart,1,MPI_INT,procIndex,TAKE_THIS_TAG,MPI_COMM_WORLD,
 	       istatus);
 
-      mpiErr = MPI_Recv(&nodeAtomsEnd,1,MPI_INT,procIndex,MPI_ANY_TAG,MPI_COMM_WORLD,
+      mpiErr = MPI_Recv(&nodeAtomsEnd,1,MPI_INT,procIndex,TAKE_THIS_TAG,MPI_COMM_WORLD,
 	       istatus);
       // Make sure where node 0 is reading from, 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,MPI_COMM_WORLD);
+	mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,TAKE_THIS_TAG,MPI_COMM_WORLD);
 	sprintf(painCave.errMsg,
 		"Initialize from file error: atoms start index (%d) for "
 		"node %d not equal to master index (%d)",nodeAtomsStart,procIndex,masterIndex );
@@ -231,14 +233,14 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
 	simError();
       }
       sendError = 0;
-      mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,MPI_ANY_TAG,MPI_COMM_WORLD);
+      mpiErr = MPI_Send(&sendError,1,MPI_INT,procIndex,TAKE_THIS_TAG,MPI_COMM_WORLD);
       
       for ( i = nodeAtomsStart; i <= nodeAtomsEnd; i++){
 	eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
 	if(eof_test == NULL){
 	  
 	  sprintf(read_buffer,"ERROR");
-	  mpiErr = MPI_Send(read_buffer,BUFFERSIZE,MPI_CHAR,procIndex,MPI_ANY_TAG,MPI_COMM_WORLD);
+	  mpiErr = MPI_Send(read_buffer,BUFFERSIZE,MPI_CHAR,procIndex,TAKE_THIS_TAG,MPI_COMM_WORLD);
 	  
 	  sprintf(painCave.errMsg,
 		  "error in reading file %s\n"
@@ -249,8 +251,8 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
 	  simError();
 	}
 	
-	mpiErr = MPI_Send(read_buffer,BUFFERSIZE,MPI_CHAR,procIndex,MPI_ANY_TAG,MPI_COMM_WORLD);
-	mpiErr = MPI_Recv(&sendError,1,MPI_INT,procIndex,MPI_ANY_TAG,MPI_COMM_WORLD,
+	mpiErr = MPI_Send(read_buffer,BUFFERSIZE,MPI_CHAR,procIndex,TAKE_THIS_TAG,MPI_COMM_WORLD);
+	mpiErr = MPI_Recv(&sendError,1,MPI_INT,procIndex,TAKE_THIS_TAG,MPI_COMM_WORLD,
 			  istatus);
 	if (sendError) MPIcheckPoint();
 
@@ -262,16 +264,16 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
     else if(worldRank == procIndex){
       nodeAtomsStart = mpiSim->getMyAtomStart();
       nodeAtomsEnd = mpiSim->getMyAtomEnd();
-      mpiErr = MPI_Send(&nodeAtomsStart,1,MPI_INT,0,MPI_ANY_TAG,MPI_COMM_WORLD);
-      mpiErr = MPI_Send(&nodeAtomsEnd,1,MPI_INT,0,MPI_ANY_TAG,MPI_COMM_WORLD);
+      mpiErr = MPI_Send(&nodeAtomsStart,1,MPI_INT,0,TAKE_THIS_TAG,MPI_COMM_WORLD);
+      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,MPI_COMM_WORLD,
+      mpiErr = MPI_Recv(&sendError,1,MPI_INT,0,TAKE_THIS_TAG,MPI_COMM_WORLD,
 	       istatus);
       if (sendError) MPIcheckPoint();
 
       for ( i = 0; i < entry_plug->n_atoms; i++){
 
-	mpiErr = MPI_Recv(&read_buffer,BUFFERSIZE,MPI_CHAR,0,MPI_ANY_TAG,MPI_COMM_WORLD,
+	mpiErr = MPI_Recv(&read_buffer,BUFFERSIZE,MPI_CHAR,0,TAKE_THIS_TAG,MPI_COMM_WORLD,
 			  istatus);
 	
 	if(!strcmp(read_buffer, "ERROR")) MPIcheckPoint();
@@ -279,7 +281,7 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
 	parseErr = parseDumpLine( read_buffer, i );
 	if( parseErr != NULL ){
 	  sendError = 1;
-	  mpiErr = MPI_Send(&sendError,1,MPI_INT,0,MPI_ANY_TAG,MPI_COMM_WORLD);
+	  mpiErr = MPI_Send(&sendError,1,MPI_INT,0,TAKE_THIS_TAG,MPI_COMM_WORLD);
 
 
 	  strcpy( painCave.errMsg, parseErr );
@@ -287,7 +289,7 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
 	  simError();
 	}
 	sendError = 0;
-	mpiErr = MPI_Send(&sendError,1,MPI_INT,0,MPI_ANY_TAG,MPI_COMM_WORLD);
+	mpiErr = MPI_Send(&sendError,1,MPI_INT,0,TAKE_THIS_TAG,MPI_COMM_WORLD);
       }
     }
     sprintf(checkPointMsg,"Node %d received initial configuration.",procIndex);