From 1a6e4ad36f2b712a042007efb5184e2f34958595 Mon Sep 17 00:00:00 2001
From: Alexander Schmidt <alex@treefish.org>
Date: Thu, 28 Nov 2013 22:02:48 +0100
Subject: [PATCH 1/1] Removed mpi.h from o815 header.

---
 o815/o815.cpp | 4 +++-
 o815/o815.h   | 2 --
 o815/obs.cpp  | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 3fe43c8..cc72a14 100644
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -3,6 +3,8 @@
 #include <sstream>
 #include <iomanip>
 
+#include <mpi.h>
+
 #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_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);
 }
diff --git a/o815/o815.h b/o815/o815.h
index b3ad62a..4f741a1 100644
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -3,7 +3,6 @@
 
 #include <string>
 #include <vector>
-#include <mpi.h>
 #include <stdlib.h>
 #include <getopt.h>
 
@@ -92,7 +91,6 @@ class o815 {
 
 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[]);
diff --git a/o815/obs.cpp b/o815/obs.cpp
index ae97340..d9e2532 100644
--- a/o815/obs.cpp
+++ b/o815/obs.cpp
@@ -2,6 +2,8 @@
 
 #include "latlib/hypercache.h"
 
+#include <mpi.h>
+
 void o815::obs::finish() {
   _finish();
 }
-- 
2.39.5