Changeset 22588

Timestamp:

03/20/18 17:46:13 (7 years ago)

Author:

erobo

Message:

CHG: fix nightly tests errors

Location:

issm/trunk-jpl/src/c/classes/Params

Files:

• DataSetParam.cpp (modified) (2 diffs)
• DataSetParam.h (modified) (1 diff)
• Param.h (modified) (1 diff)
• Parameters.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Params/DataSetParam.cpp

@@ -24 +24 @@
 
         enum_type=in_enum_type;
-        value=in_value->Copy();;
+        value=in_value->Copy();
 }
 /*}}}*/
@@ -74 +74 @@
 }
 /*}}}*/
+void DataSetParam::SetValue(DataSet* dataset){/*{{{*/
+        this->value=dataset;
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/Params/DataSetParam.h

@@ -70 +70 @@
                 void  SetValue(Vector<IssmDouble>* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
                 void  SetValue(Matrix<IssmDouble>* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
-                void  SetValue(DataSet* dataset){_error_("DataSet param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a DataSet yet");}
+                void  SetValue(DataSet* dataset);
                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("DataSet param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");}
                 /*}}}*/

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

@@ -53 +53 @@
                 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;

issm/trunk-jpl/src/c/classes/Params/Parameters.cpp

@@ -554 +554 @@
         param=xDynamicCast<Param*>(this->FindParamObject(enum_type));
 
-        if(param) param->SetValue(dataset); //already exists, just set it.
-        else this->AddObject(new DataSetParam(enum_type,dataset)); //just add the new parameter.
+        if(param){
+                param->SetValue(dataset); //already exists, just set it.
+        }
+        else{
+                this->AddObject(new DataSetParam(enum_type,dataset)); //just add the new parameter.
+        }
 }
 /*}}}*/