Changeset 25235

Timestamp:

07/08/20 20:18:48 (5 years ago)

Author:

Eric.Larour

Message:

CHG: we wiped out the eustatic counter by introducing the hydro sea level change core. Fixed that.

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -5805 +5805 @@
         IssmDouble rho_freshwater;
 
-        /*constants:*/
-        IssmDouble constant=0;
-
-        /*Initialize eustatic component: do not skip this step :):*/
-        IssmDouble eustatic = 0.;
+
+        /*Initialize eustatic component: grab from the previous eustatic core!:*/
+        IssmDouble eustatic = *peustatic;
 
         /*early return if we are on an ice cap:*/
-        if(masks->isiceonly[this->lid]){ *peustatic=0; return; }
+        if(masks->isiceonly[this->lid]){ return; }
 
         /*early return if we are fully floating:*/
-        if (masks->isfullyfloating[this->lid]){ constant=0; *peustatic=0; return; }
+        if (masks->isfullyfloating[this->lid]){ return; }
 
         /*If we are here, we are on earth, not on ice: */
@@ -5850 +5848 @@
         /*Assign output pointer:*/
         _assert_(!xIsNan<IssmDouble>(eustatic));
-        *peustatic=eustatic;
+        *peustatic+=eustatic; //do not forget the +, otherwise, you'll wipe out previous eustatic contributions!
         return;
 }