Changeset 12872 for issm/branches/trunk-jpl-damage/src/c/objects/Inputs/TriaP1Input.cpp

Timestamp:

08/02/12 09:52:47 (13 years ago)

Author:

cborstad

Message:

stripped inversion threshold out of code, not used

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/objects/Inputs/TriaP1Input.cpp (modified) (3 diffs)

issm/branches/trunk-jpl-damage/src/c/objects/Inputs/TriaP1Input.cpp

@@ -329 +329 @@
 /*}}}*/
 /*FUNCTION TriaP1Input::Constrain{{{1*/
-void TriaP1Input::Constrain(double cm_min, double cm_max, double cm_thresh){
+void TriaP1Input::Constrain(double cm_min, double cm_max){
 
         int i;
@@ -336 +336 @@
         if(!isnan(cm_min)) for(i=0;i<numnodes;i++)if (this->values[i]<cm_min)this->values[i]=cm_min;
         if(!isnan(cm_max)) for(i=0;i<numnodes;i++)if (this->values[i]>cm_max)this->values[i]=cm_max;
-        if(!isnan(cm_thresh)) for(i=0;i<numnodes;i++)if (this->values[i]<cm_thresh)this->values[i]=cm_min;
 
 }
@@ -417 +416 @@
 }
 /*}}}*/
-/*FUNCTION TriaP1Input::PointwiseThresh{{{1*/
-Input* TriaP1Input::PointwiseThresh(Input* inputB, Input* inputC){
-        /*pointwise comparison to inputB.  If less than inputB, set nodal output to input C*/
-
-        /*Ouput*/
-        TriaP1Input* outinput=NULL;
-
-        /*Intermediaries*/
-        int               i;
-        TriaP1Input *xinputB     = NULL;
-        TriaP1Input *xinputC     = NULL;
-        int               B_numvalues; /* doesn't look like this is used */
-        const int         numnodes    = 3;
-        double            threshvalues[numnodes];
-
-        /*Check that inputB is of the same type*/
-        if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum()));
-        xinputB=(TriaP1Input*)inputB;
-
-        /*Check that inputC is of the same type*/
-        if (inputC->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputC is of type %s",EnumToStringx(inputC->ObjectEnum()));
-        xinputC=(TriaP1Input*)inputC;
-
-        /*Create point wise thresh*/
-        for(i=0;i<numnodes;i++){
-                if(this->values[i] < xinputB->values[i]) threshvalues[i]=xinputC->values[i];
-                else threshvalues[i]=this->values[i];
-        }
-
-        /*Create new Tria vertex input (copy of current input)*/
-        outinput=new TriaP1Input(this->enum_type,&threshvalues[0]);
-
-        /*Return output pointer*/
-        return outinput;
-
-}
-/*}}}*/
 /*FUNCTION TriaP1Input::Configure{{{1*/
 void TriaP1Input::Configure(Parameters* parameters){