Changeset 13975 for issm/trunk/src/c/modules/ContourToNodesx/ContourToNodesx.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/modules/ContourToNodesx/ContourToNodesx.cpp (modified) (5 diffs)

issm/trunk/src/c/modules/ContourToNodesx/ContourToNodesx.cpp

@@ -7 +7 @@
 
         int i;
-        int m,n;
 
         /*Contour:*/
@@ -14 +13 @@
         double*  xc=NULL;
         double*  yc=NULL;
-        double   value;
 
         /*output: */
@@ -34 +32 @@
         /*Assign output pointers: */
         *pflags=flags;
-        
         return 1;
 }
@@ -40 +37 @@
 int ContourToNodesx(SeqVec<IssmPDouble>** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue){
 
-        int i;
-        int m,n;
-
         /*Contour:*/
         Contour<IssmPDouble>* contouri=NULL;
-        int      numnodes;
         double*  xc=NULL;
         double*  yc=NULL;
-        double   value;
 
         /*output: */
@@ -56 +48 @@
         /*Loop through all contours: */
         if(contours){
-                for (i=0;i<contours->Size();i++){
+                for(int i=0;i<contours->Size();i++){
                         Contour<IssmPDouble>* contour=(Contour<IssmPDouble>*)contours->GetObjectByOffset(i);
                         IsInPoly(flags,contour->x,contour->y,contour->nods,x,y,0,nods,edgevalue);