X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/f2373be314dc298d602b1939cde3d5ae990dd07f..7ebf4164400b973bba97887d7852bc07801206b7:/o815/o815.cpp diff --git a/o815/o815.cpp b/o815/o815.cpp index a2b35e8..cf461ba 100644 --- a/o815/o815.cpp +++ b/o815/o815.cpp @@ -51,21 +51,26 @@ o815::o815(int argc, char **argv, const string& _programid) { } void o815::mainLoop() { + *out->log << "OBS: Starting main loop." << endl; + for (vector::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) { (*obsit)->start(); } + + //while( nextParas() ) { + //} + /* for (int i=0; i<100; i++) { for (vector::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) { (*obsit)->meas(); } } + */ for (vector::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) { (*obsit)->finish(); } - - //MPI_Finalize(); } void o815::parseArgs(int argc, char **argv) { @@ -145,9 +150,23 @@ o815::~o815() { if(rank==0) cout << "#end" << endl << flush; } - - cout << "bu:" << rank << endl; - delete out; MPI_Finalize(); } + +int o815::nextParas() +{ + if( paraQ->nextParas() ) { + /* + setB( (*paraQ)["beta"] ); + setK( (*paraQ)["kappa"] ); + setL( (*paraQ)["lambda"] ); + setM1( (*paraQ)["mu1"] ); + setM2( (*paraQ)["mu2"] ); + */ + + return 1; + } + else + return 0; +}