Index: ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp =================================================================== --- ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 21855) +++ ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 21856) @@ -11,23 +11,23 @@ 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,7 +45,7 @@ } /*Initialize output*/ - data_interp=xNew(N_interp*N_data); + data_interp=xNew(N_interp*N_data); /*read background mesh*/ Mesh* Th=new Mesh(index_data,x_data,y_data,nods_data,nels_data); @@ -77,7 +77,7 @@ /*Loop over output nodes*/ for(i=0;ixmax || y_interp[i]ymax){ @@ -97,9 +97,9 @@ if (tb.det>0){ /*Area coordinates*/ - areacoord[0]= reCast(dete[0])/reCast(tb.det); - areacoord[1]= reCast(dete[1])/reCast(tb.det); - areacoord[2]= reCast(dete[2])/reCast(tb.det); + areacoord[0]= reCast(dete[0])/reCast(tb.det); + areacoord[1]= reCast(dete[1])/reCast(tb.det); + areacoord[2]= reCast(dete[2])/reCast(tb.det); /*3 vertices of the triangle*/ i0=Th->GetId(tb[0]); i1=Th->GetId(tb[1]); Index: ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h =================================================================== --- ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h (revision 21855) +++ ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h (revision 21856) @@ -7,7 +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