source: issm/oecreview/Archive/18296-19100/ISSM-18464-18465.diff@ 19102

Last change on this file since 19102 was 19102, checked in by Mathieu Morlighem, 10 years ago

NEW: added 18296-19100
File size: 4.2 KB
RevLine 
[19102]1Index: ../trunk-jpl/src/m/contrib/gravity/vfsa.cpp
2===================================================================
3--- ../trunk-jpl/src/m/contrib/gravity/vfsa.cpp (revision 18464)
4+++ ../trunk-jpl/src/m/contrib/gravity/vfsa.cpp (revision 18465)
5@@ -129,12 +129,12 @@
6 void* plouffT(void* vpthread_handle);
7 void vec2gridsimple(Matrix *V,Matrix *V1,int nx, int ny);
8 void reshape(Matrix* V,Matrix* V1,int nx,int ny);
9-double misfit(Matrix* m0,Matrix* evalid,Matrix* gobs,int dlevel,Matrix* Pobs,Matrix* xobs,Matrix* yobs,Matrix* Pp,Matrix* rho1, Matrix* rho2,int dx,int dy,int dn,int nx,int ny, int mx,int my);
10+double misfit(Matrix* m0,Matrix* evalid,Matrix* gobs,double dlevel,Matrix* Pobs,Matrix* xobs,Matrix* yobs,Matrix* Pp,Matrix* rho1, Matrix* rho2,int dx,int dy,int dn,int nx,int ny, int mx,int my);
11 void GSLsquarefit(Matrix** pX,Matrix* A,Matrix* B);
12 double signe(double a);
13 void filtergrav(Matrix* A,Matrix* Ain,double ctr,double sd,int mx,int my);
14 void newmodelgen(Matrix* m0,Matrix* m1,Matrix* bathy,Matrix* icethick,int mx,int my,double T,double ptval,double mmax,double mmax2,double ctr,double sd);
15-double coolshed(double T0,int k,double c,double D);
16+double coolshed(double T0,double k,double c,double D);
17 void LaunchThread(void* function(void*), void* usr,int num_threads);
18 /*}}}*/
19
20@@ -538,7 +538,7 @@
21 }
22 }
23 }/*}}}*/
24-double misfit(Matrix* m0,Matrix* evalid,Matrix* gobs,int dlevel,Matrix* Pobs,Matrix* xobs,Matrix* yobs,Matrix* Pp,Matrix* rho1, Matrix* rho2,int dx,int dy,int dn,int nx,int ny, int mx,int my){/*{{{*/
25+double misfit(Matrix* m0,Matrix* evalid,Matrix* gobs,double dlevel,Matrix* Pobs,Matrix* xobs,Matrix* yobs,Matrix* Pp,Matrix* rho1, Matrix* rho2,int dx,int dy,int dn,int nx,int ny, int mx,int my){/*{{{*/
26 Matrix* m1=new Matrix(mx*my,4);
27 Matrix* m2=new Matrix(mx*my,3);
28 Matrix* g1=new Matrix(nx*ny,1);
29@@ -690,7 +690,7 @@
30 }
31 }
32 }/*}}}*/
33-double coolshed(double T0,int k,double c,double D){/*{{{*/
34+double coolshed(double T0,double k,double c,double D){/*{{{*/
35 double T1=T0*exp(-c*pow(k,1/D));
36 return T1;
37 }/*}}}*/
38Index: ../trunk-jpl/src/m/contrib/gravity/vfsa_mpi.cpp
39===================================================================
40--- ../trunk-jpl/src/m/contrib/gravity/vfsa_mpi.cpp (revision 18464)
41+++ ../trunk-jpl/src/m/contrib/gravity/vfsa_mpi.cpp (revision 18465)
42@@ -128,12 +128,12 @@
43 void plouff(Matrix *g,Matrix *Pobs,Matrix *Pp,Matrix * mesh,Matrix *rho,int dx,int dy, int dn,int m,int n,int l,int my_rank,int num_procs);
44 void vec2gridsimple(Matrix *V,Matrix *V1,int nx, int ny);
45 void reshape(Matrix* V,Matrix* V1,int nx,int ny);
46-double misfit(Matrix* m0,Matrix* evalid,Matrix* gobs,int dlevel,Matrix* Pobs,Matrix* xobs,Matrix* yobs,Matrix* Pp,Matrix* rho1, Matrix* rho2,int dx,int dy,int dn,int nx,int ny, int mx,int my,int my_rank,int num_procs);
47+double misfit(Matrix* m0,Matrix* evalid,Matrix* gobs,double dlevel,Matrix* Pobs,Matrix* xobs,Matrix* yobs,Matrix* Pp,Matrix* rho1, Matrix* rho2,int dx,int dy,int dn,int nx,int ny, int mx,int my,int my_rank,int num_procs);
48 void GSLsquarefit(Matrix** pX,Matrix* A,Matrix* B);
49 double signe(double a);
50 void filtergrav(Matrix* A,Matrix* Ain,double ctr,double sd,int mx,int my);
51 void newmodelgen(Matrix* m0,Matrix* m1,Matrix* bathy,Matrix* icethick,int mx,int my,double T,double ptval,double mmax,double mmax2,double ctr,double sd);
52-double coolshed(double T0,int k,double c,double D);
53+double coolshed(double T0,double k,double c,double D);
54 /*}}}*/
55
56 int main(int argc,char *argv[]){/*{{{*/
57@@ -620,7 +620,7 @@
58 }
59 }
60 }/*}}}*/
61-double misfit(Matrix* m0,Matrix* evalid,Matrix* gobs,int dlevel,Matrix* Pobs,Matrix* xobs,Matrix* yobs,Matrix* Pp,Matrix* rho1, Matrix* rho2,int dx,int dy,int dn,int nx,int ny, int mx,int my,int my_rank,int num_procs){/*{{{*/
62+double misfit(Matrix* m0,Matrix* evalid,Matrix* gobs,double dlevel,Matrix* Pobs,Matrix* xobs,Matrix* yobs,Matrix* Pp,Matrix* rho1, Matrix* rho2,int dx,int dy,int dn,int nx,int ny, int mx,int my,int my_rank,int num_procs){/*{{{*/
63 Matrix* m1=new Matrix(mx*my,4);
64 Matrix* m2=new Matrix(mx*my,3);
65 Matrix* g1=new Matrix(nx*ny,1);
66@@ -741,7 +741,7 @@
67 }
68 }
69 }/*}}}*/
70-double coolshed(double T0,int k,double c,double D){/*{{{*/
71+double coolshed(double T0,double k,double c,double D){/*{{{*/
72 double T1=T0*exp(-c*pow(k,1/D));
73 return T1;
74 }/*}}}*/
Note: See TracBrowser for help on using the repository browser.