Changeset 21847 for issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

Timestamp:

07/24/17 13:22:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing AD

File:

• issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (modified) (5 diffs)

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

@@ -12 +12 @@
 using namespace std;
 
-int InterpFromMeshToMesh2dx(double** pdata_interp,int* index_data,double* x_data,double* y_data,int nods_data,int nels_data,
-                        double* data,int M_data,int N_data,double* x_interp,double* y_interp,int N_interp,Options* options){
+int InterpFromMeshToMesh2dx(IssmDouble** pdata_interp,int* index_data,IssmDouble* x_data,IssmDouble* y_data,int nods_data,int nels_data,
+                        IssmDouble* data,int M_data,int N_data,IssmDouble* x_interp,IssmDouble* y_interp,int N_interp,Options* options){
 
         /*Output*/
-        double* data_interp=NULL;
+        IssmDouble* data_interp=NULL;
 
         /*Intermediary*/
-        double xmin,xmax,ymin,ymax;
+        IssmDouble xmin,xmax,ymin,ymax;
         bool   isdefault;
-        double defaultvalue;
+        IssmDouble defaultvalue;
         R2     r;
         I2     I;
@@ -27 +27 @@
         int    it;
         int    i0,i1,i2;
-        double areacoord[3];
-        double aa,bb;
+        IssmDouble areacoord[3];
+        IssmDouble aa,bb;
         long long dete[3];
 
@@ -46 +46 @@
 
         /*Initialize output*/
-        data_interp=xNew<double>(N_interp*N_data);
+        data_interp=xNew<IssmDouble>(N_interp*N_data);
 
         /*read background mesh*/
@@ -78 +78 @@
         /*Loop over output nodes*/
         for(i=0;i<N_interp;i++){
-                //if(i%100==0) _printf_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(i)/double(N_interp)*100.<<"%   ");
+                //if(i%100==0) _printf_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<IssmDouble(i)/IssmDouble(N_interp)*100.<<"%   ");
 
                 if(isdefault){
@@ -98 +98 @@
 
                         /*Area coordinates*/
-                        areacoord[0]= (double) dete[0]/tb.det;
-                        areacoord[1]= (double) dete[1]/tb.det;
-                        areacoord[2]= (double) dete[2]/tb.det;
+                        areacoord[0]= reCast<IssmDouble>(dete[0])/reCast<IssmDouble>(tb.det);
+                        areacoord[1]= reCast<IssmDouble>(dete[1])/reCast<IssmDouble>(tb.det);
+                        areacoord[2]= reCast<IssmDouble>(dete[2])/reCast<IssmDouble>(tb.det);
                         /*3 vertices of the triangle*/
                         i0=Th->GetId(tb[0]);