Changeset 26684

Timestamp:

12/01/21 12:19:06 (3 years ago)

Author:

vverjans

Message:

CHG: activate updated calculation of IceVolume() and TotalSmb() for partially ice-covered elements

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

@@ -2190 +2190 @@
         Element::GetInputListOnVertices(&lsf[0],MaskIceLevelsetEnum);
         /*Deal with partially ice-covered elements*/
-        if(false && (lsf[0]*lsf[1]<=0 || lsf[0]*lsf[2]<=0 || lsf[1]*lsf[2]<=0)){
+        if(lsf[0]*lsf[1]<=0 || lsf[0]*lsf[2]<=0 || lsf[1]*lsf[2]<=0){
                 bool        istrapneg;
                 int         point;
@@ -4404 +4404 @@
         /*Now get the average SMB over the element*/
         Element::GetInputListOnVertices(&lsf[0],MaskIceLevelsetEnum);
-   if(false && (lsf[0]*lsf[1]<=0 || lsf[0]*lsf[2]<=0 || lsf[1]*lsf[2]<=0)){
+   if(lsf[0]*lsf[1]<=0 || lsf[0]*lsf[2]<=0 || lsf[1]*lsf[2]<=0){
                 /*Partially ice-covered element*/
                 bool mainlyice;

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

@@ -3549 +3549 @@
         Element::GetInputListOnVertices(&lsf[0],MaskIceLevelsetEnum);
    /*Deal with partially ice-covered elements*/
-        if(false && (lsf[0]*lsf[1]<=0 || lsf[0]*lsf[2]<=0 || lsf[1]*lsf[2]<=0)){
+        if(lsf[0]*lsf[1]<=0 || lsf[0]*lsf[2]<=0 || lsf[1]*lsf[2]<=0){
                 bool istrapneg;
       int point;
@@ -5496 +5496 @@
         /*Now get the average SMB over the element*/
         Element::GetInputListOnVertices(&lsf[0],MaskIceLevelsetEnum);
-        if(false && (lsf[0]*lsf[1]<=0 || lsf[0]*lsf[2]<=0 || lsf[1]*lsf[2]<=0)){
+        if(lsf[0]*lsf[1]<=0 || lsf[0]*lsf[2]<=0 || lsf[1]*lsf[2]<=0){
                 /*Partially ice-covered element*/
                 bool mainlyice;