Changeset 5019

Timestamp:

08/06/10 11:41:13 (15 years ago)

Author:

Eric.Larour

Message:

Replaced contours structure input with filename

Location:

issm/trunk/src/mex

Files:

• ContourToMesh/ContourToMesh.cpp (modified) (5 diffs)
• ContourToMesh/ContourToMesh.h (modified) (1 diff)
• ContourToNodes/ContourToNodes.cpp (modified) (4 diffs)
• ContourToNodes/ContourToNodes.h (modified) (1 diff)
• InputToResult/InputToResult.cpp (modified) (1 diff)

issm/trunk/src/mex/ContourToMesh/ContourToMesh.cpp

@@ -44 +44 @@
 
         //contours
+        mxArray*  matlabstructure=NULL;
         int numcontours;
         Contour** contours=NULL;
@@ -58 +59 @@
         }
 
+        /*First, call expread on filename to build a contour array in the matlab workspace: */
+        mexCallMATLAB( 1, &matlabstructure, 1, (mxArray**)&FILENAME, "expread");
+
         /*Fetch inputs: */
         FetchData(&index,&nel,NULL,INDEXHANDLE);
@@ -64 +68 @@
         FetchData(&edgevalue,EDGEVALUEHANDLE);
 
-        /*Recover list of contours from the 'contours' structure: */
-        //number of contours;
-        numcontours=mxGetNumberOfElements(CONTOURSHANDLE);
-        //allocate array:
+        //Fetch contours
+        numcontours=mxGetNumberOfElements(matlabstructure);
         contours=(Contour**)xmalloc(numcontours*sizeof(Contour*));
-
-        //go through contours, and populate xcontours and ycontours accordingly.
         for(i=0;i<numcontours;i++){
                 //allocate
                 contouri=(Contour*)xmalloc(sizeof(Contour));
                 //retrieve dimension of this contour.
-                contouri->nods=(int)mxGetScalar(mxGetField(CONTOURSHANDLE,i,"nods"));
+                contouri->nods=(int)mxGetScalar(mxGetField(matlabstructure,i,"nods"));
                 //set pointers.
-                contouri->x=mxGetPr(mxGetField(CONTOURSHANDLE,i,"x"));
-                contouri->y=mxGetPr(mxGetField(CONTOURSHANDLE,i,"y"));
+                contouri->x=mxGetPr(mxGetField(matlabstructure,i,"x"));
+                contouri->y=mxGetPr(mxGetField(matlabstructure,i,"y"));
                 *(contours+i)=contouri;
         }
 
-        /*
-        for(i=0;i<numcontours;i++){
+        /*Fetch  interptype: */
+        FetchData(&interptype,INTERPTYPEHANDLE);
+
+        /* Debugging of contours :{{{1*/
+        /*for(i=0;i<numcontours;i++){
                 printf("\nContour echo: contour number  %i / %i\n",i+1,numcontours);
                 contouri=*(contours+i);
@@ -90 +93 @@
                         printf("   %lf %lf\n",*(contouri->x+j),*(contouri->y+j));
                 }
-        }
-        */
-
-        /*Recover  interptype: */
-        FetchData(&interptype,INTERPTYPEHANDLE);
+        }*/
+        /*}}}*/
 
         /*Run interpolation routine: */
@@ -122 +122 @@
         printf("\n");
         printf("      Usage: \n");
-        printf("         [in_nod,in_elem]=ContourToMesh(index,x,y,contours,interptype,edgevalue)\n\n");
+        printf("         [in_nod,in_elem]=ContourToMesh(index,x,y,contourname,interptype,edgevalue)\n\n");
         printf("\n");
         printf("         index,x,y: mesh triangulation.\n");
-        printf("         contours: structure holding sets of vertices making open contours.\n");
+        printf("         contourname: name of .exp file containing the contours.\n");
         printf("         interptype: string definining type of interpolation ('element', or 'node').\n");
         printf("         edgevalue: integer (0, 1 or 2) defining the value associated to the nodes on the edges of the polygons.\n");

issm/trunk/src/mex/ContourToMesh/ContourToMesh.h

@@ -27 +27 @@
 #define XHANDLE prhs[1]
 #define YHANDLE prhs[2]
-#define CONTOURSHANDLE prhs[3]
+#define FILENAME prhs[3]
 #define INTERPTYPEHANDLE prhs[4]
 #define EDGEVALUEHANDLE prhs[5]

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

@@ -39 +39 @@
 
         //contours
+        mxArray*  matlabstructure=NULL;
         int numcontours;
         Contour** contours=NULL;
@@ -49 +50 @@
         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ContourToNodesUsage);
 
+        /*First, call expread on filename to build a contour array in the matlab workspace: */
+        mexCallMATLAB( 1, &matlabstructure, 1, (mxArray**)&FILENAME, "expread");
+
         /*Fetch inputs: */
         FetchData(&x,&nods,NULL,XHANDLE);
@@ -54 +58 @@
         FetchData(&edgevalue,EDGEVALUEHANDLE);
 
-        /*Recover list of contours from the 'contours' structure: */
-        //number of contours;
-        numcontours=mxGetNumberOfElements(CONTOURSHANDLE);
-        //allocate array:
+        //Fetch contours
+        numcontours=mxGetNumberOfElements(matlabstructure);
         contours=(Contour**)xmalloc(numcontours*sizeof(Contour*));
-
-        //go through contours, and populate xcontours and ycontours accordingly.
         for(i=0;i<numcontours;i++){
                 //allocate
                 contouri=(Contour*)xmalloc(sizeof(Contour));
                 //retrieve dimension of this contour.
-                contouri->nods=(int)mxGetScalar(mxGetField(CONTOURSHANDLE,i,"nods"));
+                contouri->nods=(int)mxGetScalar(mxGetField(matlabstructure,i,"nods"));
                 //set pointers.
-                contouri->x=mxGetPr(mxGetField(CONTOURSHANDLE,i,"x"));
-                contouri->y=mxGetPr(mxGetField(CONTOURSHANDLE,i,"y"));
+                contouri->x=mxGetPr(mxGetField(matlabstructure,i,"x"));
+                contouri->y=mxGetPr(mxGetField(matlabstructure,i,"y"));
                 *(contours+i)=contouri;
         }
+
+        /* Debugging of contours :{{{1*/
+        /*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));
+                }
+        }*/
+        /*}}}*/
 
         /*Run interpolation routine: */
@@ -85 +96 @@
 void ContourToNodesUsage(void){
         printf("   usage:\n");
-        printf("   [flags]=ContourToNodes(x,y,contours,edgevalue);\n\n");
+        printf("   [flags]=ContourToNodes(x,y,contourname,edgevalue);\n\n");
         printf("   where:\n");
         printf("      x,y: list of nodes.\n");
-        printf("      contours: structure holding sets of vertices making open contours.\n");
+        printf("      contourname: name of .exp file containing the contours.\n");
         printf("      interptype: string definining type of interpolation ('element', or 'node').\n");
         printf("      edgevalue: integer (0, 1 or 2) defining the value associated to the nodes on the edges of the polygons.\n");

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

@@ -26 +26 @@
 #define XHANDLE prhs[0]
 #define YHANDLE prhs[1]
-#define CONTOURSHANDLE prhs[2]
+#define FILENAME prhs[2]
 #define EDGEVALUEHANDLE prhs[3]
 

issm/trunk/src/mex/InputToResult/InputToResult.cpp

@@ -21 +21 @@
 
         /*checks on arguments on the matlab side: */
-        //CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ContourToMeshUsage); Cant' use it here, as we have variable inputs.
+        //CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputToResultUsage); Cant' use it here, as we have variable inputs.
         if((nlhs!=NLHS) || (nrhs!=7 && nrhs!=9)){
                 InputToResultUsage();