--- trunk/OOPSE/libmdtools/InitializeFromFile.cpp	2003/03/28 21:45:03	436
+++ trunk/OOPSE/libmdtools/InitializeFromFile.cpp	2003/04/03 20:21:54	447
@@ -13,14 +13,17 @@
 
 #ifdef IS_MPI
 #include <mpi.h>
-#include <mpi++.h>
 #include "mpiSimulation.hpp"
 #define TAKE_THIS_TAG_CHAR 0
 #define TAKE_THIS_TAG_INT 1
 
-void nodeZeroError( void );
-void anonymousNodeDie( void );
+namespace initFile{
+  void nodeZeroError( void );
+  void anonymousNodeDie( void );
+}
 
+using namespace initFile;
+
 #endif // is_mpi
 
 InitializeFromFile :: InitializeFromFile( char *in_name ){
@@ -150,7 +153,7 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
   int myStatus; // 1 = wakeup & success; 0 = error; -1 = AllDone
   int haveError;
   
-  MPI::Status istatus;
+  MPI_Status istatus;
   int *AtomToProcMap = mpiSim->getAtomToProcMap();
 
   
@@ -224,20 +227,22 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
       else {
        
 	myStatus = 1;
-	MPI::COMM_WORLD.Send(&myStatus, 1, MPI_INT, which_node, 
-                             TAKE_THIS_TAG_INT);
-        MPI::COMM_WORLD.Send(read_buffer, BUFFERSIZE, MPI_CHAR, which_node, 
-                             TAKE_THIS_TAG_CHAR);
-        MPI::COMM_WORLD.Send(&i, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT);
-        MPI::COMM_WORLD.Recv(&myStatus, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT, istatus);
+	MPI_Send(&myStatus, 1, MPI_INT, which_node, 
+		 TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
+        MPI_Send(read_buffer, BUFFERSIZE, MPI_CHAR, which_node, 
+		 TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
+        MPI_Send(&i, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT,
+		 MPI_COMM_WORLD);
+        MPI_Recv(&myStatus, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT, 
+		 MPI_COMM_WORLD, &istatus);
 	
 	if(!myStatus) nodeZeroError();
       }
     }
     myStatus = -1;
     for (j = 0; j < mpiSim->getNumberProcessors(); j++) {      
-      MPI::COMM_WORLD.Send( &myStatus, 1, MPI_INT, j, 
-			    TAKE_THIS_TAG_INT);
+      MPI_Send( &myStatus, 1, MPI_INT, j, 
+		TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
     }
     
   } else {
@@ -245,17 +250,17 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
     done = 0;
     while (!done) {
 
-      MPI::COMM_WORLD.Recv(&myStatus, 1, MPI_INT, 0, 
-			   TAKE_THIS_TAG_INT, istatus);
+      MPI_Recv(&myStatus, 1, MPI_INT, 0, 
+	       TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
       
       if(!myStatus) anonymousNodeDie();
       
       if(myStatus < 0) break;
 
-      MPI::COMM_WORLD.Recv(read_buffer, BUFFERSIZE, MPI_CHAR, 0, 
-                           TAKE_THIS_TAG_CHAR, istatus);
-      MPI::COMM_WORLD.Recv(&which_atom, 1, MPI_INT, 0, 
-			   TAKE_THIS_TAG_INT, istatus);
+      MPI_Recv(read_buffer, BUFFERSIZE, MPI_CHAR, 0, 
+	       TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD, &istatus);
+      MPI_Recv(&which_atom, 1, MPI_INT, 0, 
+	       TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
       
       myStatus = 1;
       parseErr = parseDumpLine( read_buffer, which_atom );
@@ -265,8 +270,8 @@ void InitializeFromFile :: read_xyz( SimInfo* the_entr
 	simError();
       }
       
-      MPI::COMM_WORLD.Send( &myStatus, 1, MPI_INT, 0, 
-			    TAKE_THIS_TAG_INT);
+      MPI_Send( &myStatus, 1, MPI_INT, 0, 
+		TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
       
     }
   }
@@ -506,13 +511,13 @@ char* InitializeFromFile::parseDumpLine(char* readLine
 
 // a couple of functions to let us escape the read loop
 
-void nodeZeroError( void ){
+void initFile::nodeZeroError( void ){
   int j, myStatus;
   
   myStatus = 0;
   for (j = 0; j < mpiSim->getNumberProcessors(); j++) {      
-    MPI::COMM_WORLD.Send( &myStatus, 1, MPI_INT, j, 
-			  TAKE_THIS_TAG_INT);
+    MPI_Send( &myStatus, 1, MPI_INT, j, 
+	      TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
   }  
   
 
@@ -521,7 +526,7 @@ void nodeZeroError( void ){
   
 }
 
-void anonymousNodeDie( void ){
+void initFile::anonymousNodeDie( void ){
 
   MPI_Finalize();
   exit (0);