Changeset 12127 for issm/trunk-jpl/src/c/modules

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/c/modules/ContourToMeshx

Files:

• ContourToMeshx.cpp (modified) (2 diffs)
• ContourToMeshx.h (modified) (2 diffs)
• ContourToMeshxt.cpp (modified) (3 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);
         }