X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/d09f5f0aeff338a0262c3faf5272b82945a3bf8f..da120f552639e7e742161a2a4d6f88ca5277df8e:/o815/o815.h?ds=inline

diff --git a/o815/o815.h b/o815/o815.h
index b3ad62a..0505387 100644
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -3,7 +3,6 @@
 
 #include <string>
 #include <vector>
-#include <mpi.h>
 #include <stdlib.h>
 #include <getopt.h>
 
@@ -46,6 +45,7 @@ class o815 {
     void nextConfig();
     char *confMem;
     virtual void _newParas()=0;
+    virtual void _resetConfig()=0;
     int nequi, nskip;
   private:
     virtual void _makeSweep()=0;
@@ -65,6 +65,7 @@ class o815 {
     string outdir;
     int idonly;
     int showjobnum;
+    string startconfig;
   } comargs;
 
   struct comoption {
@@ -84,7 +85,7 @@ class o815 {
   vector<obs*> observables;
   sim* Sim;
   void mainLoop();
-  string headMaster();
+  string headMaster( bool hashedrange=false );
   void addPara(const string& paraid, const double& paraDefault);
   void addComOption(const char* name, int has_arg, int *flag, int val, const char* optdesc, const char* argdesc);
   vector< pair<int,char*> > parsedSpecOps;
@@ -92,13 +93,14 @@ class o815 {
 
 private:
   vector<comoption> comOptions;
-  MPI_Status mpiStatus;
   int numprocs, rank;
   static void listArg(int *target, int tlen, char *listarg);
   void parseArgs(int argc, char **argv, comoption specOps[]);
   string programid;
   int nextParas();
   comoption* getOptionByVal(int val);
+  static void readCacheArgs(const string& arg, string& cachedir, int& cachemode);
+  unsigned long hash(const string& str);
 };
 
 #endif