...

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 82fa3f6787ccba006b242f56b645e00afcbf4b9c..0af533ac694531185aed99c1caa930c8afd2438d 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -30,6 +30,7 @@ struct infiledesc {
   int nskip;
   bool doVirtualEquilibration;
   bool extended;
   int nskip;
   bool doVirtualEquilibration;
   bool extended;

+  int readEquilibratedConfigs;

 };
 
 class configcache{
 };
 
 class configcache{


@@ -37,11 +38,11 @@ class configcache{
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
              const int& cachemode=CACHE_MODE_FULL, ostream *_log=NULL);
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
              const int& cachemode=CACHE_MODE_FULL, ostream *_log=NULL);

-  int readConfig(vector<unsigned long> *excludeFileHashes=NULL);
-  void writeConfig();
+  void readConfig(bool& readnewconfig, int& nequileft, vector<unsigned long> *excludeFileHashes=NULL);
+  void writeConfig(int actnequi);

   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);

-  void writeHeader(const string& headerid, const char *header, long unsigned int size);
+  void writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi);

   void * getHeader(const string& headerid);
   string getOutFileName() { return outFileName.str(); }
   string getInFileName() { return DATADIR + "/" + openFileDesc.filename; }
   void * getHeader(const string& headerid);
   string getOutFileName() { return outFileName.str(); }
   string getInFileName() { return DATADIR + "/" + openFileDesc.filename; }


@@ -59,7 +60,7 @@ class configcache{
   string DATADIR;
   string CACHEID;
   int MODE;
   string DATADIR;
   string CACHEID;
   int MODE;

-  string getFileId(const bool& shortid=false);
+  string getFileId(int actnequi, const bool& shortid=false);

 
   ofstream outFile;
   ifstream inFile;
 
   ofstream outFile;
   ifstream inFile;


@@ -89,7 +90,7 @@ class configcache{
 
   int readDataToMem(char *tmpData, long unsigned int dataSize);
 
 
   int readDataToMem(char *tmpData, long unsigned int dataSize);
 

-  void openOutFile();
+  void openOutFile(int actnequi);

 
   int readHeader();
 
 
   int readHeader();