X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/863c9da2356ce3fc92d6a39550ac6c181252781a..e9c0e0b98886738917300348a522759c25d4a9c7:/o815/o815.cpp?ds=inline diff --git a/o815/o815.cpp b/o815/o815.cpp index 708aceb..f078db3 100644 --- a/o815/o815.cpp +++ b/o815/o815.cpp @@ -2,6 +2,11 @@ #include #include +#include + +#ifndef MPI_DISABLED +#include +#endif #include "latlib/progress.h" @@ -23,21 +28,26 @@ 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); - - 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"); - addComOption("nequi", required_argument, NULL, 'E', "set number of equilibrations", "nequi"); - addComOption("oro", required_argument, NULL, 'o', "read-only observable-store directory", "dir"); - addComOption("orw", required_argument, NULL, 'O', "read-write observable-store directory", "dir"); - addComOption("cro", required_argument, NULL, 'c', "read-only config-store directory", "dir"); - addComOption("crw", required_argument, NULL, 'C', "read-write config-store directory", "dir"); - addComOption("write", required_argument, NULL, 'w', "data writeout directory", "dir"); - addComOption("idonly", no_argument, &comargs.idonly, 'i', "show output-id only", ""); - addComOption("jobnum", no_argument, &comargs.showjobnum, 'j', "show jobnumber only", ""); +#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("skip", required_argument, NULL, 'S', "set number of skips between configs", "nskip"); + addComOption("nequi", required_argument, NULL, 'E', "set number of equilibrations", "nequi"); + addComOption("ocache", required_argument, NULL, 'O', "set observable cache (mode=oo|ro|wo|rw)", "dir:mode"); + addComOption("ccache", required_argument, NULL, 'C', "set config cache (mode=oo|ro|wo|rw)", "dir:mode"); + addComOption("write", required_argument, NULL, 'W', "data writeout directory", "dir"); + addComOption("idonly", no_argument, &comargs.idonly, 'I', "show output-id only", ""); + addComOption("jobnum", no_argument, &comargs.showjobnum, 'J', "show jobnumber only", ""); + + vector::iterator lastO815Opt = comOptions.end()-1; if (specOps != NULL) for (int ispecop = 0; specOps[ispecop].name != ""; ispecop++) @@ -51,7 +61,7 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[], if (helpHeader != NULL) helpHeader(); - cout << "Options:" << endl; + cout << "General options:" << endl; for (vector::iterator opit = comOptions.begin(); opit != comOptions.end(); ++opit) { stringstream combinedLong; @@ -82,6 +92,11 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[], cout << "\t" << opit->optdesc; cout << endl; + + if ( opit == lastO815Opt && (opit+1) != comOptions.end() ) { + cout << endl; + cout << "Simulation specific options:" << endl; + } } exit(0); } @@ -100,18 +115,6 @@ void o815::postParaInit() { exit(0); } - if(rank==0) { - timestamp = time(NULL); - for(int idest=1; idest0) - MPI_Recv(×tamp, 1, MPI_LONG, 0, 123, MPI_COMM_WORLD, &mpiStatus); - - 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 << " "; @@ -119,9 +122,16 @@ void o815::mainLoop() { cout << endl; exit(0); } + + out = new writeout(comargs.outdir, programid+headMaster(), rank, numprocs); +} +void o815::mainLoop() { *out->log << "OBS: Starting main loop." << endl; + if ( observables.size() == 0 ) + *out->log << "O815: Running in 0-observable-mode." << endl; + for (vector::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) (*obsit)->start(); @@ -142,6 +152,7 @@ void o815::mainLoop() { for( int imeas=0; imeas::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) { bool readnewObs; int nequileftNewObs; @@ -149,18 +160,21 @@ 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 ); - } - + } } + + if ( observables.size() == 0 ) + Sim->nextConfig(); + while( measProg.madeStep(imeas) ) *out->log << "O815: " << measProg.done()*100 << "% of measurements done." << endl << flush; } @@ -213,23 +227,13 @@ void o815::parseArgs(int argc, char **argv, comoption specOps[]) { case 'E': comargs.nequi = atoi(optarg); break; - case 'o': - comargs.obscache.first = optarg; - comargs.obscache.second = 1; - break; case 'O': - comargs.obscache.first = optarg; - comargs.obscache.second = 2; - break; - case 'c': - comargs.confcache.first = optarg; - comargs.confcache.second = 1; + readCacheArgs(optarg, comargs.obscache.first, comargs.obscache.second); break; case 'C': - comargs.confcache.first = optarg; - comargs.confcache.second = 2; + readCacheArgs(optarg, comargs.confcache.first, comargs.confcache.second); break; - case 'w': + case 'W': comargs.outdir = optarg; break; default: @@ -282,13 +286,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() @@ -306,3 +314,27 @@ void o815::addPara(const string& paraid, const double& paraDefault) { hypercache::addPara(paraid); paraQ->setDefault(paraid, paraDefault); } + +void o815::readCacheArgs(const string& arg, string& cachedir, int& cachemode) +{ + if ( arg.rfind(":") == string::npos ) { + cerr << "O815: Invalid cache argument!" << endl; + exit(1); + } + + string arg_mode = arg.substr( arg.rfind(":")+1 ); + if ( arg_mode == "oo" ) + cachemode = CACHE_MODE_OO; + else if ( arg_mode == "ro" ) + cachemode = CACHE_MODE_RO; + else if ( arg_mode == "wo" ) + cachemode = CACHE_MODE_WO; + else if ( arg_mode == "rw" ) + cachemode = CACHE_MODE_RW; + else { + cerr << "O815: Unknown cache mode " << arg_mode << "!" << endl; + exit(1); + } + + cachedir = arg.substr( 0, arg.rfind(":") ); +}