...

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

diff --git a/o815/sim.cpp b/o815/sim.cpp
index 6abf7c61ad028eae88ff736b6ac9ce8733e5a7bb..ec47339a7266e088af7881cbb0e7ae12c9fccb2b 100644 (file)
--- a/o815/sim.cpp
+++ b/o815/sim.cpp
@@ -3,24 +3,48 @@
 #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;
   hypercache::initC(O815->programid, O815->comargs.nequi, O815->comargs.nskip, O815->comargs.confcache.first, &confMem, _confmemSize, O815->comargs.confcache.second, log);
   nequi = O815->comargs.nequi;
   nskip = O815->comargs.nskip;
-  confmemSize = confmemSize;
+  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 = (char*)malloc(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;
+    }
+  }
+  
 }
 
-void o815::sim::nextConfig() {
-  bool readnewconfig;
-  int nequileftReadConfig;
-  bool skippedInEqui = false;
-  bool readNoSingleConfig = true;
-  bool createdNoNewConfigs = true;
-  bool readAtLeastOneConfig;
+o815::sim::~sim ()
+{
+  if (startConfiguration != NULL)
+    delete[] startConfiguration;
+}
 
-  readAtLeastOneConfig = hypercache::readC();
+void o815::sim::nextConfig() {
+  bool readAtLeastOneConfig = hypercache::readC();
 
   /* equilibrate if necessary */
   if (hypercache::getNEquiLeft() > 0) {
@@ -32,23 +56,20 @@ void o815::sim::nextConfig() {
       _makeSweep();
       while( equiProg.madeStep(iequi) ) *log << "SIM: " << equiProg.done()*100 << "% of equilibration done." << endl << flush;
     }
-    skippedInEqui = true;
-    createdNoNewConfigs = false;
   }
 
-  /* make skip if no config could be read */
-  if ( (! readAtLeastOneConfig) ) {
-    cout << "SKIPPING" << endl;
+  /* make skip if no config could be read or one skip is left after equilibration */
+  if ( (! readAtLeastOneConfig) || (hypercache::getNEquiLeft() >= 0) ) {
     for (int iskip=0; iskip<nskip; iskip++) {
       _makeSweep();
     }
-    createdNoNewConfigs = false;
-  }
- 
-  if (! createdNoNewConfigs) {
-    cout << "::" << hypercache::getNEquiLeft() << endl;
     hypercache::writeC();
   }
+}
 
-  cout << hypercache::getNEquiLeft() << endl;
+void o815::sim::resetConfig() {
+  if ( startConfiguration != NULL )
+    memcpy(confMem, startConfiguration, confmemSize);
+  else
+    _resetConfig();
 }