Changeset 15954

Timestamp:

08/26/13 12:04:28 (12 years ago)

Author:

seroussi

Message:

CHG: Now use GroundediceLevelset instead of floating ice

Location:

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

Files:

• Penta.cpp (modified) (1 diff)
• Tria.cpp (modified) (1 diff)

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

@@ -11229 +11229 @@
         for(i=0;i<NUMVERTICES;i++){
                 /*Ice shelf: if bed below bathymetry, impose it at the bathymetry and update surface, elso do nothing */
-                if(reCast<bool,IssmDouble>(old_floating_ice[nodes[i]->Sid()])){
+                if(phi[i]<=0){
                         if(b[i]<=r[i]){ 
                                 b[i]        = r[i];

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

@@ -7339 +7339 @@
         for(i=0;i<NUMVERTICES;i++){
                 /*Ice shelf: if bed below bathymetry, impose it at the bathymetry and update surface, elso do nothing */
-                if(reCast<bool>(old_floating_ice[nodes[i]->Sid()])){
+                if(phi[i]<=0){
                         if(b[i]<=r[i]){ 
                                 b[i]        = r[i];