Removed mpi.h from o815 header.

[phys/latlib.git] / o815 / o815.cpp

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 956ad2e543a6582616a7d501885aa05096c811b2..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);
 }


@@ -149,14 +151,14 @@ void o815::mainLoop() {
        hypercache::readO( (*obsit)->ocid, &readnewObs, &nequileftNewObs );
 
        if ( readnewObs && nequileftNewObs < 0 ) {
        hypercache::readO( (*obsit)->ocid, &readnewObs, &nequileftNewObs );
 
        if ( readnewObs && nequileftNewObs < 0 ) {

-         (*obsit)->meas(true);
+         (*obsit)->meas(true, imeas);

        }
        else {
          if (!nextAlready) {
            Sim->nextConfig();
            nextAlready = true;
          }
        }
        else {
          if (!nextAlready) {
            Sim->nextConfig();
            nextAlready = true;
          }

-         (*obsit)->meas(false);
+         (*obsit)->meas(false, imeas);

          hypercache::writeO( (*obsit)->ocid );
        }
          
          hypercache::writeO( (*obsit)->ocid );
        }