Changeset 17446

Timestamp:

03/17/14 10:44:24 (11 years ago)

Author:

jbondzio

Message:

CHG: making detection of zero levelset in element more general

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

@@ -2912 +2912 @@
         /*If the level set has always same sign, there is no ice front here*/
         iszerols = false;
-        if(IsIceInElement()){
-                if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){
-                        iszerols = true;
-                }
+        if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]*ls[2]==0. && ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]<=0.)){
+                iszerols = true;
         }
         return iszerols;

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

@@ -2347 +2347 @@
         /*If the level set is awlays <0, there is no ice front here*/
         iszerols= false;
-        if(IsIceInElement()){
-                if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){
-                        iszerols= true;
-                }
+        if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]*ls[2]==0. && ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]<=0.)){
+                iszerols = true;
         }