Changeset 12330 for issm/trunk/src/c/modules/ContourToMeshx/ContourToMeshx.h

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/modules/ContourToMeshx/ContourToMeshx.h (modified) (2 diffs)

issm/trunk/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);