improved argument handling.

[phys/latlib.git] / hypercache.cpp

diff --git a/hypercache.cpp b/hypercache.cpp
index 6c8e190a032ead4876f6985ce0bb9a374c2c188e..03a20f8f518519e1aaf08108a3a9f3b36cfa57e9 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -5,16 +5,16 @@ vector<hypercache::para> hypercache::delayedParaAdd;
 vector<hypercache::para> hypercache::delayedParaSet;
 string hypercache::activeCFile = "";
 vector<unsigned long> hypercache::parentConfigs;
-writeout *hypercache::out = NULL;
+ostream* hypercache::log;
 vector<configcache*> hypercache::Os;
 
 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) {
-  if ( out_a != NULL )
-    out = out_a;
+                          char **configmem, const int& configMemSize, const int& cachemode, ostream* _log) {
+  if ( _log != NULL )
+    log = _log;
   
-  *cache = new configcache(cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
+  *cache = new configcache(cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, log);
   
   for (vector<para>::iterator parit=delayedParaAdd.begin(); parit != delayedParaAdd.end(); ++parit)
     (*cache)->addPara(parit->parid, parit->val);
@@ -73,6 +73,12 @@ int hypercache::readC() {
   return readret; 
 }
 
+int hypercache::read1CForEqui() {
+  int readret = C->readConfig(NULL);
+  C->closeInFile();
+  return readret;
+}
+
 void hypercache::writeC() {
   C->writeConfig();
   activeCFile = fileOfPath( C->getOutFileName().substr( 0, C->getOutFileName().length()-4 ) );