Ignore:
Timestamp:
06/01/12 17:26:03 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 12326M

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/modules/ContourToMeshx/ContourToMeshx.h

    r11995 r12330  
    1313typedef struct{
    1414
    15         int numcontours;
    16         Contour** contours;
     15        DataSet* contours;
    1716        int nods;
    1817        int edgevalue;
     
    2524
    2625/* local prototypes: */
    27 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);
     26int ContourToMeshx( Vector** pin_nods,Vector** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue);
    2827
    2928void* ContourToMeshxt(void* vContourToMeshxThreadStruct);
Note: See TracChangeset for help on using the changeset viewer.