Changeset 12554

Timestamp:

06/26/12 11:01:16 (13 years ago)

Author:

utke

Message:

applying constrains to bool does not makes (checked w M. Morlighem); use reCast;

Location:

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

Files:

• BoolInput.cpp (modified) (2 diffs)
• BoolInput.h (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp

@@ -157 +157 @@
 
                 case BoolInputEnum:
-                        this->value=(bool)(this->value+scalar*xboolinput->value);
+                        this->value=reCast<bool,IssmDouble>(this->value+scalar*xboolinput->value);
                         return;
 
@@ -163 +163 @@
                         _error2_("not implemented yet");
         }
-
-}
-/*}}}*/
-/*FUNCTION BoolInput::Constrain{{{*/
-void BoolInput::Constrain(IssmDouble cm_min, IssmDouble cm_max){
-
-        if(!xIsNan<IssmDouble>(cm_min)) if (this->value<cm_min)this->value=cm_min;
-        if(!xIsNan<IssmDouble>(cm_max)) if (this->value>cm_max)this->value=cm_max;
 
 }

issm/trunk-jpl/src/c/objects/Inputs/BoolInput.h

@@ -74 +74 @@
                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
                 void AXPY(Input* xinput,IssmDouble scalar);
-                void Constrain(IssmDouble cm_min, IssmDouble cm_max);
+                void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error2_("Constrain not implemented for booleans");};
                 void Extrude(void);
                 void VerticallyIntegrate(Input* thickness_input){_error2_("not supported yet");};