Changeset 291

Timestamp:

05/07/09 08:32:18 (16 years ago)

Author:

Mathieu Morlighem

Message:

Fixed Geography (keep previous value of several contours) + cosmetics

Location:

issm/trunk/src/c

Files:

• ContourToMeshx/ContourToMeshx.cpp (modified) (1 diff)
• shared/Exp/IsInPoly.cpp (modified) (2 diffs)

issm/trunk/src/c/ContourToMeshx/ContourToMeshx.cpp

@@ -31 +31 @@
         for (i=0;i<numcontours;i++){
                 #ifdef _DEBUG_
-                        printf("Handling contour %i/%i\n",i,numcontours);
+                        printf("\nHandling contour %i/%i\n",i,numcontours);
                 #endif
                 contouri=*(contours+i);

issm/trunk/src/c/shared/Exp/IsInPoly.cpp

@@ -6 +6 @@
 #include "../../toolkits/toolkits.h"
 #include "./exp.h"
+#include "../shared.h"
+
 
 
 int IsInPoly(Vec in,double* xc,double* yc,int numgrids,double* x,double* y,int nods, int edgevalue){
 
-        int i,j;
+        int i;
         double x0,y0;
         double value;
@@ -16 +18 @@
         /*Go through all grids of the mesh:*/
         for (i=MPI_Lowerrow(nods);i<MPI_Upperrow(nods);i++){
-                /*pick up grid: */
-                x0=x[i];
-                y0=y[i];
-                if (pnpoly(numgrids,xc,yc,x0,y0,edgevalue)){
-                        value=1;
+
+                //Get current value of value[i] -> do not change it if != 0
+                VecGetValues(in,1,&i,&value);
+                if (value){
+                        /*this grid already is inside one of the contours, continue*/
+                        continue;
                 }
-                else{
-                        value=0;
-                }
+
+                /*pick up grid (x[i],y[i]) and figure out if located inside contour (xc,yc)*/
+                x0=x[i]; y0=y[i];
+                value=pnpoly(numgrids,xc,yc,x0,y0,edgevalue);
                 VecSetValues(in,1,&i,&value,INSERT_VALUES);
         }