Changeset 18465

Timestamp:

08/26/14 14:25:52 (11 years ago)

Author:

abuzzi

Message:

MODIF: correction

Location:

issm/trunk-jpl/src/m/contrib/gravity

Files:

• vfsa.cpp (modified) (3 diffs)
• vfsa_mpi.cpp (modified) (3 diffs)

issm/trunk-jpl/src/m/contrib/gravity/vfsa.cpp

@@ -130 +130 @@
 void vec2gridsimple(Matrix *V,Matrix *V1,int nx, int ny);
 void reshape(Matrix* V,Matrix* V1,int nx,int ny);
-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);
+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);
 void GSLsquarefit(Matrix** pX,Matrix* A,Matrix* B);
 double signe(double a);
 void filtergrav(Matrix* A,Matrix* Ain,double ctr,double sd,int mx,int my);
 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);
-double coolshed(double T0,int k,double c,double D);
+double coolshed(double T0,double k,double c,double D);
 void   LaunchThread(void* function(void*), void* usr,int num_threads);
 /*}}}*/
@@ -539 +539 @@
         }
 }/*}}}*/
-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){/*{{{*/
+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){/*{{{*/
         Matrix* m1=new Matrix(mx*my,4);
         Matrix* m2=new Matrix(mx*my,3);
@@ -691 +691 @@
         }
 }/*}}}*/
-double coolshed(double T0,int k,double c,double D){/*{{{*/
+double coolshed(double T0,double k,double c,double D){/*{{{*/
         double T1=T0*exp(-c*pow(k,1/D));
         return T1;

issm/trunk-jpl/src/m/contrib/gravity/vfsa_mpi.cpp

@@ -129 +129 @@
 void vec2gridsimple(Matrix *V,Matrix *V1,int nx, int ny);
 void reshape(Matrix* V,Matrix* V1,int nx,int ny);
-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);
+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);
 void GSLsquarefit(Matrix** pX,Matrix* A,Matrix* B);
 double signe(double a);
 void filtergrav(Matrix* A,Matrix* Ain,double ctr,double sd,int mx,int my);
 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);
-double coolshed(double T0,int k,double c,double D);
+double coolshed(double T0,double k,double c,double D);
 /*}}}*/
 
@@ -621 +621 @@
         }
 }/*}}}*/
-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){/*{{{*/
+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){/*{{{*/
         Matrix* m1=new Matrix(mx*my,4);
         Matrix* m2=new Matrix(mx*my,3);
@@ -742 +742 @@
         }
 }/*}}}*/
-double coolshed(double T0,int k,double c,double D){/*{{{*/
+double coolshed(double T0,double k,double c,double D){/*{{{*/
         double T1=T0*exp(-c*pow(k,1/D));
         return T1;