Changeset 13355
- Timestamp:
- 09/13/12 10:59:02 (13 years ago)
- Location:
- issm/trunk-jpl/src/modules
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp
r13330 r13355 37 37 double *y = NULL; 38 38 char *interptype = NULL; 39 char *contourname = NULL;40 39 DataSet *contours = NULL; 41 40 … … 65 64 FetchData(&y,NULL,NULL,Y); 66 65 FetchData(&edgevalue,EDGEVALUE); 67 FetchData(&contourname,CONTOURNAME); 68 contours=DomainOutlineRead<double>(contourname); 69 70 /*Fetch interptype: */ 66 FetchData(&contours,CONTOUR); 71 67 FetchData(&interptype,INTERPTYPE); 72 68 -
issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.h
r13236 r13355 36 36 #define X prhs[1] 37 37 #define Y prhs[2] 38 #define CONTOUR NAMEprhs[3]38 #define CONTOUR prhs[3] 39 39 #define INTERPTYPE prhs[4] 40 40 #define EDGEVALUE prhs[5] … … 49 49 #define X PyTuple_GetItem(args,1) 50 50 #define Y PyTuple_GetItem(args,2) 51 #define CONTOUR NAMEPyTuple_GetItem(args,3)51 #define CONTOUR PyTuple_GetItem(args,3) 52 52 #define INTERPTYPE PyTuple_GetItem(args,4) 53 53 #define EDGEVALUE PyTuple_GetItem(args,5) -
issm/trunk-jpl/src/modules/TriMesh/TriMesh.cpp
r13236 r13355 16 16 WRAPPER(TriMesh){ 17 17 18 /* input: */ 19 char *domainname = NULL; 20 char *riftsname = NULL; 18 /*intermediary: */ 21 19 double area; 22 23 /*intermediary: */24 20 DataSet *domain = NULL; 25 21 DataSet *rifts = NULL; … … 39 35 40 36 /*Fetch data needed for meshing: */ 41 FetchData(&domain name,DOMAINOUTLINE);42 FetchData(&rifts name,RIFTSOUTLINE);37 FetchData(&domain,DOMAINOUTLINE); 38 FetchData(&rifts,RIFTSOUTLINE); 43 39 FetchData(&area,AREA); 44 45 /*Read domain outline: */46 domain = DomainOutlineRead<double>(domainname);47 rifts = DomainOutlineRead<double>(riftsname);48 40 49 41 /*call x core: */
Note:
See TracChangeset
for help on using the changeset viewer.