Changeset 12330 for issm/trunk/src/c/objects/IoModel.h

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/objects/IoModel.h (modified) (2 diffs)

issm/trunk/src/c/objects/IoModel.h

@@ -19 +19 @@
         private: 
                 FILE        *fid;         //pointer to input file
-                double     **data;        //this dataset holds temporary data, memory intensive.
-                Parameters  *constants;   //this dataset holds all double, int, bool and char *parameters read in from the input file.*
+                IssmDouble     **data;        //this dataset holds temporary data, memory intensive.
+                Parameters  *constants;   //this dataset holds all IssmDouble, int, bool and char *parameters read in from the input file.*
 
         public:
@@ -41 +41 @@
 
                 /*Input/Output*/
-                void        Constant(bool   *poutput,int constant_enum);
-                void        Constant(int    *poutput,int constant_enum);
-                void        Constant(double *poutput,int constant_enum);
-                void        Constant(char  **poutput,int constant_enum);
-                Param      *CopyConstantObject(int constant_enum);
-                double     *Data(int dataenum);
-                void        DeleteData(int num,...);
-                void        FetchConstants(void);
-                void        FetchData(bool*     pboolean,int data_enum);
-                void        FetchData(int*      pinteger,int data_enum);
-                void        FetchData(double*   pscalar,int data_enum);
-                void        FetchData(char**    pstring,int data_enum);
-                void        FetchData(int** pmatrix,int* pM,int* pN,int data_enum);
-                void        FetchData(double**  pscalarmatrix,int* pM,int* pN,int data_enum);
-                void        FetchData(char***   pstringarray,int* pnumstrings,int data_enum);
-                void        FetchData(double*** pmatrixarray,int** pmdims,int** pndims, int* pnumrecords,int data_enum);
-                void        FetchData(int num,...);
-                void        FetchDataToInput(Elements* elements,int vector_enum,int default_vector_enum=NoneEnum,double default_value=0);
-                FILE*       SetFilePointerToData(int* pcode,int* pvector_type, int data_enum);
+                void    CheckEnumSync(void);
+                void    Constant(bool   *poutput,int constant_enum);
+                void    Constant(int    *poutput,int constant_enum);
+                void    Constant(IssmDouble *poutput,int constant_enum);
+                void    Constant(char  **poutput,int constant_enum);
+                Param  *CopyConstantObject(int constant_enum);
+                IssmDouble *Data(int dataenum);
+                void    DeleteData(int num,...);
+                void    FetchConstants(void);
+                void    FetchData(bool*     pboolean,int data_enum);
+                void    FetchData(int*      pinteger,int data_enum);
+                void    FetchData(IssmDouble*   pscalar,int data_enum);
+                void    FetchData(char**    pstring,int data_enum);
+                void    FetchData(int** pmatrix,int* pM,int* pN,int data_enum);
+                void    FetchData(IssmDouble**  pscalarmatrix,int* pM,int* pN,int data_enum);
+                void    FetchData(char***   pstringarray,int* pnumstrings,int data_enum);
+                void    FetchData(IssmDouble*** pmatrixarray,int** pmdims,int** pndims, int* pnumrecords,int data_enum);
+                void    FetchData(int num,...);
+                void    FetchDataToInput(Elements* elements,int vector_enum,int default_vector_enum=NoneEnum,IssmDouble default_value=0);
+                FILE*   SetFilePointerToData(int* pcode,int* pvector_type, int data_enum);
 };