Changeset 22758 for issm/trunk/src/c/classes/Inputs/TetraInput.cpp

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Inputs/TetraInput.cpp (modified) (3 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

issm/trunk/src/c/classes/Inputs/TetraInput.cpp

@@ -238 +238 @@
 }
 /*}}}*/
-void TetraInput::Constrain(IssmDouble cm_min, IssmDouble cm_max){/*{{{*/
-
-        int i;
-        const int numnodes=this->NumberofNodes(this->interpolation_type);
-
-        if(!xIsNan<IssmDouble>(cm_min)) for(i=0;i<numnodes;i++)if (this->values[i]<cm_min)this->values[i]=cm_min;
-        if(!xIsNan<IssmDouble>(cm_max)) for(i=0;i<numnodes;i++)if (this->values[i]>cm_max)this->values[i]=cm_max;
-
-}
-/*}}}*/
-void TetraInput::ConstrainMin(IssmDouble minimum){/*{{{*/
-
-        int numnodes = this->NumberofNodes(this->interpolation_type);
-        for(int i=0;i<numnodes;i++) if (values[i]<minimum) values[i]=minimum;
-}
-/*}}}*/
 void TetraInput::GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){/*{{{*/
         const int numvertices=4;
         vector->SetValues(numvertices,doflist,this->values,INS_VAL);
 } /*}}}*/
-IssmDouble TetraInput::InfinityNorm(void){/*{{{*/
-
-        /*Output*/
-        IssmDouble norm=0.;
-        int numnodes=this->NumberofNodes(this->interpolation_type);
-
-        for(int i=0;i<numnodes;i++) if(fabs(values[i])>norm) norm=fabs(values[i]);
-        return norm;
-}
-/*}}}*/
 IssmDouble TetraInput::MinAbs(void){/*{{{*/
 
@@ -312 +286 @@
 }
 /*}}}*/
-Input* TetraInput::PointwiseDivide(Input* inputB){/*{{{*/
-
-        /*Ouput*/
-        TetraInput* outinput=NULL;
-
-        /*Intermediaries*/
-        TetraInput *xinputB  = NULL;
-        const int   numnodes = this->NumberofNodes(this->interpolation_type);
-
-        /*Check that inputB is of the same type*/
-        if(inputB->ObjectEnum()!=TetraInputEnum)     _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
-        xinputB=(TetraInput*)inputB;
-        if(xinputB->interpolation_type!=this->interpolation_type) _error_("Operation not permitted because inputB is of type " << EnumToStringx(xinputB->interpolation_type));
-
-        /*Allocate intermediary*/
-        IssmDouble* AdotBvalues=xNew<IssmDouble>(numnodes);
-
-        /*Create point wise division*/
-        for(int i=0;i<numnodes;i++){
-                _assert_(xinputB->values[i]!=0);
-                AdotBvalues[i]=this->values[i]/xinputB->values[i];
-        }
-
-        /*Create new Tetra vertex input (copy of current input)*/
-        outinput=new TetraInput(this->enum_type,AdotBvalues,this->interpolation_type);
-
-        /*Return output pointer*/
-        xDelete<IssmDouble>(AdotBvalues);
-        return outinput;
-
-}
-/*}}}*/
-Input* TetraInput::PointwiseMax(Input* inputB){/*{{{*/
-
-        /*Ouput*/
-        TetraInput* outinput=NULL;
-
-        /*Intermediaries*/
-        int         i;
-        TetraInput  *xinputB   = NULL;
-        const int   numnodes  = this->NumberofNodes(this->interpolation_type);
-        IssmDouble *maxvalues = xNew<IssmDouble>(numnodes);
-
-        /*Check that inputB is of the same type*/
-        if(inputB->ObjectEnum()!=TetraInputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
-        xinputB=(TetraInput*)inputB;
-        if(xinputB->interpolation_type!=this->interpolation_type) _error_("Operation not permitted because inputB is of type " << EnumToStringx(xinputB->interpolation_type));
-
-        /*Create point wise max*/
-        for(i=0;i<numnodes;i++){
-                if(this->values[i] < xinputB->values[i]) maxvalues[i]=xinputB->values[i];
-                else maxvalues[i]=this->values[i];
-        }
-
-        /*Create new Tetra vertex input (copy of current input)*/
-        outinput=new TetraInput(this->enum_type,&maxvalues[0],this->interpolation_type);
-
-        /*Return output pointer*/
-        xDelete<IssmDouble>(maxvalues);
-        return outinput;
-
-}
-/*}}}*/
-Input* TetraInput::PointwiseMin(Input* inputB){/*{{{*/
-
-        /*Ouput*/
-        TetraInput* outinput=NULL;
-
-        /*Intermediaries*/
-        int         i;
-        TetraInput  *xinputB   = NULL;
-        const int   numnodes  = this->NumberofNodes(this->interpolation_type);
-        IssmDouble *minvalues = xNew<IssmDouble>(numnodes);
-
-        /*Check that inputB is of the same type*/
-        if(inputB->ObjectEnum()!=TetraInputEnum)       _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
-        xinputB=(TetraInput*)inputB;
-        if(xinputB->interpolation_type!=this->interpolation_type) _error_("Operation not permitted because inputB is of type " << EnumToStringx(xinputB->interpolation_type));
-
-        /*Create point wise min*/
-        for(i=0;i<numnodes;i++){
-                if(this->values[i] > xinputB->values[i]) minvalues[i]=xinputB->values[i];
-                else minvalues[i]=this->values[i];
-        }
-
-        /*Create new Tetra vertex input (copy of current input)*/
-        outinput=new TetraInput(this->enum_type,&minvalues[0],this->interpolation_type);
-
-        /*Return output pointer*/
-        xDelete<IssmDouble>(minvalues);
-        return outinput;
-
-}
-/*}}}*/
 void TetraInput::Scale(IssmDouble scale_factor){/*{{{*/
 
@@ -418 +298 @@
 }
 /*}}}*/
-void TetraInput::SquareMin(IssmDouble* psquaremin,Parameters* parameters){/*{{{*/
-
-        int        numnodes=this->NumberofNodes(this->interpolation_type);
-        IssmDouble squaremin;
-
-        /*Now, figure out minimum of valuescopy: */
-        squaremin=pow(this->values[0],2);
-        for(int i=1;i<numnodes;i++){
-                if(pow(this->values[i],2)<squaremin)squaremin=pow(this->values[i],2);
-        }
-        /*Assign output pointers:*/
-        *psquaremin=squaremin;
-}
-/*}}}*/

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod