X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/3c0ea1a85b09df3bb85839ba92831fca9e10a82f..d09f5f0aeff338a0262c3faf5272b82945a3bf8f:/o815/o815.cpp?ds=sidebyside diff --git a/o815/o815.cpp b/o815/o815.cpp index 5271370..3fe43c8 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,11 +86,28 @@ 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); for(int idest=1; idestgetTotalJobs(); i++ ) { - if( paraQ->getTotalJobs()%i == 0 ) cout << paraQ->getTotalJobs()/i << "@" << i << " "; - } - cout << endl; - exit(0); - } - *out->log << "OBS: Starting main loop." << endl; for (vector::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) @@ -144,14 +149,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 ); }