Implemented startconfig.

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

diff --git a/o815/sim.cpp b/o815/sim.cpp
index fe30ec5edd3242f02d71cd4a761cc82bde08f2c4..70fe482316eca43eccf90075fed2e9a44081c9a5 100644 (file)
--- a/o815/sim.cpp
+++ b/o815/sim.cpp
@@ -3,6 +3,8 @@
 #include "latlib/hypercache.h"
 #include "latlib/progress.h"
 
+#include "latlib/datread.h"
+
 o815::sim::sim(o815 *_O815, const int& _confmemSize) {
   O815 = _O815;
   log = O815->out->log;
@@ -10,6 +12,35 @@ o815::sim::sim(o815 *_O815, const int& _confmemSize) {
   nequi = O815->comargs.nequi;
   nskip = O815->comargs.nskip;
   confmemSize = confmemSize;
+
+  startConfiguration = NULL;
+  
+  if ( O815->comargs.startconfig != "" ) {
+    *log << "SIM: Fetching startconfig from " << O815->comargs.startconfig << endl;
+    
+    datread dataReader(confmemSize);
+    dataReader.openFile(O815->comargs.startconfig);
+    
+    if ( dataReader.fisopen() ) {
+      startConfiguration = new char[confmemSize];
+      
+      if ( dataReader.readFullBlock(startConfiguration) < 0 ) {
+       *log << "SIM: Error while reading config from " << O815->comargs.startconfig << endl;
+       delete[] startConfiguration;
+       startConfiguration = NULL;
+      }     
+    }
+    else {
+      *log << "SIM: Could not open startconfigfile " << O815->comargs.startconfig << endl;
+    }
+  }
+  
+}
+
+o815::sim::~sim ()
+{
+  if (startConfiguration != NULL)
+    delete[] startConfiguration;
 }
 
 void o815::sim::nextConfig() {
@@ -28,13 +59,17 @@ void o815::sim::nextConfig() {
   }
 
   /* make skip if no config could be read or one skip is left after equilibration */
-  if ( (! readAtLeastOneConfig) || (hypercache::getNEquiLeft() == 0) ) {
-    cout << "SKIPPING" << endl;
+  if ( (! readAtLeastOneConfig) || (hypercache::getNEquiLeft() >= 0) ) {
     for (int iskip=0; iskip<nskip; iskip++) {
       _makeSweep();
     }
     hypercache::writeC();
   }
+}
 
-  cout << hypercache::getNEquiLeft() << endl;
+void o815::sim::resetConfig() {
+  if ( startConfiguration != NULL )
+    memcpy(confMem, startConfiguration, confmemSize);
+  else
+    _resetConfig();
 }