Changeset 12127

Timestamp:

04/25/12 09:36:49 (13 years ago)

Author:

Eric.Larour

Message:

Starting conversion of SetIceShelfBC
Needs ContourToMesh python module, so converted this module to python interface.
Also simplified Contours* treatment.

Location:

issm/trunk-jpl/src

Files:

• c/modules/ContourToMeshx/ContourToMeshx.cpp (modified) (2 diffs)
• c/modules/ContourToMeshx/ContourToMeshx.h (modified) (2 diffs)
• c/modules/ContourToMeshx/ContourToMeshxt.cpp (modified) (3 diffs)
• m/utils/BC/SetIceShelfBC.py (added)
• modules/ContourToMesh/ContourToMesh.cpp (modified) (4 diffs)
• modules/ContourToMesh/ContourToMesh.h (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp

@@ -11 +11 @@
 #include "./ContourToMeshx.h"
 
-int ContourToMeshx( Vector** pin_nod,Vector** pin_elem, double* index, double* x, double* y,Contour** contours,int numcontours,char* interptype,int nel,int nods, int edgevalue) {
+int ContourToMeshx( Vector** pin_nod,Vector** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue) {
 
         int noerr=1;
@@ -37 +37 @@
 
         /*initialize thread parameters: */
-        gate.numcontours=numcontours;
         gate.contours=contours;
         gate.nods=nods;

issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.h

@@ -13 +13 @@
 typedef struct{
 
-        int numcontours;
-        Contour** contours;
+        DataSet* contours;
         int nods;
         int edgevalue;
@@ -25 +24 @@
 
 /* local prototypes: */
-int ContourToMeshx( Vector** pin_nods,Vector** pin_elem, double* index, double* x, double* y,Contour** contours,int numcontours,char* interptype,int nel,int nods, int edgevalue);
+int ContourToMeshx( Vector** pin_nods,Vector** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue);
 
 void* ContourToMeshxt(void* vContourToMeshxThreadStruct);

issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp

@@ -26 +26 @@
 
         /*Contour:*/
-        Contour* contouri=NULL;
-        int      numnodes;
-        double*  xc=NULL;
-        double*  yc=NULL;
-
+        DataSet* contours=NULL;
 
         /*parameters: */
-        int numcontours;
-        Contour** contours=NULL;
         int nods;
         int edgevalue;
@@ -49 +43 @@
 
         /*recover parameters :*/
-        numcontours=gate->numcontours;
         contours=gate->contours;
         nods=gate->nods;
@@ -61 +54 @@
 
         /*Loop through all contours: */
-        for (i=0;i<numcontours;i++){
-                contouri=*(contours+i);
-                numnodes=contouri->nods;
-                xc=contouri->x;
-                yc=contouri->y;
-                IsInPoly(in_nod,xc,yc,numnodes,x,y,i0,i1,edgevalue);
+        for (i=0;i<contours->Size();i++){
+                Contour* contour=(Contour*)contours->GetObjectByOffset(i);
+                IsInPoly(in_nod,contour->x,contour->y,contour->nods,x,y,i0,i1,edgevalue);
         }
 

issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp

@@ -21 +21 @@
 #include "./ContourToMesh.h"
 
-void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) {
+WRAPPER(ContourToMesh){
 
         int i,j;
@@ -28 +28 @@
         int     edgevalue;
         double *index      = NULL;
+        int     nel;
         double *x          = NULL;
+        int     nods;
         double *y          = NULL;
         char   *interptype = NULL;
+        char* contourname  = NULL;
+        DataSet* contours  = NULL;
 
         /* output: */
         Vector *in_nod  = NULL;
-        int     nods;
         Vector *in_elem = NULL;
-        int     nel;
-
-        //contours
-        mxArray  *matlabstructure = NULL;
-        int       numcontours;
-        Contour **contours        = NULL;
-        Contour  *contouri        = NULL;
 
         /*Boot module: */
         MODULEBOOT();
 
-        /*checks on arguments on the matlab side: */
-        //CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ContourToMeshUsage); Cant' use it here, as we have variable  outputs.
-        if((nlhs!=1 && nlhs!=2) || (nrhs!=NRHS)){
+        /*checks on output arguments on the matlab side: */
+        #ifdef _HAVE_MATLAB_MODULES_
+        if(nlhs!=1 && nlhs!=2){
+                ContourToMeshUsage();
+                _error_(" usage. See above");
+        }
+        #endif
+        /*check on input arguments: */
+        if(nrhs!=NRHS){
                 ContourToMeshUsage();
                 _error_(" usage. See above");
         }
 
-        /*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);
-        FetchData(&x,&nods,NULL,XHANDLE);
-        FetchData(&y,NULL,NULL,YHANDLE);
-        FetchData(&edgevalue,EDGEVALUEHANDLE);
-
-        //Fetch contours
-        numcontours=mxGetNumberOfElements(matlabstructure);
-        contours=(Contour**)xmalloc(numcontours*sizeof(Contour*));
-        for(i=0;i<numcontours;i++){
-                //allocate
-                contouri=(Contour*)xmalloc(sizeof(Contour));
-                //retrieve dimension of this contour.
-                contouri->nods=(int)mxGetScalar(mxGetField(matlabstructure,i,"nods"));
-                //set pointers.
-                contouri->x=mxGetPr(mxGetField(matlabstructure,i,"x"));
-                contouri->y=mxGetPr(mxGetField(matlabstructure,i,"y"));
-                *(contours+i)=contouri;
-        }
+        FetchData(&index,&nel,NULL,INDEX);
+        FetchData(&x,&nods,NULL,X);
+        FetchData(&y,NULL,NULL,Y);
+        FetchData(&edgevalue,EDGEVALUE);
+        FetchData(&contourname,CONTOURNAME);
+        contours=DomainOutlineRead(contourname);
 
         /*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);
-                printf("   Number of vertices %i\n",contouri->nods);
-                for (j=0;j<contouri->nods;j++){
-                        printf("   %lf %lf\n",*(contouri->x+j),*(contouri->y+j));
-                }
-        }*/
-        /*}}}*/
+        FetchData(&interptype,INTERPTYPE);
 
         /*Run interpolation routine: */
-        ContourToMeshx( &in_nod,&in_elem,index,x,y,contours,numcontours,interptype,nel,nods,edgevalue);
+        ContourToMeshx( &in_nod,&in_elem,index,x,y,contours,interptype,nel,nods,edgevalue);
 
         /* output: */
@@ -112 +89 @@
 }
 
-void ContourToMeshUsage(void)
+void ContourToMeshUsage(void)//{{{1
 {
         printf("CONTOURTOMESH - Flag the elements or nodes inside a contour\n");
@@ -134 +111 @@
         printf("\n");
 }
+//}}}

issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.h

@@ -8 +8 @@
 #define _CONTOURTOMESH_H
 
-/* local prototypes: */
-void ContourToMeshUsage(void);
 
+#ifdef HAVE_CONFIG_H
+        #include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+/*Very important definition in case we are compiling a python module!: needs to come before header files inclusion*/
+#ifdef _HAVE_PYTHON_
+#define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
+#endif
+
+/*Header files: */
 #include "../../c/include/globals.h"
+#include "../../c/toolkits/toolkits.h"
+#include "../../c/include/include.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 #include "../../c/issm-binding.h"
+#include "../../c/io/io.h"
+#include "../../c/EnumDefinitions/EnumDefinitions.h"
+
+#ifdef _HAVE_MATLAB_MODULES_
+/* serial input macros: */
+#define INDEX (mxArray *)prhs[0]
+#define X (mxArray *)prhs[1]
+#define Y (mxArray *)prhs[2]
+#define CONTOURNAME (mxArray *)prhs[3]
+#define INTERPTYPE (mxArray *)prhs[4]
+#define EDGEVALUE (mxArray *)prhs[5]
+/* serial output macros: */
+#define PLHS0 (mxArray**)&plhs[0]
+#define PLHS1 (mxArray**)&plhs[1]
+#endif
+
+#ifdef _HAVE_PYTHON_MODULES_
+/* serial input macros: */
+#define INDEX PyTuple_GetItem(args,0)
+#define X PyTuple_GetItem(args,1)
+#define Y PyTuple_GetItem(args,2)
+#define CONTOURNAME PyTuple_GetItem(args,3)
+#define INTERPTYPE PyTuple_GetItem(args,4)
+#define EDGEVALUE PyTuple_GetItem(args,5)
+/* serial output macros: */
+#define PLHS0 output,0
+#define PLHS1 output,1
+#endif
 
 #undef __FUNCT__
 #define __FUNCT__ "ContourToMesh"
-
-
-#ifndef ALL
-#define ALL 0
-#endif
-
-/* input macros: */
-#define INDEXHANDLE prhs[0]
-#define XHANDLE prhs[1]
-#define YHANDLE prhs[2]
-#define FILENAME prhs[3]
-#define INTERPTYPEHANDLE prhs[4]
-#define EDGEVALUEHANDLE prhs[5]
-
-/* serial output macros: */
-#define PLHS0 (mxArray**)&plhs[0]
-#define PLHS1 (mxArray**)&plhs[1]
 
 /* serial arg counts: */
@@ -43 +66 @@
 #define NRHS 6
 
+/* local prototypes: */
+void ContourToMeshUsage(void);
 
 #endif  /* _CONTOURTOMESH_H */