...

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

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 956ad2e543a6582616a7d501885aa05096c811b2..630d6803a4471c9ddfeccdde07097978c4f02f44 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -2,6 +2,11 @@
 
 #include <sstream>
 #include <iomanip>
 
 #include <sstream>
 #include <iomanip>

+#include <cstring>
+
+#ifndef MPI_DISABLED
+#include <mpi.h>
+#endif

 
 #include "latlib/progress.h"
 
 
 #include "latlib/progress.h"
 


@@ -23,9 +28,14 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[],
   comargs.idonly = false;
   comargs.showjobnum = false;
 
   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);
   MPI_Init(&argc, &argv);
   MPI_Comm_size(MPI_COMM_WORLD, &numprocs);
   MPI_Comm_rank(MPI_COMM_WORLD, &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");
 
   addComOption("lsize",  required_argument, NULL,                'L', "define lattice size",                   "xsize:tsize");
   addComOption("nmeas",  required_argument, NULL,                'N', "set number of measurements",            "nmeas");


@@ -108,15 +118,7 @@ void o815::postParaInit() {
     exit(0);
   }
   
     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);
-  
-  out = new writeout(comargs.outdir, programid+headMaster(), rank, numprocs, timestamp);
+  out = new writeout(comargs.outdir, programid+headMaster(), rank, numprocs);

 }
 
 void o815::mainLoop() {
 }
 
 void o815::mainLoop() {


@@ -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 );
        }
          


@@ -282,13 +284,17 @@ string o815::headMaster()
 
 o815::~o815() {
   if(comargs.outdir=="") {
 
 o815::~o815() {
   if(comargs.outdir=="") {

+#ifndef MPI_DISABLED

     MPI_Barrier(MPI_COMM_WORLD);
     MPI_Barrier(MPI_COMM_WORLD);

+#endif

     if(rank==0)
       cout << "#end" << endl << flush;
   }
   hypercache::finalize();
   delete out;
     if(rank==0)
       cout << "#end" << endl << flush;
   }
   hypercache::finalize();
   delete out;

+#ifndef MPI_DISABLED

   MPI_Finalize();
   MPI_Finalize();

+#endif

 }
 
 int o815::nextParas()
 }
 
 int o815::nextParas()