source: issm/oecreview/Archive/15392-16133/ISSM-15958-15959.diff

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

@@ -7338 +7338 @@
         /*go through vertices, and update inputs, considering them to be TriaVertex type: */
         for(i=0;i<NUMVERTICES;i++){
                 /*Ice shelf: if bed below bathymetry, impose it at the bathymetry and update surface, elso do nothing */
-                if(phi[i]<=0){
+                if(phi[i]<=0.){
                         if(b[i]<=r[i]){ 
                                 b[i]        = r[i];
                                 s[i]        = b[i]+h[i];
@@ -7350 +7350 @@
                 }
                 /*Ice sheet: if hydrostatic bed above bathymetry, ice sheet starts to unground, elso do nothing */
                 /*Change only if AgressiveMigration or if the ice sheet is in contact with the ocean*/
-                else{
+                else{ // phi>0
                         bed_hydro=-density*h[i];
                         if (bed_hydro>r[i]){
                                 /*Unground only if the element is connected to the ice shelf*/
@@ -7409 +7409 @@
         this->inputs->AddInput(new TriaInput(BedEnum,&b[0],P1Enum));
 
         /*Recalculate phi*/
-        for(i=0;i<NUMVERTICES;i++) phi[i]=h[i]+r[i]/density;
+        for(i=0;i<NUMVERTICES;i++){
+                if(migration_style==SoftMigrationEnum){
+                        bed_hydro=-density*h[i];
+                        if(phi[i]<0. || bed_hydro<=r[i] || reCast<bool>(sheet_ungrounding[nodes[i]->Sid()])){
+                                phi[i]=h[i]+r[i]/density;
+                        }
+                }
+                else phi[i]=h[i]+r[i]/density;
+        }
         this->inputs->AddInput(new TriaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum));
 }
 /*}}}*/

../trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -11298 +11298 @@
    this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,floatingelement));
 
         /*Recalculate phi*/
-        for(i=0;i<NUMVERTICES;i++) phi[i]=h[i]+r[i]/density;
+        for(i=0;i<NUMVERTICES;i++){
+                if(migration_style==SoftMigrationEnum){
+                        bed_hydro=-density*h[i];
+                        if(phi[i]<0. || bed_hydro<=r[i] || reCast<bool>(sheet_ungrounding[nodes[i]->Sid()])){
+                                phi[i]=h[i]+r[i]/density;
+                        }
+                }
+                else phi[i]=h[i]+r[i]/density;
+        }
         this->inputs->AddInput(new PentaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum));
         this->InputExtrude(MaskGroundediceLevelsetEnum,ElementEnum);