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

Timestamp:

05/22/20 10:13:54 (5 years ago)

Author:

Eric.Larour

Message:

CHG: removed maskpsl, switched groundedice_levelset to ocean_levelset (thanks Mathieu!).
Adapted tests 2002 to 2010

File:

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

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

@@ -5449 +5449 @@
 IssmDouble    Tria::OceanArea(void){ /*{{{*/
 
-        if(IsWaterInElement()) return GetAreaSpherical();
+        if(IsOceanInElement()) return GetAreaSpherical();
         else return 0;
 
@@ -5456 +5456 @@
 IssmDouble Tria::OceanAverage(IssmDouble* Sg){ /*{{{*/
 
-        if(IsWaterInElement()){
+        if(IsOceanInElement()){
 
                 IssmDouble area;
@@ -5475 +5475 @@
 void    Tria::SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea){/*{{{*/
         /*early return if we are not on an ice cap OR ocean:*/
-        if(!IsIceOnlyInElement() && !IsWaterInElement()){
+        if(!IsIceOnlyInElement() && !IsOceanInElement()){
                 dI_list[0] = 0.0; // this is important!!!
                 dI_list[1] = 0.0; // this is important!!!
@@ -5528 +5528 @@
         re=(llr_list[0][2]+llr_list[1][2]+llr_list[2][2])/3.0;
 
-        if(IsWaterInElement()){
+        if(IsOceanInElement()){
                 IssmDouble rho_water, S;
 
@@ -5973 +5973 @@
 
         /*early return if we are not on the ocean:*/
-        if (!IsWaterInElement()){
+        if (!IsOceanInElement()){
                 constant=0; this->AddInput2(SealevelEustaticOceanMaskEnum,&constant,P0Enum);
                 return;
@@ -6126 +6126 @@
 
         /*early return if we are not on the ocean or on an ice cap:*/
-        if(!IsIceOnlyInElement() && !IsWaterInElement()) return;
+        if(!IsIceOnlyInElement() && !IsOceanInElement()) return;
 
         /*early return if we are fully floating: */
@@ -6268 +6268 @@
                         }
                 }
-                else if(IsWaterInElement()) {
+                else if(IsOceanInElement()) {
                         U_values[i]+=3*rho_water/rho_earth*area/eartharea*S*U_elastic[i];
                         if(horiz){