From 57120da66874b239e28824c9790a62c3556a489e Mon Sep 17 00:00:00 2001 From: Alex Schmidt Date: Thu, 18 Apr 2013 20:58:21 +0200 Subject: [PATCH] ... --- o815/o815.cpp | 21 ++++++++++++--------- o815/o815.h | 5 ++++- o815/obs.cpp | 6 ++++++ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/o815/o815.cpp b/o815/o815.cpp index 29f5fd3..4d6f047 100644 --- a/o815/o815.cpp +++ b/o815/o815.cpp @@ -33,14 +33,6 @@ o815::o815(int argc, char **argv, const string& _programid) { 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) @@ -66,7 +66,10 @@ void o815::mainLoop() { progress measProg(comargs.nmeas); - *out->log << "OBS: Starting measurements." << endl << flush; + *out->log << "OBS: Starting measurement of observables:"; + for (vector::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) + *out->log << " " << (*obsit)->obsid; + *out->log << endl << flush; for( int imeas=0; imeasout->out[obsid]; log = O815->out->log; + paraQ = O815->paraQ; ocid = hypercache::initO(O815->programid + "-" + obsid, O815->comargs.nequi, O815->comargs.nskip, O815->comargs.obscache.first, &obsMem, obsmemSize, O815->comargs.obscache.second, log); } + +void o815::obs::printParas() { + for (vector::iterator parait = paraQ->allParaIds.begin(); parait != paraQ->allParaIds.end(); ++parait) + *O815->out->out[obsid] << (*paraQ)[*parait] << "\t"; +} -- 2.39.5