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

Timestamp:

05/15/20 20:21:50 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renaming groundedice_levelset -> ocean_levelset (negative if ocean present, positive outside

File:

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

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

@@ -1986 +1986 @@
         parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
 
-        Input2* input = this->GetInput2(MaskGroundediceLevelsetEnum); _assert_(input);
+        Input2* input = this->GetInput2(MaskOceanLevelsetEnum); _assert_(input);
 
         if(migration_style==SubelementMigrationEnum){ //Floating if all nodes are floating
@@ -2006 +2006 @@
 bool       Element::IsGrounded(){/*{{{*/
 
-        Input2* input=this->GetInput2(MaskGroundediceLevelsetEnum); _assert_(input);
+        Input2* input=this->GetInput2(MaskOceanLevelsetEnum); _assert_(input);
         if(input->GetInputMax() > 0.){
                 return true;
@@ -2258 +2258 @@
         GetInputListOnVertices(&r[0],BedEnum);
         GetInputListOnVertices(&sl[0],SealevelEnum);
-        GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum);
+        GetInputListOnVertices(&phi[0],MaskOceanLevelsetEnum);
         rho_water   = FindParam(MaterialsRhoSeawaterEnum);
         rho_ice     = FindParam(MaterialsRhoIceEnum);
@@ -2312 +2312 @@
                 }
         }
-        this->AddInput2(MaskGroundediceLevelsetEnum,&phi[0],P1Enum);
+        this->AddInput2(MaskOceanLevelsetEnum,&phi[0],P1Enum);
 
         /*Update inputs*/