X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/863c9da2356ce3fc92d6a39550ac6c181252781a..1a6e4ad36f2b712a042007efb5184e2f34958595:/o815/o815.cpp?ds=inline

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 708aceb..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;
@@ -100,26 +102,26 @@ void o815::postParaInit() {
     exit(0);
   }
 
+  if( comargs.showjobnum ) {
+    for( int i=1; i<=paraQ->getTotalJobs(); i++ ) {
+      if( paraQ->getTotalJobs()%i == 0 ) cout << paraQ->getTotalJobs()/i << "@" << i << " ";
+    }
+    cout << endl;
+    exit(0);
+  }
+  
   if(rank==0) {
     timestamp = time(NULL);
     for(int idest=1; idest<numprocs; idest++)
       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);
 }
 
 void o815::mainLoop() {
-  if( comargs.showjobnum ) {
-    for( int i=1; i<=paraQ->getTotalJobs(); i++ ) {
-      if( paraQ->getTotalJobs()%i == 0 ) cout << paraQ->getTotalJobs()/i << "@" << i << " ";
-    }
-    cout << endl;
-    exit(0);
-  }
-
   *out->log << "OBS: Starting main loop." << endl;
 
   for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit)
@@ -149,14 +151,14 @@ void o815::mainLoop() {
 	hypercache::readO( (*obsit)->ocid, &readnewObs, &nequileftNewObs );
 
 	if ( readnewObs && nequileftNewObs < 0 ) {
-	  (*obsit)->meas(true);
+	  (*obsit)->meas(true, imeas);
 	}
 	else {
 	  if (!nextAlready) {
 	    Sim->nextConfig();
 	    nextAlready = true;
 	  }
-	  (*obsit)->meas(false);
+	  (*obsit)->meas(false, imeas);
 	  hypercache::writeO( (*obsit)->ocid );
 	}