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

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 3.4 KB
RevLine 
[22755]1Index: ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp
2===================================================================
3--- ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 21855)
4+++ ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 21856)
5@@ -11,23 +11,23 @@
6 using namespace bamg;
7 using namespace std;
8
9-int InterpFromMeshToMesh2dx(IssmDouble** pdata_interp,int* index_data,IssmDouble* x_data,IssmDouble* y_data,int nods_data,int nels_data,
10- IssmDouble* data,int M_data,int N_data,IssmDouble* x_interp,IssmDouble* y_interp,int N_interp,Options* options){
11+int InterpFromMeshToMesh2dx(double** pdata_interp,int* index_data,double* x_data,double* y_data,int nods_data,int nels_data,
12+ double* data,int M_data,int N_data,double* x_interp,double* y_interp,int N_interp,Options* options){
13
14 /*Output*/
15- IssmDouble* data_interp=NULL;
16+ double* data_interp=NULL;
17
18 /*Intermediary*/
19- IssmDouble xmin,xmax,ymin,ymax;
20+ double xmin,xmax,ymin,ymax;
21 bool isdefault;
22- IssmDouble defaultvalue;
23+ double defaultvalue;
24 R2 r;
25 I2 I;
26 int i,j,k;
27 int it;
28 int i0,i1,i2;
29- IssmDouble areacoord[3];
30- IssmDouble aa,bb;
31+ double areacoord[3];
32+ double aa,bb;
33 long long dete[3];
34
35 /*Checks*/
36@@ -45,7 +45,7 @@
37 }
38
39 /*Initialize output*/
40- data_interp=xNew<IssmDouble>(N_interp*N_data);
41+ data_interp=xNew<double>(N_interp*N_data);
42
43 /*read background mesh*/
44 Mesh* Th=new Mesh(index_data,x_data,y_data,nods_data,nels_data);
45@@ -77,7 +77,7 @@
46
47 /*Loop over output nodes*/
48 for(i=0;i<N_interp;i++){
49- //if(i%100==0) _printf_("\r interpolation progress: "<<setw(6)<<setprecision(2)<<IssmDouble(i)/IssmDouble(N_interp)*100.<<"% ");
50+ //if(i%100==0) _printf_("\r interpolation progress: "<<setw(6)<<setprecision(2)<<double(i)/double(N_interp)*100.<<"% ");
51
52 if(isdefault){
53 if(x_interp[i]<xmin || x_interp[i]>xmax || y_interp[i]<ymin || y_interp[i]>ymax){
54@@ -97,9 +97,9 @@
55 if (tb.det>0){
56
57 /*Area coordinates*/
58- areacoord[0]= reCast<IssmDouble>(dete[0])/reCast<IssmDouble>(tb.det);
59- areacoord[1]= reCast<IssmDouble>(dete[1])/reCast<IssmDouble>(tb.det);
60- areacoord[2]= reCast<IssmDouble>(dete[2])/reCast<IssmDouble>(tb.det);
61+ areacoord[0]= reCast<double>(dete[0])/reCast<double>(tb.det);
62+ areacoord[1]= reCast<double>(dete[1])/reCast<double>(tb.det);
63+ areacoord[2]= reCast<double>(dete[2])/reCast<double>(tb.det);
64 /*3 vertices of the triangle*/
65 i0=Th->GetId(tb[0]);
66 i1=Th->GetId(tb[1]);
67Index: ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h
68===================================================================
69--- ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h (revision 21855)
70+++ ../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h (revision 21856)
71@@ -7,7 +7,7 @@
72
73 #include "../../classes/classes.h"
74
75-int InterpFromMeshToMesh2dx(IssmDouble** pdata_interp,int* index_data,IssmDouble* x_data,IssmDouble* y_data,int nods_data,int nels_data,
76- IssmDouble* data,int M_data,int N_data,IssmDouble* x_interp,IssmDouble* y_interp,int N_interp,Options* options);
77+int InterpFromMeshToMesh2dx(double** pdata_interp,int* index_data,double* x_data,double* y_data,int nods_data,int nels_data,
78+ double* data,int M_data,int N_data,double* x_interp,double* y_interp,int N_interp,Options* options);
79
80 #endif
Note: See TracBrowser for help on using the repository browser.