source: issm/oecreview/Archive/21724-22754/ISSM-21855-21856.diff@ 22755

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

@@ -11 +11 @@
 using namespace bamg;
 using namespace std;
 
-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){
+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){
 
         /*Output*/
-        IssmDouble* data_interp=NULL;
+        double* data_interp=NULL;
 
         /*Intermediary*/
-        IssmDouble xmin,xmax,ymin,ymax;
+        double xmin,xmax,ymin,ymax;
         bool   isdefault;
-        IssmDouble defaultvalue;
+        double defaultvalue;
         R2     r;
         I2     I;
         int    i,j,k;
         int    it;
         int    i0,i1,i2;
-        IssmDouble areacoord[3];
-        IssmDouble aa,bb;
+        double areacoord[3];
+        double aa,bb;
         long long dete[3];
 
         /*Checks*/
@@ -45 +45 @@
         }
 
         /*Initialize output*/
-        data_interp=xNew<IssmDouble>(N_interp*N_data);
+        data_interp=xNew<double>(N_interp*N_data);
 
         /*read background mesh*/
         Mesh* Th=new Mesh(index_data,x_data,y_data,nods_data,nels_data); 
@@ -77 +77 @@
 
         /*Loop over output nodes*/
         for(i=0;i<N_interp;i++){
-                //if(i%100==0) _printf_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<IssmDouble(i)/IssmDouble(N_interp)*100.<<"%   ");
+                //if(i%100==0) _printf_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(i)/double(N_interp)*100.<<"%   ");
 
                 if(isdefault){
                         if(x_interp[i]<xmin || x_interp[i]>xmax || y_interp[i]<ymin || y_interp[i]>ymax){
@@ -97 +97 @@
                 if (tb.det>0){ 
 
                         /*Area coordinates*/
-                        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);
+                        areacoord[0]= reCast<double>(dete[0])/reCast<double>(tb.det);
+                        areacoord[1]= reCast<double>(dete[1])/reCast<double>(tb.det);
+                        areacoord[2]= reCast<double>(dete[2])/reCast<double>(tb.det);
                         /*3 vertices of the triangle*/
                         i0=Th->GetId(tb[0]);
                         i1=Th->GetId(tb[1]);

../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h

@@ -7 +7 @@
 
 #include "../../classes/classes.h"
 
-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);
+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);
 
 #endif