Changeset 16147

Timestamp:

09/17/13 13:18:10 (12 years ago)

Author:

seroussi

Message:

BUG: refixed problem with normal =_orientation initialization

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (7 diffs)

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

@@ -1006 +1006 @@
         /*Computeportion of the element that is grounded*/ 
 
-        int         normal_orientation;
+        int         normal_orientation=0;
         IssmDouble  s1,s2;
         IssmDouble  levelset[NUMVERTICES];
@@ -1013 +1013 @@
         GetInputListOnVertices(&levelset[0],levelsetenum);
 
-        if(levelset[0]*levelset[1]>0){ //Nodes 0 and 1 are similar, so points must be found on segment 0-2 and 1-2
+        if(levelset[0]*levelset[1]>0.){ //Nodes 0 and 1 are similar, so points must be found on segment 0-2 and 1-2
                 /*Portion of the segments*/
                 s1=levelset[2]/(levelset[2]-levelset[1]);
                 s2=levelset[2]/(levelset[2]-levelset[0]);
 
-                if(levelset[2]>0) normal_orientation=1;
+                if(levelset[2]>0.) normal_orientation=1;
                 /*New point 1*/
                 xyz_zero[3*normal_orientation+0]=xyz_list[2][0]+s1*(xyz_list[1][0]-xyz_list[2][0]);
@@ -1029 +1029 @@
                 xyz_zero[3*(1-normal_orientation)+2]=xyz_list[2][2]+s2*(xyz_list[0][2]-xyz_list[2][2]);
         }
-        else if(levelset[1]*levelset[2]>0){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2
+        else if(levelset[1]*levelset[2]>0.){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2
                 /*Portion of the segments*/
                 s1=levelset[0]/(levelset[0]-levelset[2]);
                 s2=levelset[0]/(levelset[0]-levelset[1]);
 
-                if(levelset[0]>0) normal_orientation=1;
+                if(levelset[0]>0.) normal_orientation=1;
                 /*New point 1*/
                 xyz_zero[3*normal_orientation+0]=xyz_list[0][0]+s1*(xyz_list[2][0]-xyz_list[0][0]);
@@ -1045 +1045 @@
                 xyz_zero[3*(1-normal_orientation)+2]=xyz_list[0][2]+s2*(xyz_list[1][2]-xyz_list[0][2]);
         }
-        else if(levelset[0]*levelset[2]>0){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2
+        else if(levelset[0]*levelset[2]>0.){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2
                 /*Portion of the segments*/
                 s1=levelset[1]/(levelset[1]-levelset[0]);
                 s2=levelset[1]/(levelset[1]-levelset[2]);
 
-                if(levelset[1]>0) normal_orientation=1;
+                if(levelset[1]>0.) normal_orientation=1;
                 /*New point 0*/
                 xyz_zero[3*normal_orientation+0]=xyz_list[1][0]+s1*(xyz_list[0][0]-xyz_list[1][0]);
@@ -1061 +1061 @@
                 xyz_zero[3*(1-normal_orientation)+2]=xyz_list[1][2]+s2*(xyz_list[2][2]-xyz_list[1][2]);
         }
-        else if(levelset[0]==0 && levelset[1]==0){ //front is on point 0 and 1
+        else if(levelset[0]==0. && levelset[1]==0.){ //front is on point 0 and 1
                 xyz_zero[3*0+0]=xyz_list[0][0];
                 xyz_zero[3*0+1]=xyz_list[0][1];
@@ -1071 +1071 @@
                 xyz_zero[3*1+2]=xyz_list[1][2];
         }
-        else if(levelset[0]==0 && levelset[2]==0){ //front is on point 0 and 1
+        else if(levelset[0]==0. && levelset[2]==0.){ //front is on point 0 and 1
                 xyz_zero[3*0+0]=xyz_list[2][0];
                 xyz_zero[3*0+1]=xyz_list[2][1];
@@ -1081 +1081 @@
                 xyz_zero[3*1+2]=xyz_list[0][2];
         }
-        else if(levelset[1]==0 && levelset[2]==0){ //front is on point 0 and 1
+        else if(levelset[1]==0. && levelset[2]==0.){ //front is on point 0 and 1
                 xyz_zero[3*0+0]=xyz_list[1][0];
                 xyz_zero[3*0+1]=xyz_list[1][1];