Changeset 13975 for issm/trunk/src/c/classes/objects/Params/GenericParam.h

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

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

issm/trunk/src/c/classes/objects/Params/GenericParam.h

@@ -49 +49 @@
                 void  Echo() {DeepEcho();};
                 int   Id(){ return -1; };
-                int   MyRank() { extern int my_rank; return my_rank;} ;
                 int   ObjectEnum() {return AdolcParamEnum;};
 
@@ -80 +79 @@
                 void  GetParameterValue(Matrix<IssmDouble>** pmat){_error_("Param "<< EnumToStringx(myEnumVal) << " cannot return a Mat");}
                 void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(myEnumVal) << " cannot return a FILE");}
+                                void  GetParameterValue(DataSet** pdataset){_error_("Param "<< EnumToStringx(myEnumVal) << " cannot return a DataSet");}
 
                 void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(myEnumVal) << " cannot hold a bool");}
@@ -99 +99 @@
 };
 
-
 #endif /* GENERICPARAM_H_ */