Changeset 24359

Timestamp:

11/19/19 14:57:47 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixinf SLR

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.cpp (modified) (1 diff)
• Element.h (modified) (1 diff)
• Tria.cpp (modified) (10 diffs)

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

@@ -2131 +2131 @@
         Input2* input=this->GetInput2(MaskIceLevelsetEnum); _assert_(input);
         return (input->GetInputMin()<0.);
+}
+/*}}}*/
+bool       Element::IsIceOnlyInElement(){/*{{{*/
+        Input2* input=this->GetInput2(MaskIceLevelsetEnum); _assert_(input);
+        return (input->GetInputMax()<0.);
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -146 +146 @@
                 bool               IsOnSurface();
                 bool               IsIceInElement();
+                bool               IsIceOnlyInElement();
                 bool               IsLandInElement();
                 void               Ismip6FloatingiceMeltingRate();

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

@@ -3012 +3012 @@
 
         if(!IsIceInElement())return 0.;
-        //if(!(this->inputs->Max(MaskIceLevelsetEnum)<0)) return 0;
+        //if(!IsIceOnlyInElement()) return 0;
 
         int domaintype;
@@ -4114 +4114 @@
 
         /*Add input*/
-        this->inputs->AddInput(new TriaInput(CalvingMeltingrateEnum,&meltrates[0],P1Enum));
+        this->AddInput2(CalvingMeltingrateEnum,&meltrates[0],P1Enum);
 
         /*Cleanup and return*/
@@ -5592 +5592 @@
 void    Tria::SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea){/*{{{*/
         /*early return if we are not on an ice cap OR ocean:*/
-        if(!(this->inputs->Max(MaskIceLevelsetEnum)<0) && !IsWaterInElement()){
+        if(!IsIceOnlyInElement() && !IsWaterInElement()){
                 dI_list[0] = 0.0; // this is important!!!
                 dI_list[1] = 0.0; // this is important!!!
@@ -5663 +5663 @@
                 dI_list[2] = +4*PI*(rho_water*S*area)*pow(re,4)*(1-pow(sin(late),2))/eartharea;
         }
-        else if(this->inputs->Max(MaskIceLevelsetEnum)<0){
+        else if(IsIceOnlyInElement()){
                 IssmDouble rho_ice, I;
 
@@ -5713 +5713 @@
 
         /*early return if we are not on an ice cap:*/
-        if(!(this->inputs->Max(MaskIceLevelsetEnum)<=0)){
-                constant=0; this->inputs->AddInput(new TriaInput(SealevelEustaticMaskEnum,&constant,P0Enum));
+        if(!IsIceOnlyInElement()){
+                constant=0; this->AddInput2(SealevelEustaticMaskEnum,&constant,P0Enum);
                 *peustatic=0; //do not forget to assign this pointer, otherwise, global eustatic will be garbage!
                 return;
@@ -5720 +5720 @@
 
         /*early return if we are fully floating: */
-        if (this->inputs->Max(MaskGroundediceLevelsetEnum)<=0){
-                constant=0; this->inputs->AddInput(new TriaInput(SealevelEustaticMaskEnum,&constant,P0Enum));
+        Input2* gr_input=this->GetInput2(MaskGroundediceLevelsetEnum); _assert_(gr_input);
+        if (gr_input->GetInputMax()<=0){
+                constant=0; this->AddInput2(SealevelEustaticMaskEnum,&constant,P0Enum);
                 *peustatic=0; //do not forget to assign this pointer, otherwise, global eustatic will be garbage!
                 return;
@@ -5727 +5728 @@
 
         /*If we are here, we are on ice that is fully grounded or half-way to floating: */
-        if ((this->inputs->Min(MaskGroundediceLevelsetEnum))<0){
+        if ((gr_input->GetInputMin())<0){
                 notfullygrounded=true; //used later on.
         }
 
         /*Inform mask: */
-        constant=1; this->inputs->AddInput(new TriaInput(SealevelEustaticMaskEnum,&constant,P0Enum));
+        constant=1; this->AddInput2(SealevelEustaticMaskEnum,&constant,P0Enum);
 
         /*recover material parameters: */
@@ -5916 +5917 @@
         /*early return if we are not on the ocean:*/
         if (!IsWaterInElement()){
-                constant=0; this->inputs->AddInput(new TriaInput(SealevelEustaticOceanMaskEnum,&constant,P0Enum));
+                constant=0; this->AddInput2(SealevelEustaticOceanMaskEnum,&constant,P0Enum);
                 return;
         }
-        constant=1; this->inputs->AddInput(new TriaInput(SealevelEustaticOceanMaskEnum,&constant,P0Enum));
+        constant=1; this->AddInput2(SealevelEustaticOceanMaskEnum,&constant,P0Enum);
 
         /*recover computational flags: */
@@ -6068 +6069 @@
 
         /*early return if we are not on the ocean or on an ice cap:*/
-        if(!(this->inputs->Max(MaskIceLevelsetEnum)<0) && !IsWaterInElement()) return;
+        if(!IsIceOnlyInElement() && !IsWaterInElement()) return;
 
         /*early return if we are fully floating: */
-        if (this->inputs->Max(MaskGroundediceLevelsetEnum)<=0)return;
+        Input2* gr_input=this->GetInput2(MaskGroundediceLevelsetEnum); _assert_(gr_input);
+        if(gr_input->GetInputMax()<=0)return;
 
         /*recover computational flags: */
@@ -6202 +6204 @@
 
                 /*Add all components to the pUp solution vectors:*/
-                if(this->inputs->Max(MaskIceLevelsetEnum)<0){
+                if(IsIceOnlyInElement()){
                         U_values[i]+=3*rho_ice/rho_earth*area/eartharea*I*U_elastic[i];
                         if(horiz){