Changeset 13367

Timestamp:

09/13/12 14:45:02 (13 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed bug in trimesh with holes

Location:

issm/trunk-jpl/src/c/shared

Files:

• Exp/IsInPolySerial.cpp (modified) (1 diff)
• TriMesh/GridInsideHole.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/shared/Exp/IsInPolySerial.cpp

@@ -24 +24 @@
                 y0=y[i];
                 if (pnpoly(numvertices,xc,yc,x0,y0,edgevalue)){
-                        in[i]=1;
+                        in[i]=1.;
                 }
                 else{
-                        in[i]=0;
+                        in[i]=0.;
                 }
         }

issm/trunk-jpl/src/c/shared/TriMesh/GridInsideHole.cpp

@@ -14 +14 @@
 int GridInsideHole(double* px0,double* py0,int n,double* x,double* y){
 
-        double flag=0.;
+        double flag=0.0;
         double xA,xB,xC,xD,xE;
         double yA,yB,yC,yD,yE;
@@ -30 +30 @@
         /*D and E are on each side of segment [A B], on the median line between segment [A  B], 
          *at an angle of 10 degree (less than the minimum 30 enforced by the quality of the mesh: */
-
-
         xD=xC+tan(10./180.*M_PI)*(yC-yA);
         yD=yC+tan(10./180.*M_PI)*(xA-xC);
-
         xE=xC-tan(10./180.*M_PI)*(yC-yA);
         yE=yC-tan(10./180.*M_PI)*(xA-xC);
@@ -40 +37 @@
         /*Either E or D is inside profile (x,y): */
         IsInPolySerial(&flag,&xD,&yD,1,x,y,n,2);
-        if (flag){
+        /*FIXME: used to be 'flag' and not '!flag', check*/
+        if(!flag){
                 /*D is inside the poly: */
                 *px0=xD;