Changeset 24790 for issm/trunk-jpl/src/c/classes/Inputs2/TriaInput2.cpp

Timestamp:

05/05/20 06:20:58 (5 years ago)

Author:

bdef

Message:

NEW: adding several averaging methods to pass from substep to main step

File:

• issm/trunk-jpl/src/c/classes/Inputs2/TriaInput2.cpp (modified) (7 diffs)

issm/trunk-jpl/src/c/classes/Inputs2/TriaInput2.cpp

@@ -142 +142 @@
 
         _assert_(this);
-        _assert_(row>=0); 
-        _assert_(row<this->M); 
+        _assert_(row>=0);
+        _assert_(row<this->M);
         _assert_(this->N==1);
 
@@ -157 +157 @@
                 for(int i=0;i<numindices;i++){
                         int row = indices[i];
-                        _assert_(row>=0); 
-                        _assert_(row<this->M); 
+                        _assert_(row>=0);
+                        _assert_(row<this->M);
                         this->values[row] = values_in[i];
                 }
@@ -166 +166 @@
                 for(int i=0;i<numindices;i++){
                         int row = indices[i];
-                        _assert_(row>=0); 
-                        _assert_(row<this->M); 
+                        _assert_(row>=0);
+                        _assert_(row<this->M);
                         this->values[row] = values_in[i];
                 }
@@ -175 +175 @@
                 for(int i=0;i<numindices;i++){
                         int row = indices[i];
-                        _assert_(row>=0); 
-                        _assert_(row<this->M); 
+                        _assert_(row>=0);
+                        _assert_(row<this->M);
                         this->values[row] = values_in[i];
                 }
@@ -207 +207 @@
         for(int i=0;i<numindices;i++){
                 int row = indices[i];
-                _assert_(row>=0); 
-                _assert_(row<this->M); 
+                _assert_(row>=0);
+                _assert_(row<this->M);
                 this->element_values[i] = this->values[row];
         }
@@ -364 +364 @@
 }
 /*}}}*/
+void TriaInput2::Pow(IssmDouble alpha){/*{{{*/
+
+        for(int i=0;i<this->M*this->N;i++) this->values[i] = pow(this->values[i],alpha);
+        for(int i=0;i<TriaRef::NumberofNodes(this->interpolation);i++) this->element_values[i] = pow(this->element_values[i],alpha);
+}
+/*}}}*/
 void TriaInput2::AXPY(Input2* xinput,IssmDouble alpha){/*{{{*/
 
@@ -376 +382 @@
 }
 /*}}}*/
+void TriaInput2::PointWiseMult(Input2* xinput){/*{{{*/
+
+        /*xinput is of the same type, so cast it: */
+        if(xinput->ObjectEnum()!=TriaInput2Enum) _error_("Operation not permitted because xinput is of type " << EnumToStringx(xinput->ObjectEnum()));
+        TriaInput2* xtriainput=xDynamicCast<TriaInput2*>(xinput);
+        if(xtriainput->GetInterpolation()!=this->interpolation) _error_("Operation not permitted because xinput is of type " << EnumToStringx(xinput->ObjectEnum()));
+
+        /* we need to check that the vector sizes are identical*/
+        if(xtriainput->M!=this->M||xtriainput->N!=this->N) _error_("Operation not permitted because the inputs have different sizes");
+
+        /*Carry out the AXPY operation depending on type:*/
+        for(int i=0;i<this->M*this->N;i++) this->values[i] = xtriainput->values[i] * this->values[i];
+        for(int i=0;i<TriaRef::NumberofNodes(this->interpolation);i++) this->element_values[i] = xtriainput->element_values[i] * this->element_values[i];
+}
+/*}}}*/
 
 /*Object functions*/