Changeset 18587

Timestamp:

10/07/14 14:43:39 (10 years ago)

Author:

abuzzi

Message:

CNG: slightly modified for better performance

File:

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

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

@@ -150 +150 @@
         /* Define the variables {{{*/
 
-        int    dx     = 500;   /* prism dimension in x-direction                           */
-        int    dy     = 500;   /* prism dimension in y-direction                           */
-        int    mx     = 39;    /* number of prisms in x-direction                          */
-        int    my     = 60;    /* number of prisms in y-direction                          */
-        int    nx     = 39;    /* number of data points in x-direction                     */
-        int    ny     = 60;    /* number of data points in y-direction                     */
+        int    dx     = 1000;   /* prism dimension in x-direction                           */
+        int    dy     = 1000;   /* prism dimension in y-direction                           */
+        int    mx     = 99;    /* number of prisms in x-direction                          */
+        int    my     = 99;    /* number of prisms in y-direction                          */
+        int    nx     = 99;    /* number of data points in x-direction                     */
+        int    ny     = 99;    /* number of data points in y-direction                     */
         int    dn     = 15000; /* distance for neighbouting prisms for gravity calculation */
         double ptval  = 100.;  /* max. amount to perturb model                             */
@@ -169 +169 @@
         // Pp->Echo();
 
-        double  rhoi = 890;           /* ice density     */
+        double  rhoi = 917;           /* ice density     */
         double  rhow = 1030;          /* water density   */
         // double  rhos = 2013;               /* sediment density */
@@ -185 +185 @@
         rho2->SetValue(0,1,rhow-rhoc);
 
-        double dlevel=860;         /* level of data acquisition */
+        double dlevel=2400;         /* level of data acquisition */
 
         double ctr=1;            /* parameter for filtering */
-        double sd=0.5;
+        double sd=0.1;
 
         Matrix *xobs= new Matrix(ny,nx);
@@ -198 +198 @@
 
 
-        double mmax  = 1000;               /* max value for layer interfaces */
-        double mmax2 = 1000;
-        double mmax3 = 1000;
+        double mmax  = 2000;               /* max value for layer interfaces */
+        double mmax2 = 2000;
+        double mmax3 = 2000;
 
         /* control parameter for temperature schedule  */
@@ -226 +226 @@
         /*landmask */
 
-        ifstream file("landmask.txt");
+        ifstream file("landmaskzach.txt");
         Matrix * landmask= new Matrix(nx*ny,1);
         double inputnumber;
@@ -237 +237 @@
         /* Observed gravity anomaly */
 
-        ifstream file1("store_fa500_36s.txt");
+        ifstream file1("gravityzach.txt");
         Matrix * gobs= new Matrix(nx*ny,1);
         for(int i=0;i<ny*nx; i++){ 
@@ -248 +248 @@
         /* load data about the ice thickness */
 
-        ifstream file2("store_flag_icethick500.txt");
+        ifstream file2("icethickzach.txt");
         Matrix * icethick= new Matrix(mx*my,1);
         for(int s=0;s<mx*my; s++){ 
@@ -259 +259 @@
         /* load the batimethry data */
 
-        ifstream file3("store_flag_bathy500.txt");
+        ifstream file3("bathymetryzach.txt");
         Matrix * bathy= new Matrix(mx*my,1);
         for(int s=0;s<mx*my; s++){ 
@@ -271 +271 @@
 
 
-        ifstream file4("store_flag_eval500.txt");
+        ifstream file4("evalidzach.txt");
         Matrix * evalid= new Matrix(nx*ny,1);
         for(int s=0;s<nx*ny; s++){ 
@@ -282 +282 @@
         /* initial guess of the model */
 
-        ifstream file5("m0_140114b.txt");
+        ifstream file5("m0_092614zach.txt");
         Matrix * mesh_ini= new Matrix(mx*my,3);
         for(int s=0;s<mx*my; s++){ 
@@ -296 +296 @@
 
         /* name of the files to save results */
-        std::ofstream savefile1 ("r_140114b.txt");
-        std::ofstream savefile2("m_140114b.txt");
+        std::ofstream savefile1 ("r_zach.txt");
+        std::ofstream savefile2("m_zach.txt");
 
         /* counters initialization */