Added MPI_DISABLED cmake switch.

[phys/latlib.git] / o815 / o815.h

diff --git a/o815/o815.h b/o815/o815.h
index 9f980f7996a790c1236a89d87dcd961baa18bebc..4f741a1e093283e3d1ca5010d58b0cf901bedb29 100644 (file)
--- 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>
 
@@ -20,15 +19,16 @@ class o815 {
 
   class obs {
   public:
-    obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize);
+    obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize, const string& _obsidpostfix="");
     void finish();
-    void meas(bool loadedobs);
+    void meas(bool loadedobs, const int& nthmeas);
     void start();
     string getDataDesc() { return datadesc; };
     int ocid;
     string obsid;
+    string obsidpostfix;
   private:
-    virtual void _meas(bool loadedobs)=0;
+    virtual void _meas(bool loadedobs, const int& nthmeas)=0;
     virtual void _finish()=0;
     virtual void _start()=0;
   protected:
@@ -45,12 +45,13 @@ class o815 {
     void nextConfig();
     char *confMem;
     virtual void _newParas()=0;
+    int nequi, nskip;
   private:
     virtual void _makeSweep()=0;
   protected:
     o815 *O815;
     ostream *log;
-    int nequi, nskip, confmemSize;
+    int confmemSize;
   };
 
   struct {
@@ -90,7 +91,6 @@ 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[]);