Removed mpi.h from o815 header.

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 3fe43c8193d675fb0ec54c234193782ed4056dcb..cc72a149b5073edeea5a0f8498a73b7d18ab8373 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -3,6 +3,8 @@
 #include <sstream>
 #include <iomanip>
 
 #include <sstream>
 #include <iomanip>
 

+#include <mpi.h>
+

 #include "latlib/progress.h"
 
 using namespace std;
 #include "latlib/progress.h"
 
 using namespace std;


@@ -114,7 +116,7 @@ void o815::postParaInit() {
       MPI_Send(&timestamp, 1, MPI_LONG, idest, 123, MPI_COMM_WORLD);
   }
   else if(rank>0)
       MPI_Send(&timestamp, 1, MPI_LONG, idest, 123, MPI_COMM_WORLD);
   }
   else if(rank>0)

-    MPI_Recv(&timestamp, 1, MPI_LONG, 0, 123, MPI_COMM_WORLD, &mpiStatus);
+    MPI_Recv(&timestamp, 1, MPI_LONG, 0, 123, MPI_COMM_WORLD, MPI_STATUS_IGNORE);

   
   out = new writeout(comargs.outdir, programid+headMaster(), rank, numprocs, timestamp);
 }
   
   out = new writeout(comargs.outdir, programid+headMaster(), rank, numprocs, timestamp);
 }

diff --git a/o815/o815.h b/o815/o815.h
index b3ad62a79a7a0f81812ddcd6837960f9d2c28ffb..4f741a1e093283e3d1ca5010d58b0cf901bedb29 100644 (file)
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -3,7 +3,6 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <mpi.h>

 #include <stdlib.h>
 #include <getopt.h>
 
 #include <stdlib.h>
 #include <getopt.h>
 


@@ -92,7 +91,6 @@ class o815 {
 
 private:
   vector<comoption> comOptions;
 
 private:
   vector<comoption> comOptions;

-  MPI_Status mpiStatus;

   int numprocs, rank;
   static void listArg(int *target, int tlen, char *listarg);
   void parseArgs(int argc, char **argv, comoption specOps[]);
   int numprocs, rank;
   static void listArg(int *target, int tlen, char *listarg);
   void parseArgs(int argc, char **argv, comoption specOps[]);

diff --git a/o815/obs.cpp b/o815/obs.cpp
index ae973401eec82cde4eb9cef70fd0445cd0e2729f..d9e25321c6e267e393f43366d0b95f4697d2c56e 100644 (file)
--- a/o815/obs.cpp
+++ b/o815/obs.cpp
@@ -2,6 +2,8 @@
 
 #include "latlib/hypercache.h"
 
 
 #include "latlib/hypercache.h"
 

+#include <mpi.h>
+

 void o815::obs::finish() {
   _finish();
 }
 void o815::obs::finish() {
   _finish();
 }