Changeset 23826

Timestamp:

04/06/19 22:13:56 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: make sure we do not calve on grounded ice if H<Hmin

File:

• issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp

@@ -699 +699 @@
         IssmDouble  rho_ice,rho_water;
         IssmDouble  bed,water_depth;
-        IssmDouble  levelset;
+        IssmDouble  levelset,grounded_ls;
 
         femmodel->parameters->FindParam(&calvinglaw,CalvingLawEnum);
@@ -715 +715 @@
                         Gauss*   gauss    = element->NewGauss();
                         Input*   H_input  = element->GetInput(ThicknessEnum); _assert_(H_input);
+                        Input*   gr_input = element->GetInput(MaskGroundediceLevelsetEnum); _assert_(gr_input);
 
                         /*Potentially constrain nodes of this element*/
@@ -723 +724 @@
 
                                 H_input->GetInputValue(&thickness,gauss);
-                                if(thickness<min_thickness){
+                                gr_input->GetInputValue(&grounded_ls,gauss);
+                                if(thickness<min_thickness && grounded_ls<0.){
                                         node->ApplyConstraint(0,+1.);
                                 }