X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/dde851eb3186dbb51898dfe8fc530fce1e0a4cd3..6ad2fe3a6550b77888c46b17f81d8ab74406649d:/o815/sim.cpp?ds=inline

diff --git a/o815/sim.cpp b/o815/sim.cpp
index 6abf7c6..fe30ec5 100644
--- a/o815/sim.cpp
+++ b/o815/sim.cpp
@@ -13,14 +13,7 @@ o815::sim::sim(o815 *_O815, const int& _confmemSize) {
 }
 
 void o815::sim::nextConfig() {
-  bool readnewconfig;
-  int nequileftReadConfig;
-  bool skippedInEqui = false;
-  bool readNoSingleConfig = true;
-  bool createdNoNewConfigs = true;
-  bool readAtLeastOneConfig;
-
-  readAtLeastOneConfig = hypercache::readC();
+  bool readAtLeastOneConfig = hypercache::readC();
 
   /* equilibrate if necessary */
   if (hypercache::getNEquiLeft() > 0) {
@@ -32,21 +25,14 @@ 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) ) {
+  /* make skip if no config could be read or one skip is left after equilibration */
+  if ( (! readAtLeastOneConfig) || (hypercache::getNEquiLeft() == 0) ) {
     cout << "SKIPPING" << endl;
     for (int iskip=0; iskip<nskip; iskip++) {
       _makeSweep();
     }
-    createdNoNewConfigs = false;
-  }
- 
-  if (! createdNoNewConfigs) {
-    cout << "::" << hypercache::getNEquiLeft() << endl;
     hypercache::writeC();
   }