...

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index bcfe92f05bd74dcb3ce90e600df6f313a5d1aa17..168de5e14494c122e8a262bd3176c223635a76fe 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -37,11 +37,11 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   refetchDataFiles = false;
 }
 
-string configcache::getFileId(const bool& shortid)
+string configcache::getFileId(int actnequi, const bool& shortid)
 {
   stringstream fileid;
 
-  if(!shortid) fileid << CACHEID << "_" << NEQUI << "_" << NSKIP;
+  if(!shortid) fileid << CACHEID << "_" << actnequi << "_" << NSKIP;
   for(int ipara=0; ipara<Paras.size(); ipara++)
     fileid << "_" << Paras[ipara].id << Paras[ipara].val;
 
@@ -73,6 +73,7 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   filedesc->filename = infile;
   filedesc->doVirtualEquilibration = false;
+  filedesc->readEquilibratedConfigs = 0;
 
   if( infile.size() < 4 ) return false;
 
@@ -93,14 +94,11 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
       switch(iPart)
        {
-       case 1: if(inParts != CACHEID) {
-           return false; 
-           break;
-         }
-       case 2: 
-         if (atoi(inParts) > NEQUI) 
-           return false; 
-         else if (atoi(inParts) < NEQUI)
+       case 1: if(inParts != CACHEID)
+           return false;
+         break;
+       case 2:
+         if (atoi(inParts) < NEQUI)
            filedesc->doVirtualEquilibration = true;
          filedesc->nequi = atoi(inParts);
          break;
@@ -116,7 +114,7 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   delete[] inchar;
 
-  if( truncIn.find( getFileId(true) + "_" ) == string::npos ) return false;
+  if( truncIn.find( getFileId(NEQUI, true) + "_" ) == string::npos ) return false;
 
   return true;
 }
@@ -180,12 +178,14 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
-/* returns number of equilibration-steps left */
-int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
+/* returns number of equilibration-steps left with new read configuration 
+   or zero if no new configuration was read */
+void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigned long> *excludeFileHashes)
 {
-  int nequileft = NEQUI;
+  readnewconfig = false;
+  nequileft = NEQUI;
 
-  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return nequileft;
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 
   if(refetchDataFiles){
     refetchDataFiles = false;
@@ -196,7 +196,7 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
 
-      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) return nequileft;
+      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) return;
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
        openFileDesc = *inFileIt;
@@ -224,6 +224,7 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
              else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft ) {
                memcpy(configMem, tmpConfig, configSize);
                nequileft = (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip;
+               readnewconfig = true;
              }
            }
          }
@@ -231,7 +232,10 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
-             return -1;
+             readnewconfig = true;
+             nequileft = NEQUI - openFileDesc.nequi - openFileDesc.readEquilibratedConfigs*openFileDesc.nskip;
+             openFileDesc.readEquilibratedConfigs++;
+             return;
            }
          else {
            if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
@@ -241,12 +245,12 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
     }
 }
 
-void configcache::openOutFile()
+void configcache::openOutFile(int actnequi)
 {
   time_t secstamp = time(NULL);
 
   outFileName.str("");
-  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";
+  outFileName << DATADIR << "/" << secstamp << "_" << getFileId(actnequi) << "_.edat.tmp";
 
   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
@@ -255,13 +259,13 @@ void configcache::openOutFile()
   outBuffer->push(outFile);
 }
 
-void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size) {
+void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi) {
   unsigned long headeridhash;
 
   if( DATADIR == "" || MODE < 2 ) return;
 
   if(!outFile.is_open())
-    openOutFile();
+    openOutFile(actnequi);
 
   headeridhash = hash(headerid);
 
@@ -270,14 +274,14 @@ void configcache::writeHeader(const string& headerid, const char *header, long u
   boost::iostreams::write(*outBuffer, header, size);
 }
 
-void configcache::writeConfig()
+void configcache::writeConfig(int actnequi)
 {
   long unsigned int zeroheader=0;
 
   if ( DATADIR == "" || MODE < 2 ) return;
 
   if ( ! outFile.is_open() )
-    openOutFile();
+    openOutFile(actnequi);
   
   boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(long unsigned int));