fixed multiple parameter write closing bug.

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index b6edc173fd26faea06606df901fd01b03754275f..ef085d8cb25815d78d02ccbfc258ee4332b5f6d6 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -174,11 +174,9 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
   return NULL;
 }
 

-/* 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)
+void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes)

 {
 {

-  readnewconfig = false;
+  *readnewconfig = false;

 
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 
 
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 


@@ -193,8 +191,8 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
       int iDidVirtualSkips;
 
       if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
       int iDidVirtualSkips;
 
       if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {

-       cout << "RETURNING..." << endl;
-       nequileft = nequileft_internal;
+       if (*readnewconfig)
+         *nequileft = nequileft_internal;

        return;
       }
 
        return;
       }
 


@@ -223,8 +221,6 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
       if( inFile.is_open() ) 
        {
          if (doVirtualEquilibration) {
       if( inFile.is_open() ) 
        {
          if (doVirtualEquilibration) {

-           cout << nequileft_internal << endl;
-

            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
            doVirtualEquilibration = false;
            for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {
            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
            doVirtualEquilibration = false;
            for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {


@@ -233,8 +229,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
              else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {
                memcpy(configMem, tmpConfig, configSize);
                nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
              else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {
                memcpy(configMem, tmpConfig, configSize);
                nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;

-               cout << "blabla:" << nequileft_internal << endl;
-               readnewconfig = true;
+               *readnewconfig = true;

                firstUsedConfig = false;
              }
            }
                firstUsedConfig = false;
              }
            }


@@ -243,7 +238,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);

-             readnewconfig = true;
+             *readnewconfig = true;

              if (firstUsedConfig) {
                firstUsedConfig = false;
                if (openFileDesc.nequi < NEQUI)
              if (firstUsedConfig) {
                firstUsedConfig = false;
                if (openFileDesc.nequi < NEQUI)


@@ -252,8 +247,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
                  nequileft_internal = NEQUI - openFileDesc.nequi;
              }
              nequileft_internal -= openFileDesc.nskip;
                  nequileft_internal = NEQUI - openFileDesc.nequi;
              }
              nequileft_internal -= openFileDesc.nskip;

-             cout << "sadasd:" << nequileft_internal << endl;
-             nequileft = nequileft_internal;
+             *nequileft = nequileft_internal;

              return;
            }
          else {
              return;
            }
          else {


@@ -265,7 +259,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 }
 
 void configcache::openOutFile(int actnequi)
 }
 
 void configcache::openOutFile(int actnequi)

-{
+{ 

   time_t secstamp = time(NULL);
 
   outFileName.str("");
   time_t secstamp = time(NULL);
 
   outFileName.str("");


@@ -321,6 +315,7 @@ int configcache::getParIndex(const string& parid){
 
 void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;
 
 void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;

+

   finishOutFile();
   if(inBuffer != NULL) { delete inBuffer; inBuffer=NULL; } 
   inFile.close();
   finishOutFile();
   if(inBuffer != NULL) { delete inBuffer; inBuffer=NULL; } 
   inFile.close();