Changeset 18439

Timestamp:

08/19/14 08:53:36 (11 years ago)

Author:

abuzzi

Message:

MODIF: version OK

File:

• issm/trunk-jpl/src/m/contrib/gravity/vfsa.cpp (modified) (5 diffs)

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

@@ -133 +133 @@
 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);
 /*}}}*/
 
@@ -259 +260 @@
                            /*}}}*/
         double q=0;
- q=misfit(mesh_ini,evalid,gobs,dlevel,Pobs,xobs,yobs,Pp,rho1,rho2,dx,dy,dn,nx,ny,mx,my);
+/* q=misfit(mesh_ini,evalid,gobs,dlevel,Pobs,xobs,yobs,Pp,rho1,rho2,dx,dy,dn,nx,ny,mx,my);
      cout<< q;
-/*      Matrix* G=new Matrix(4,3);
+Matrix* G=new Matrix(4,3);
         Matrix* df=new Matrix(4,1);
         Matrix* o=new Matrix(4,1);
@@ -283 +284 @@
         M->Echo();
         o->Echo();*/
-double a;
-a=signe(-9);
-cout<<a;
+        Matrix* m1=new Matrix(mx*my,3);
+        double T=100;
+newmodelgen(mesh_ini,m1,bathy,icethick,mx,my,T,ptval,mmax,mmax2,ctr,sd);
         return 0;
 }/*}}}*/
@@ -517 +518 @@
         m1->ExtractColumn(m1col,1);
         vec2gridsimple(m1col,m1gr,mx,my);
+        cout<<endl<<endl;
         filtergrav(m1grsm,m1gr,ctr,sd,mx,my);
         reshape(m1grsm,m1col,mx,my);
@@ -568 +570 @@
 }/*}}}*/
 void filtergrav(Matrix* A,Matrix* Ain,double ctr,double sd,int mx,int my){/*{{{*/
+        A->MatrixEqual(Ain);
         for (int i=1;i<my-1;i++){
                 for(int j=1;j<mx-1;j++){