Changeset 20653 for issm/trunk-jpl/src/c/classes/IoModel.h

Timestamp:

05/26/16 00:34:45 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: testing new IoModel using jekins (no AD capability on my local machine)

File:

• issm/trunk-jpl/src/c/classes/IoModel.h (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/IoModel.h

@@ -9 +9 @@
 
 #include "../shared/Enum/Enum.h"
+#include <vector>
 
 class Parameters;
@@ -15 +16 @@
 class Option;
 
+class IoConstant { /*holds single IssmDouble, int, bool and char from input*/
+        public:
+                bool   isindependent;
+                int    data_enum;
+                char*  name;
+                Param* constant; 
+
+                ~IoConstant();
+                IoConstant();
+                IoConstant(bool value,int enum_in);
+                IoConstant(int value,int enum_in);
+                IoConstant(IssmDouble value,int enum_in);
+                IoConstant(char* value,int enum_in);
+};
+
+class IoData { /*holds temporary data (array), memory intensive*/
+        public:
+                bool        isindependent;
+                int         data_enum;
+                char*       name;
+                int         M,N;
+                int         code;
+                int         layout;
+                IssmDouble* data;
+
+                ~IoData();
+                IoData();
+                IoData(IssmDouble* matrix,int code,int layout_in,int M,int N,int enum_in);
+};
+
 class IoModel {
 
         private: 
-                Parameters *constants;   //this dataset holds all IssmDouble, int, bool and char from input
+                std::vector<IoConstant*> constants; //this dataset holds all IssmDouble, int, bool and char from input
+                std::vector<IoData*>     data;      //this dataset holds temporary data, memory intensive
+
+                /*for AD mode: to keep track of our independent variables we fetch:*/
+                //bool    *independents;
+                //DataSet *independent_objects;
 
         public:
-                IssmDouble **data;   //this dataset holds temporary data, memory intensive.
-
                 /*pointer to input file*/
                 FILE *fid;
@@ -55 +89 @@
                 int constraintcounter;   //keep track of how many constraints are being created in each analysis
 
-                /*for AD mode: to keep track of our independent variables we fetch:*/
-                bool    *independents;
-                DataSet *independent_objects;
-
                 /*Methods*/
                 ~IoModel();
@@ -64 +94 @@
                 IoModel(FILE* iomodel_handle,int solution_enum_in,bool trace,IssmPDouble* X);
 
+                /*NEW*/
+                void        AddConstant(IoConstant* constant_in);
+                void        AddConstantIndependent(IoConstant* constant_in);
+                void        AddData(IoData* data_in);
+                void        AddDataIndependent(IoData* data_in);
+                void        FindConstant(bool* pvalue,int constant_enum);
+                void        FindConstant(int* pvalue,int constant_enum);
+                void        FindConstant(IssmDouble* pvalue,int constant_enum);
+                void        FindConstant(char **pvalue,int constant_enum);
+                void        FetchIndependentConstant(int* pXcount,IssmPDouble* X,int name);
+                void        FetchIndependentData(int* pXcount,IssmPDouble* X,int name);
+                int         NumIndependents();
+                void        FillIndependents(IssmDouble* xp);
+
                 /*Input/Output*/
                 void        CheckEnumSync(void);
-                void        FindConstant(bool *poutput,int constant_enum);
-                void        FindConstant(int *poutput,int constant_enum);
-                void        FindConstant(IssmDouble *poutput,int constant_enum);
-                void        FindConstant(char **poutput,int constant_enum);
                 Param      *CopyConstantObject(int constant_enum);
                 IssmDouble *Data(int dataenum);