Revert "Let outdir be created from rank 0."

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

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 9afaa0cb7344e66e398beffb51255bed5467985e..b68a38b061df92d0741b4a3bdb6ab0f3ce1093e1 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -2,6 +2,11 @@
 
 #include <sstream>
 #include <iomanip>
+#include <cstring>
+
+#ifndef MPI_DISABLED
+#include <mpi.h>
+#endif
 
 #include "latlib/progress.h"
 
@@ -10,8 +15,6 @@ using namespace std;
 extern int opterr;
 
 o815::o815(int argc, char **argv, const string& _programid, comoption specOps[], void (*helpHeader)()) {
-  long timestamp;
-
   programid = _programid;
 
   comargs.nmeas = 100;
@@ -25,11 +28,14 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[],
   comargs.idonly = false;
   comargs.showjobnum = false;
 
+#ifndef MPI_DISABLED
   MPI_Init(&argc, &argv);
   MPI_Comm_size(MPI_COMM_WORLD, &numprocs);
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-
-  paraQ = new paraq(numprocs, rank);
+#else
+  numprocs = 1;
+  rank = 0;
+#endif
 
   addComOption("lsize",  required_argument, NULL,                'L', "define lattice size",                   "xsize:tsize");
   addComOption("nmeas",  required_argument, NULL,                'N', "set number of measurements",            "nmeas");
@@ -90,31 +96,44 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[],
     exit(0);
   }
 
+  paraQ = new paraq(numprocs, rank);
+
+  hypercache::addPara("lx", comargs.lsize[0]);
+  hypercache::addPara("lt", comargs.lsize[1]);
+}
+
+void o815::postParaInit() {
+  long timestamp;
+
   if(comargs.idonly) {
     cout << programid << headMaster() << endl << flush;
     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);
+#ifndef MPI_DISABLED
     for(int idest=1; idest<numprocs; idest++)
       MPI_Send(&timestamp, 1, MPI_LONG, idest, 123, MPI_COMM_WORLD);
+#endif
   }
+#ifndef MPI_DISABLED
   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);
+#endif  
+
   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)
@@ -141,18 +160,20 @@ void o815::mainLoop() {
        bool readnewObs;
        int nequileftNewObs;
        
-       hypercache::readO( (*obsit)->ocid, readnewObs, nequileftNewObs );
+       hypercache::readO( (*obsit)->ocid, &readnewObs, &nequileftNewObs );
 
-       if( ! readnewObs ) {
+       if ( readnewObs && nequileftNewObs < 0 ) {
+         (*obsit)->meas(true, imeas);
+       }
+       else {
          if (!nextAlready) {
            Sim->nextConfig();
            nextAlready = true;
          }
-         (*obsit)->meas(false);
-         hypercache::writeO( (*obsit)->ocid, comargs.nmeas );
+         (*obsit)->meas(false, imeas);
+         hypercache::writeO( (*obsit)->ocid );
        }
-       else
-         (*obsit)->meas(true);
+         
       }
       while( measProg.madeStep(imeas) ) 
        *out->log << "O815: " << measProg.done()*100 << "% of measurements done." << endl << flush;
@@ -275,13 +296,17 @@ string o815::headMaster()
 
 o815::~o815() {
   if(comargs.outdir=="") {
+#ifndef MPI_DISABLED
     MPI_Barrier(MPI_COMM_WORLD);
+#endif
     if(rank==0)
       cout << "#end" << endl << flush;
   }
   hypercache::finalize();
   delete out;
+#ifndef MPI_DISABLED
   MPI_Finalize();
+#endif
 }
 
 int o815::nextParas()