Changeset 3249

Timestamp:

03/10/10 13:51:47 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed contourtonodes

Location:

issm/trunk/src/mex/ContourToNodes

Files:

• ContourToNodes.cpp (modified) (4 diffs)
• ContourToNodes.h (modified) (1 diff)

issm/trunk/src/mex/ContourToNodes/ContourToNodes.cpp

@@ -32 +32 @@
         double* y=NULL;
         int     edgevalue;
+        char*   interptype=NULL;
 
         /* output: */
@@ -46 +47 @@
 
         /*checks on arguments on the matlab side: */
-        //CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ContourToNodesUsage); Cant' use it here, as we have variable  outputs.
-        if((nlhs==0) && (nrhs=0)){
-                ContourToNodesUsage();
-                throw ErrorException(__FUNCT__," usage. See above");
-        }
+        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ContourToNodesUsage);
 
         /*Fetch inputs: */
@@ -75 +72 @@
         }
 
-        #ifdef _ISSM_DEBUG_
-        for(i=0;i<numcontours;i++){
-                printf("\nContour echo: contour number  %i / %i\n",i+1,numcontours);
-                contouri=*(contours+i);
-                printf("   Number of grids %i\n",contouri->nods);
-                for (j=0;j<contouri->nods;j++){
-                        printf("   %lf %lf\n",*(contouri->x+j),*(contouri->y+j));
-                }
-        }
-        #endif
-
         /*Run interpolation routine: */
-        ContourToNodesx( &flags,x,y,nods,contours,numcontours,edgevalue);
+        ContourToNodesx(&flags,x,y,nods,contours,numcontours,edgevalue);
 
         /* output: */
@@ -94 +80 @@
         /*end module: */
         MODULEEND();
-        
+
 }
 
-void ContourToNodesUsage(void)
-{
+void ContourToNodesUsage(void){
         printf("   usage:\n");
-        printf("   [flags]=ContourToNodes(,x,y,contours,edgevalue);\n\n");
+        printf("   [flags]=ContourToNodes(x,y,contours,edgevalue);\n\n");
         printf("   where:\n");
         printf("      x,y: list of nodes.\n");

issm/trunk/src/mex/ContourToNodes/ContourToNodes.h

@@ -32 +32 @@
 /* serial arg counts: */
 #undef NLHS
-#define NLHS  2
+#define NLHS 1
 #undef NRHS
 #define NRHS 4