Ignore:
Timestamp:
09/02/12 01:29:13 (13 years ago)
Author:
Eric.Larour
Message:

CHG: adjustments to compile the Matlab and Python modules when ADOLC is on.
Had to template MeshPartitionx, because it's used in both modules and the core code.
Had to template Contour too, same reason.
Had to default to ISSMPDouble type for modules such as InterpFromMesh2d* InterpFromGridToMeshx*, etc ..., which
only show up in the Matlab modules.

File:
1 edited

Legend:

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

    r13216 r13220  
    1717
    1818/*InterpFromGridToMeshx{{{*/
    19 int InterpFromGridToMeshx( Vector<IssmDouble>** pdata_mesh,double* x_in, int x_rows, double* y_in, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods,double default_value, int interpenum){
     19int InterpFromGridToMeshx( Vector<IssmPDouble>** pdata_mesh,double* x_in, int x_rows, double* y_in, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods,double default_value, int interpenum){
    2020
    2121        /*output: */
    22         Vector<IssmDouble>* data_mesh=NULL;
     22        Vector<IssmPDouble>* data_mesh=NULL;
    2323       
    2424        /*Intermediary*/
     
    4747
    4848        /*Allocate output vector: */
    49         data_mesh=new Vector<IssmDouble>(nods);
     49        data_mesh=new Vector<IssmPDouble>(nods);
    5050
    5151        /*Find out what kind of coordinates (x_in,y_in) have been given is input*/
     
    127127        double *y             = gate->y;
    128128        int     nods          = gate->nods;
    129         Vector<IssmDouble>*data_mesh     = gate->data_mesh;
     129        Vector<IssmPDouble>*data_mesh     = gate->data_mesh;
    130130        double *data          = gate->data;
    131131        double  default_value = gate->default_value;
     
    181181                                        return NULL; /*WARNING: no error because it would blow up the multithreading!*/
    182182                        }
    183                         if(xIsNan<IssmDouble>(data_value)) data_value=default_value;
     183                        if(xIsNan<IssmPDouble>(data_value)) data_value=default_value;
    184184                }
    185185                else{
Note: See TracChangeset for help on using the changeset viewer.