Fixed writeout option.

[phys/latlib.git] / o815 / o815.cpp

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 17581ecc8700c20ce8211e5a3f12c8c8cd6e52c9..f078db3a0dcb16dd9d017d5409c49551af100a23 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -129,6 +129,9 @@ void o815::postParaInit() {
 void o815::mainLoop() {
   *out->log << "OBS: Starting main loop." << endl;
 
 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<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit)
     (*obsit)->start();
 
   for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit)
     (*obsit)->start();
 


@@ -149,6 +152,7 @@ void o815::mainLoop() {
 
     for( int imeas=0; imeas<comargs.nmeas; imeas++ ) {
       bool nextAlready = false;
 
     for( int imeas=0; imeas<comargs.nmeas; imeas++ ) {
       bool nextAlready = false;

+

       for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
        bool readnewObs;
        int nequileftNewObs;
       for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
        bool readnewObs;
        int nequileftNewObs;


@@ -165,9 +169,12 @@ void o815::mainLoop() {
          }
          (*obsit)->meas(false, imeas);
          hypercache::writeO( (*obsit)->ocid );
          }
          (*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;
     }
       while( measProg.madeStep(imeas) ) 
        *out->log << "O815: " << measProg.done()*100 << "% of measurements done." << endl << flush;
     }


@@ -226,7 +233,7 @@ void o815::parseArgs(int argc, char **argv, comoption specOps[]) {
     case 'C':
       readCacheArgs(optarg, comargs.confcache.first, comargs.confcache.second);
       break;
     case 'C':
       readCacheArgs(optarg, comargs.confcache.first, comargs.confcache.second);
       break;

-    case 'w':
+    case 'W':

       comargs.outdir = optarg;
       break;
     default:
       comargs.outdir = optarg;
       break;
     default: