Changeset 12482

Timestamp:

06/20/12 14:51:05 (13 years ago)

Author:

utke

Message:

casting to bool and int implies non-differentiability

Location:

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

Files:

• BoolParam.h (modified) (1 diff)
• IntParam.h (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Params/BoolParam.h

@@ -58 +58 @@
                 void  SetValue(bool boolean){this->value=boolean;}
                 void  SetValue(int integer){this->value=(bool)integer;}
-                void  SetValue(IssmDouble scalar){this->value=(bool)scalar;}
+                void  SetValue(IssmPDouble scalar){this->value=(bool)scalar;}
                 void  SetValue(char* string){_error_("Bool param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));}
                 void  SetValue(char** stringarray,int M){_error_("Bool param of enum %i (%s) cannot hold a string array",enum_type,EnumToStringx(enum_type));}

issm/trunk-jpl/src/c/objects/Params/IntParam.h

@@ -61 +61 @@
                 void  SetValue(int* intarray,int M){_error_("Int param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));}
                 void  SetValue(int* intarray,int M,int N){_error_("Int param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));}
-                void  SetValue(IssmDouble scalar){this->value=(int)scalar;}
+                void  SetValue(IssmPDouble scalar){this->value=(int)scalar;}
                 void  SetValue(char* string){_error_("Int param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));}
                 void  SetValue(char** stringarray,int M){_error_("Int param of enum %i (%s) cannot hold a string array",enum_type,EnumToStringx(enum_type));}