Changeset 5030

Timestamp:

08/06/10 14:47:17 (15 years ago)

Author:

Eric.Larour

Message:

Choice between contours as filename or as matlab structure.

File:

• issm/trunk/src/mex/ContourToNodes/ContourToNodes.cpp (modified) (3 diffs)

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

@@ -50 +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);
@@ -59 +57 @@
 
         //Fetch contours
+
+        if(mxIsChar(FILENAME)){
+                /*Call expread on filename to build a contour array in the matlab workspace: */
+                mexCallMATLAB( 1, &matlabstructure, 1, (mxArray**)&FILENAME, "expread");
+        }
+        else{
+                /*FILENAME is actually a structure, coming directly from expread: */
+                matlabstructure=(mxArray*)FILENAME;
+        }
+
         numcontours=mxGetNumberOfElements(matlabstructure);
         contours=(Contour**)xmalloc(numcontours*sizeof(Contour*));
@@ -99 +107 @@
         printf("   where:\n");
         printf("      x,y: list of nodes.\n");
-        printf("      contourname: name of .exp file containing the contours.\n");
+        printf("      contourname: name of .exp file containing the contours, or resulting structure from call to expread.\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");