Changeset 15963

Timestamp:

08/26/13 16:49:22 (12 years ago)

Author:

seroussi

Message:

CHG: use MaskGroundediceLevelsetEnum instead of node->IsFloating to figure out if vertices are floating

Location:

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

Files:

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

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

@@ -11322 +11322 @@
 void  Penta::PotentialUngrounding(Vector<IssmDouble>* potential_ungrounding){
 
-        IssmDouble  h[NUMVERTICES],r[NUMVERTICES];
+        IssmDouble  h[NUMVERTICES],r[NUMVERTICES],gl[NUMVERTICES];
         IssmDouble  bed_hydro;
         IssmDouble  rho_water,rho_ice,density;
@@ -11332 +11332 @@
         GetInputListOnVertices(&h[0],ThicknessEnum);
         GetInputListOnVertices(&r[0],BathymetryEnum);
+        GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum);
 
         /*go through vertices, and figure out which ones are on the ice sheet, and want to unground: */
         for(int i=0;i<NUMVERTICES;i++){
                 /*Find if grounded vertices want to start floating*/
-                if (!nodes[i]->IsFloating()){
+                if (gl[i]>0.){
                         bed_hydro=-density*h[i];
                         if(bed_hydro>r[i]){

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

@@ -7425 +7425 @@
 void  Tria::PotentialUngrounding(Vector<IssmDouble>* potential_ungrounding){
 
-        IssmDouble  h[NUMVERTICES],r[NUMVERTICES];
+        IssmDouble  h[NUMVERTICES],r[NUMVERTICES],gl[NUMVERTICES];
         IssmDouble  bed_hydro;
         IssmDouble  rho_water,rho_ice,density;
@@ -7435 +7435 @@
         GetInputListOnVertices(&h[0],ThicknessEnum);
         GetInputListOnVertices(&r[0],BathymetryEnum);
+        GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum);
 
         /*go through vertices, and figure out which ones are grounded and want to unground: */
         for(int i=0;i<NUMVERTICES;i++){
                 /*Find if grounded vertices want to start floating*/
-                if (!nodes[i]->IsFloating()){
+                if (gl[i]>0.){
                         bed_hydro=-density*h[i];
                         if(bed_hydro>r[i]){