source: issm/oecreview/Archive/15392-16133/ISSM-15972-15973.diff@ 16134

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

@@ -7302 +7302 @@
 void  Tria::MigrateGroundingLine(IssmDouble* phi_ungrounding){
 
         int        i,migration_style;
+        bool       oldfloating;
         bool       floatingelement = false;
         bool       groundedelement = false;
         IssmDouble bed_hydro,yts,gl_melting_rate;
@@ -7319 +7320 @@
         GetInputListOnVertices(&b[0],BedEnum);
         GetInputListOnVertices(&r[0],BathymetryEnum);
         GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum);
-        rho_water = matpar->GetRhoWater();
-        rho_ice   = matpar->GetRhoIce();
-        density   = rho_ice/rho_water;
+        rho_water   = matpar->GetRhoWater();
+        rho_ice     = matpar->GetRhoIce();
+        density     = rho_ice/rho_water;
+        oldfloating = this->IsFloating(); //figure out if element is floating before we start to change everything
 
         /*go through vertices, and update inputs, considering them to be TriaVertex type: */
         for(i=0;i<NUMVERTICES;i++){
@@ -7392 +7394 @@
         }
 
    /*Add basal melting rate if element just ungrounded*/
-        if(!this->IsFloating() && floatingelement==true){
+        if(!oldfloating && floatingelement==true){
                 for(i=0;i<NUMVERTICES;i++)melting[i]=gl_melting_rate/yts;
                 this->inputs->AddInput(new TriaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum));
         } 

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

@@ -11189 +11189 @@
 void  Penta::MigrateGroundingLine(IssmDouble* phi_ungrounding){
 
         int        i,migration_style;
+        bool       oldfloating;
         bool       floatingelement = false;
         bool       groundedelement = false;
         IssmDouble bed_hydro,yts,gl_melting_rate;
@@ -11208 +11209 @@
         GetInputListOnVertices(&b[0],BedEnum);
         GetInputListOnVertices(&r[0],BathymetryEnum);
         GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum);
-        rho_water = matpar->GetRhoWater();
-        rho_ice   = matpar->GetRhoIce();
-        density   = rho_ice/rho_water;
+        rho_water   = matpar->GetRhoWater();
+        rho_ice     = matpar->GetRhoIce();
+        density     = rho_ice/rho_water;
+        oldfloating = this->IsFloating(); //figure out if the element is floating before starting to change everything
 
         /*go through vertices, and update inputs, considering them to be PentaVertex type: */
         for(i=0;i<NUMVERTICES;i++){
@@ -11281 +11283 @@
         }
 
    /*Add basal melting rate if element just ungrounded*/
-        if(!this->IsFloating() && floatingelement==true){
+        if(!oldfloating && floatingelement==true){
                 for(i=0;i<NUMVERTICES;i++)melting[i]=gl_melting_rate/yts;
                 this->inputs->AddInput(new PentaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum));
         }