...

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

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 9fcae16949a293d6c1ab4af25ca6678a19843345..29f5fd3c9830d3cf56996b410528c72969ac9e57 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -2,6 +2,8 @@
 
 #include <sstream>
 
 
 #include <sstream>
 

+#include "latlib/progress.h"
+

 o815::o815(int argc, char **argv, const string& _programid) {
   long timestamp;
 
 o815::o815(int argc, char **argv, const string& _programid) {
   long timestamp;
 


@@ -51,18 +53,40 @@ o815::o815(int argc, char **argv, const string& _programid) {
 }
 
 void o815::mainLoop() {
 }
 
 void o815::mainLoop() {

-  for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
+  *out->log << "OBS: Starting main loop." << endl;
+
+  for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit)

     (*obsit)->start();
     (*obsit)->start();

-  }
-  
-  for (int i=0; i<100; i++) {
-    for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
-      (*obsit)->meas();
-    } 
-  }

 
 

-  for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
-    (*obsit)->finish();
+  while( nextParas() ) {
+    *out->log << endl << "O815: < ";
+    for (vector<string>::iterator parait = paraQ->allParaIds.begin(); parait != paraQ->allParaIds.end(); ++parait)
+      *out->log << *parait << "=" << (*paraQ)[*parait] << " ";
+    *out->log << ">" << endl << flush;
+    
+    progress measProg(comargs.nmeas);
+
+    *out->log << "OBS: Starting measurements." << endl << flush;
+
+    for( int imeas=0; imeas<comargs.nmeas; imeas++ ) {
+      bool nextAlready = false;
+      for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
+       if( hypercache::readO( (*obsit)->ocid ) != -1 ) {
+         if (!nextAlready) {
+           Sim->nextConfig();
+           nextAlready = true;
+         }
+         (*obsit)->meas(false);
+         hypercache::writeO( (*obsit)->ocid );
+       }
+       else
+         (*obsit)->meas(true);
+      }
+      while( measProg.madeStep(imeas) ) 
+       *out->log << "O815: " << measProg.done()*100 << "% of measurements done." << endl << flush;
+    }
+    for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit)
+      (*obsit)->finish();

   }
 }
 
   }
 }
 


@@ -143,6 +167,23 @@ o815::~o815() {
     if(rank==0)
       cout << "#end" << endl << flush;
   }
     if(rank==0)
       cout << "#end" << endl << flush;
   }

+  hypercache::finalize();

   delete out;
   MPI_Finalize();
 }
   delete out;
   MPI_Finalize();
 }

+
+int o815::nextParas()
+{
+  if( paraQ->nextParas() ) {
+    for (vector<string>::iterator parait = paraQ->allParaIds.begin(); parait != paraQ->allParaIds.end(); ++parait)
+      hypercache::setPara(*parait, (*paraQ)[*parait]);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+void o815::addPara(const string& paraid, const double& paraDefault) {
+  hypercache::addPara(paraid);
+  paraQ->setDefault(paraid, paraDefault);
+}