Changeset 13220 for issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp

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:

• issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp

@@ -17 +17 @@
 
 /*InterpFromGridToMeshx{{{*/
-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){
+int 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){
 
         /*output: */
-        Vector<IssmDouble>* data_mesh=NULL;
+        Vector<IssmPDouble>* data_mesh=NULL;
         
         /*Intermediary*/
@@ -47 +47 @@
 
         /*Allocate output vector: */
-        data_mesh=new Vector<IssmDouble>(nods);
+        data_mesh=new Vector<IssmPDouble>(nods);
 
         /*Find out what kind of coordinates (x_in,y_in) have been given is input*/
@@ -127 +127 @@
         double *y             = gate->y;
         int     nods          = gate->nods;
-        Vector<IssmDouble>*data_mesh     = gate->data_mesh;
+        Vector<IssmPDouble>*data_mesh     = gate->data_mesh;
         double *data          = gate->data;
         double  default_value = gate->default_value;
@@ -181 +181 @@
                                         return NULL; /*WARNING: no error because it would blow up the multithreading!*/
                         }
-                        if(xIsNan<IssmDouble>(data_value)) data_value=default_value;
+                        if(xIsNan<IssmPDouble>(data_value)) data_value=default_value;
                 }
                 else{