Changeset 15973

Timestamp:

08/27/13 13:38:33 (12 years ago)

Author:

seroussi

Message:

CHG: try to get rid of MaskElementOnFloatingIce

Location:

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

Files:

• Penta.cpp (modified) (3 diffs)
• Tria.cpp (modified) (3 diffs)

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

@@ -11190 +11190 @@
 
         int        i,migration_style;
+        bool       oldfloating;
         bool       floatingelement = false;
         bool       groundedelement = false;
@@ -11209 +11210 @@
         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: */
@@ -11282 +11284 @@
 
    /*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));

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

@@ -7303 +7303 @@
 
         int        i,migration_style;
+        bool       oldfloating;
         bool       floatingelement = false;
         bool       groundedelement = false;
@@ -7320 +7321 @@
         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: */
@@ -7393 +7395 @@
 
    /*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));