X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/71e93c2cca7c6f967c3c77c3e26c037ad4f4f555..3675da388f7ca12cdc6d93f4a8b94ef4bdd96b19:/o815/o815.cpp?ds=sidebyside diff --git a/o815/o815.cpp b/o815/o815.cpp index 3511d80..708aceb 100644 --- a/o815/o815.cpp +++ b/o815/o815.cpp @@ -10,8 +10,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; @@ -29,8 +27,6 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[], MPI_Comm_size(MPI_COMM_WORLD, &numprocs); MPI_Comm_rank(MPI_COMM_WORLD, &rank); - paraQ = new paraq(numprocs, rank); - addComOption("lsize", required_argument, NULL, 'L', "define lattice size", "xsize:tsize"); addComOption("nmeas", required_argument, NULL, 'N', "set number of measurements", "nmeas"); addComOption("skip", required_argument, NULL, 'S', "set number of skips between configs", "nskip"); @@ -90,6 +86,15 @@ 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); @@ -141,7 +146,7 @@ void o815::mainLoop() { bool readnewObs; int nequileftNewObs; - hypercache::readO( (*obsit)->ocid, readnewObs, nequileftNewObs ); + hypercache::readO( (*obsit)->ocid, &readnewObs, &nequileftNewObs ); if ( readnewObs && nequileftNewObs < 0 ) { (*obsit)->meas(true);