Changeset 24240 for issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp

Timestamp:

10/17/19 06:03:43 (5 years ago)

Author:

bdef

Message:

Adding a substeping framework in hydro and part of smb

File:

• issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp

@@ -126 +126 @@
         SegInput* outinput=NULL;
 
-        if(this->interpolation_type==P0Enum){ 
+        if(this->interpolation_type==P0Enum){
                 outinput=new SegInput(this->enum_type,&this->values[0],P0Enum);
         }
@@ -165 +165 @@
 }
 /*}}}*/
-void TriaInput::GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){/*{{{*/
+void TriaInput::GetInputAveragesOnAllTime(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){/*{{{*/
 
         IssmDouble* outvalues=NULL;
@@ -224 +224 @@
 /*}}}*/
 
-void TriaInput::GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){/*{{{*/
+void TriaInput::GetInputAveragesUpToCurrentTime(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){/*{{{*/
 
         IssmDouble* outvalues=NULL;
@@ -320 +320 @@
 }
 /*}}}*/
+void TriaInput::PointwiseMult(Input* xinput){/*{{{*/
+
+        const int numnodes=this->NumberofNodes(this->interpolation_type);
+        TriaInput* xtriainput=NULL;
+
+
+        /*xinput is of the same type, so cast it: */
+        if(xinput->ObjectEnum()!=TriaInputEnum) _error_("Operation not permitted because xinput is of type " << EnumToStringx(xinput->ObjectEnum()));
+        xtriainput=(TriaInput*)xinput;
+        if(xtriainput->interpolation_type!=this->interpolation_type) _error_("Operation not permitted because xinput is of type " << EnumToStringx(xtriainput->interpolation_type));
+
+        /*Carry out the PointwiseMult operation depending on type:*/
+        for(int i=0;i<numnodes;i++)this->values[i]=this->values[i]*xtriainput->values[i];
+
+}
+/*}}}*/
+void TriaInput::Pow(IssmDouble exponent){/*{{{*/
+
+        const int numnodes=this->NumberofNodes(this->interpolation_type);
+        if(exponent==0.0){
+                /*  Not-a-number left alone Infinity set to one  */
+                for(int i=0;i<numnodes;i++){
+                        if (this->values[i]==this->values[i])this->values[i]=1.0;
+                }
+        }
+        else if(exponent==0.5){
+                for(int i=0;i<numnodes;i++){
+                        if(this->values[i]>=0){
+                                this->values[i]=sqrt(this->values[i]);
+                        }
+                        else{
+                                this->values[i]=INFINITY;
+                        }
+                }
+        }
+        else if(exponent==1.0){
+                /* do nothing */
+        }
+        else if(exponent==-0.5){
+                for(int i=0;i<numnodes;i++){
+                        if(this->values[i]>=0){
+                                this->values[i]=1.0/sqrt(this->values[i]);
+                        }
+                        else{
+                                this->values[i]=INFINITY;
+                        }
+                }
+        }
+        else if(exponent==-1.0){
+                for(int i=0;i<numnodes;i++){
+                        if(this->values[i]!=0.){
+                                this->values[i]=1.0/this->values[i];
+                        }
+                        else{
+                                this->values[i]=INFINITY;
+                        }
+                }
+        }
+        else {
+                for(int i=0;i<numnodes;i++)this->values[i]=pow(this->values[i],exponent);
+        }
+}
+/*}}}*/
 void TriaInput::Scale(IssmDouble scale_factor){/*{{{*/