...

[phys/latlib.git] / hypercache.cpp

diff --git a/hypercache.cpp b/hypercache.cpp
index 0f8d8569c535bb6a92d7c93913e5d5dfbca85116..b2a0b256f4671ac59830a4e212f1c103f866a5a7 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -10,6 +10,7 @@ vector<configcache*> hypercache::Os;
 int hypercache::NEQUI;
 int hypercache::NSKIP;
 int hypercache::nequileft;
+pair<int, char*> hypercache::mostEquilibratedConfig;
 
 void hypercache::initCache(configcache **cache,
                           const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
@@ -55,6 +56,7 @@ void hypercache::setPara(const string& parid, const double& val) {
     (*osit)->setPara(parid, val);
 
   nequileft = NEQUI;
+  mostEquilibratedConfig.first = NEQUI;
 }
 
 void hypercache::finalize() {
@@ -76,12 +78,11 @@ bool hypercache::readC() {
   C->readConfig(readnewconfig_nonex, nequileftReadConfig_nonex, &parentConfigs);
 
   if (readnewconfig_nonex) {
-    cout << ":" << nequileftReadConfig_nonex << endl;
     nequileft = nequileftReadConfig_nonex;
     readAtLeastOneConfig = true;
   }
 
-  if ( nequileft < 0 )
+  if ( nequileft < 0 && readnewconfig_nonex )
     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";
@@ -117,6 +118,22 @@ bool hypercache::readC() {
     free(tmpconfig);
   }
 
+  /* storing most equilibrated config */
+  if ( nequileft < mostEquilibratedConfig.first && readAtLeastOneConfig ) {
+    *log << "HYPERCACHE: Storing a copy of so far most equilibrated config with nequileft = " << nequileft << endl << flush;
+    mostEquilibratedConfig.first = nequileft;
+    memcpy(mostEquilibratedConfig.second, C->getConfigMem(), C->getConfigSize());
+  }
+
+  
+  /* injecting back most equilibrated config if nothing could be used anymore */
+  if ( nequileft > 0 && mostEquilibratedConfig.first < nequileft ) {
+    *log << "HYPERCACHE: Injecting back most equilibrated stored config with nequileft = " << mostEquilibratedConfig.first << endl << flush;
+    nequileft = mostEquilibratedConfig.first;
+    memcpy(C->getConfigMem(), mostEquilibratedConfig.second, C->getConfigSize());
+    readAtLeastOneConfig = false;
+  }
+
   return readAtLeastOneConfig;
 }