hypercache now working.

[phys/latlib.git] / hypercache.cpp

diff --git a/hypercache.cpp b/hypercache.cpp
index 8fcc609d909d757b5e95c3cce8bf12991529fc70..7e0f0e5492864eeca20ea17303c2e3bdb5a9f6aa 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -1,10 +1,11 @@
 #include "hypercache.h"
 
 #include "hypercache.h"
 

-hypercache::defaults *hypercache::Defaults = NULL;

 configcache *hypercache::O = NULL;
 configcache *hypercache::C = NULL;
 configcache *hypercache::O = NULL;
 configcache *hypercache::C = NULL;

+vector<hypercache::para> hypercache::delayedParaAdd;
+vector<hypercache::para> hypercache::delayedParaSet;

 
 

-void hypercache::initCache(configcache *cache,
+void hypercache::initCache(configcache **cache,

                           const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
                           char **configmem, const int& configMemSize, const int& cachemode, writeout *out_a) {
   
                           const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
                           char **configmem, const int& configMemSize, const int& cachemode, writeout *out_a) {
   


@@ -13,15 +14,7 @@ void hypercache::initCache(configcache *cache,
   if (O == NULL || C == NULL)
     allInitBefore = false;
 
   if (O == NULL || C == NULL)
     allInitBefore = false;
 

-  cache = new configcache(cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
-  
-  if (Defaults == NULL) {
-    Defaults = new defaults;
-    Defaults->nequi = nequi;
-    Defaults->nskip = nskip;
-    Defaults->datadir = datadir;
-    Defaults->out = out_a;
-  }
+  *cache = new configcache(cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);

 
   if (O != NULL && C != NULL && !allInitBefore) {
     for (vector<para>::iterator parit=delayedParaAdd.begin(); parit != delayedParaAdd.end(); ++parit) {
 
   if (O != NULL && C != NULL && !allInitBefore) {
     for (vector<para>::iterator parit=delayedParaAdd.begin(); parit != delayedParaAdd.end(); ++parit) {


@@ -35,17 +28,6 @@ void hypercache::initCache(configcache *cache,
   }
 }
 
   }
 }
 

-void hypercache::initCache(configcache *cache, const string& subdir,
-                          const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode) {
-  if (Defaults == NULL) {
-    cerr << "Defaults were not initialized prior to short initialization!" << endl;
-    exit(1);
-  }
-  
-  initCache(cache, cacheid, Defaults->nequi, Defaults->nskip, Defaults->datadir + "/" + subdir, 
-           configmem, configMemSize, cachemode, Defaults->out);
-}
-

 void hypercache::addPara(const string& parid, const double& val) {
   if (O == NULL || C == NULL) {
     para newpara; 
 void hypercache::addPara(const string& parid, const double& val) {
   if (O == NULL || C == NULL) {
     para newpara; 


@@ -71,3 +53,8 @@ void hypercache::setPara(const string& parid, const double& val) {
     C->setPara(parid, val);
   }
 }
     C->setPara(parid, val);
   }
 }

+
+void hypercache::finalize() {
+  delete C;
+  delete O;
+}