Changeset 13355


Ignore:
Timestamp:
09/13/12 10:59:02 (13 years ago)
Author:
Mathieu Morlighem
Message:

CHG: do not use DomainOutlineRead anymore, use FetchDatadirectly

Location:
issm/trunk-jpl/src/modules
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp

    r13330 r13355  
    3737        double  *y           = NULL;
    3838        char    *interptype  = NULL;
    39         char    *contourname = NULL;
    4039        DataSet *contours    = NULL;
    4140
     
    6564        FetchData(&y,NULL,NULL,Y);
    6665        FetchData(&edgevalue,EDGEVALUE);
    67         FetchData(&contourname,CONTOURNAME);
    68         contours=DomainOutlineRead<double>(contourname);
    69 
    70         /*Fetch  interptype: */
     66        FetchData(&contours,CONTOUR);
    7167        FetchData(&interptype,INTERPTYPE);
    7268
  • issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.h

    r13236 r13355  
    3636#define X           prhs[1]
    3737#define Y           prhs[2]
    38 #define CONTOURNAME prhs[3]
     38#define CONTOUR    prhs[3]
    3939#define INTERPTYPE  prhs[4]
    4040#define EDGEVALUE   prhs[5]
     
    4949#define X           PyTuple_GetItem(args,1)
    5050#define Y           PyTuple_GetItem(args,2)
    51 #define CONTOURNAME PyTuple_GetItem(args,3)
     51#define CONTOUR    PyTuple_GetItem(args,3)
    5252#define INTERPTYPE  PyTuple_GetItem(args,4)
    5353#define EDGEVALUE   PyTuple_GetItem(args,5)
  • issm/trunk-jpl/src/modules/TriMesh/TriMesh.cpp

    r13236 r13355  
    1616WRAPPER(TriMesh){
    1717       
    18         /* input: */
    19         char   *domainname = NULL;
    20         char   *riftsname  = NULL;
     18        /*intermediary: */
    2119        double  area;
    22 
    23         /*intermediary: */
    2420        DataSet *domain = NULL;
    2521        DataSet *rifts  = NULL;
     
    3935       
    4036        /*Fetch data needed for meshing: */
    41         FetchData(&domainname,DOMAINOUTLINE);
    42         FetchData(&riftsname,RIFTSOUTLINE);
     37        FetchData(&domain,DOMAINOUTLINE);
     38        FetchData(&rifts,RIFTSOUTLINE);
    4339        FetchData(&area,AREA);
    44 
    45         /*Read domain outline: */
    46         domain = DomainOutlineRead<double>(domainname);
    47         rifts  = DomainOutlineRead<double>(riftsname);
    4840
    4941        /*call x core: */
Note: See TracChangeset for help on using the changeset viewer.