...

[phys/latlib.git] / hypercache.h

diff --git a/hypercache.h b/hypercache.h
index f7c039c0704e8cfedd24342ffa525bf7c1ce88fd..dd2ce0b493e152387030727137bbef5cb9e36a0b 100644 (file)
--- a/hypercache.h
+++ b/hypercache.h
@@ -2,6 +2,7 @@
 #define HYPERCACHE_H
 
 #include <iostream>
 #define HYPERCACHE_H
 
 #include <iostream>

+#include <ostream>

 
 #include "configcache.h"
 
 
 #include "configcache.h"
 


@@ -9,23 +10,25 @@ using namespace std;
 
 class hypercache {
  public:
 
 class hypercache {
  public:

-  static void initO(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
-                   char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL) {
-    initCache(&O, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
+  static int initO(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) {
+    Os.push_back(NULL);
+    initCache(&Os.back(), cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, _log);
+    return Os.size()-1;

   }
   static void initC(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
   }
   static void initC(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 

-                   char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL) {
-    initCache(&C, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
+                   char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL, ostream *_log=NULL) {
+    initCache(&C, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, _log);

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

-  static int readO();
+  static int readO(int obsid);

   static int readC();
   static int readC();

-  static void writeO();
+  static void writeO(int obsid);

   static void writeC();
   static void writeC();

-  static void writeHeaderO(const string& headerid, char *header, long unsigned int size) { O->writeHeader(headerid, header, size); }
-  static void *getHeaderO(const string& headerid) { O->getHeader(headerid); }
+  static void writeHeaderO(int obsid, const string& headerid, char *header, long unsigned int size) { Os[obsid]->writeHeader(headerid, header, size); }
+  static void *getHeaderO(int obsid, const string& headerid) { Os[obsid]->getHeader(headerid); }

   static void writeHeaderC(const string& headerid, char *header, long unsigned int size) { C->writeHeader(headerid, header, size); }
   static void *getHeaderC(const string& headerid) { C->getHeader(headerid); }
 
   static void writeHeaderC(const string& headerid, char *header, long unsigned int size) { C->writeHeader(headerid, header, size); }
   static void *getHeaderC(const string& headerid) { C->getHeader(headerid); }
 


@@ -39,21 +42,21 @@ class hypercache {
 
   static void initCache(configcache **cache,
                        const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
 
   static void initCache(configcache **cache,
                        const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 

-                       char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL); 
+                       char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL, ostream* _log=NULL); 

 
   static void initCache( configcache **cache,
                         const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL);
 
 
   static void initCache( configcache **cache,
                         const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL);
 

-  static configcache *O;

   static configcache *C;
   static configcache *C;

+  static vector<configcache*> Os;

   static vector<para> delayedParaAdd;
   static vector<para> delayedParaSet;
   static vector<para> delayedParaAdd;
   static vector<para> delayedParaSet;

-  static writeout *out;

 
   static string fileOfPath(const string& dressedfile);
   static string activeCFile;
   static vector<unsigned long> parentConfigs;
   static void addParentConfig(const unsigned long *parentconfig);
 
   static string fileOfPath(const string& dressedfile);
   static string activeCFile;
   static vector<unsigned long> parentConfigs;
   static void addParentConfig(const unsigned long *parentconfig);

+  static ostream* log;

 };
 
 #endif
 };
 
 #endif