Changeset 22758 for issm/trunk/src/c/classes/Params/Param.h

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Params/Param.h (modified) (3 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

issm/trunk/src/c/classes/Params/Param.h

@@ -19 +19 @@
 /*}}}*/
 
-class Param{
+class Param: public Object{
 
         public: 
@@ -34 +34 @@
                 virtual void  GetParameterValue(IssmDouble* pIssmDouble)=0;
                 virtual void  GetParameterValue(IssmDouble* pdouble,IssmDouble time)=0;
+                virtual void  GetParameterValue(IssmDouble* pdouble,int row, IssmDouble time){_error_("not implemented yet");};
                 virtual void  GetParameterValue(char** pstring)=0;
                 virtual void  GetParameterValue(char*** pstringarray,int* pM)=0;
@@ -53 +54 @@
                 virtual void  SetValue(char* string)=0;
                 virtual void  SetValue(char** stringarray,int M)=0;
+                virtual void  SetValue(DataSet* dataset){_error_("not implemented yet");};
                 virtual void  SetValue(IssmDouble* IssmDoublearray,int M)=0;
                 virtual void  SetValue(IssmDouble* pIssmDoublearray,int M,int N)=0;

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod