Merge pull request #43 from birocoles/R3

R3
pinga-lab · Oct 3, 2019 · ba18c9e · ba18c9e
2 parents 5b31762 + 19d8243
commit ba18c9e
Show file tree

Hide file tree

Showing 425 changed files with 42,721 additions and 5,669 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ code/gmt.conf
 *~
 *-eps-converted-to.pdf
 *.fdb_latexmk
+*.tiff
diff --git a/code/A-model-rifted-margin-model-(figures).ipynb b/code/A-model-rifted-margin-model-(figures).ipynb
@@ -18,7 +18,7 @@
    "cell_type": "raw",
    "metadata": {},
    "source": [
-    "Figures - simple model II"
+    "Figures - rifted margin (model A)"
    ]
   },
   {
@@ -211,7 +211,7 @@
    },
    "outputs": [],
    "source": [
-    "gsyn = np.reshape(np.loadtxt('../data/simple-model-II-synthetic-gravity-data.txt'),(n,1))"
+    "gsyn = np.reshape(np.loadtxt('../data/A-model-rifted-margin-synthetic-gravity-data.txt'),(n,1))"
    ]
   },
   {
@@ -229,7 +229,7 @@
    },
    "outputs": [],
    "source": [
-    "tw = np.reshape(np.loadtxt('../data/simple-model-II-bathymetry.txt'),(n,1))"
+    "tw = np.reshape(np.loadtxt('../data/A-model-rifted-margin-bathymetry.txt'),(n,1))"
    ]
   },
   {
@@ -247,9 +247,9 @@
    },
    "outputs": [],
    "source": [
-    "true_basement = np.reshape(np.loadtxt('../data/simple-model-II-true-basement-surface.txt'),(n,1))\n",
+    "true_basement = np.reshape(np.loadtxt('../data/A-model-rifted-margin-true-basement-surface.txt'),(n,1))\n",
     "\n",
-    "true_moho = np.reshape(np.loadtxt('../data/simple-model-II-true-moho-surface.txt'),(n,1))\n",
+    "true_moho = np.reshape(np.loadtxt('../data/A-model-rifted-margin-true-moho-surface.txt'),(n,1))\n",
     "\n",
     "# True reference moho surface (SR = S0+dS0)\n",
     "true_S0 = np.array([29500.0])\n",
@@ -290,13 +290,14 @@
    "outputs": [],
    "source": [
     "# initial guess basement surface\n",
-    "ini_basement = np.reshape(np.loadtxt('../data/simple-model-II-initial-basement-surface.txt'),(n,1))\n",
+    "ini_basement = np.reshape(np.loadtxt('../data/A-model-rifted-margin-initial-basement-surface.txt'),(n,1))\n",
     "\n",
     "# initial guess moho surface\n",
-    "ini_moho = np.reshape(np.loadtxt('../data/simple-model-II-initial-moho-surface.txt'),(n,1))\n",
+    "ini_moho = np.reshape(np.loadtxt('../data/A-model-rifted-margin-initial-moho-surface.txt'),(n,1))\n",
     "\n",
     "# initial guess reference moho surface (SR = S0+dS0)\n",
-    "ini_dS0 = np.array([8500.0])"
+    "ini_dS0 = np.array([8500.0])\n",
+    "ini_RM = S0 + ini_dS0"
    ]
   },
   {
@@ -316,9 +317,9 @@
    "source": [
     "# Known values: basement and moho surfaces\n",
     "\n",
-    "base_known = np.loadtxt('../data/simple-model-II-base-known-depths.txt')\n",
+    "base_known = np.loadtxt('../data/A-model-rifted-margin-basement-known-depths.txt', ndmin=2)\n",
     "\n",
-    "moho_known = np.loadtxt('../data/simple-model-II-moho-known-depths.txt')"
+    "moho_known = np.loadtxt('../data/A-model-rifted-margin-moho-known-depths.txt', ndmin=2)"
    ]
   },
   {
@@ -336,7 +337,7 @@
    },
    "outputs": [],
    "source": [
-    "g0 = np.reshape(np.loadtxt('../data/simple-model-II-initial-guess-gravity-data.txt'),(n,1))"
+    "g0 = np.reshape(np.loadtxt('../data/A-model-rifted-margin-initial-guess-gravity-data.txt'),(n,1))"
    ]
   },
   {
@@ -352,9 +353,9 @@
     "collapsed": true
    },
    "source": [
-    "p = np.reshape(np.loadtxt('../data/simple-model-II-parameter-vector-alphas_-10(3)_-8(1)_-7(2)_-7(1)_-6(2).txt'),(2*n+1,1))\n",
-    "g = np.reshape(np.loadtxt('../data/simple-model-II-predicted-gravity-data-alphas_-10(3)_-8(1)_-7(2)_-7(1)_-6(2).txt'),(n,1))\n",
-    "gama_list = np.loadtxt('../data/simple-model-II-gama-list-alphas_-10(3)_-8(1)_-7(2)_-7(1)_-6(2).txt')"
+    "g = np.reshape(np.loadtxt('../data/A-model-rifted-margin-predicted-gravity-data-alphas_-10(3)_-8(1)_-7(2)_-7(1)_-6(2).txt'),(n,1))\n",
+    "p = np.reshape(np.loadtxt('../data/A-model-rifted-margin-parameter-vector-alphas_-10(3)_-8(1)_-7(2)_-7(1)_-6(2).txt'),(2*n+1,1))\n",
+    "gama_list = np.loadtxt('../data/A-model-rifted-margin-gama-list-alphas_-10(3)_-8(1)_-7(2)_-7(1)_-6(2).txt')"
    ]
   },
   {
@@ -365,9 +366,27 @@
    },
    "outputs": [],
    "source": [
-    "p = np.reshape(np.loadtxt('../data/simple-model-II-parameter-vector-alphas_X_-8(1)_-7(2)_-7(1)_-6(2).txt'),(2*n+1,1))\n",
-    "g = np.reshape(np.loadtxt('../data/simple-model-II-predicted-gravity-data-alphas_X_-8(1)_-7(2)_-7(1)_-6(2).txt'),(n,1))\n",
-    "gama_list = np.loadtxt('../data/simple-model-II-gama-list-alphas_X_-8(1)_-7(2)_-7(1)_-6(2).txt')"
+    "g = np.reshape(np.loadtxt('../data/A-model-rifted-margin-predicted-gravity-data-alphas_X_-8(1)_-7(2)_-7(1)_-6(2).txt'),(n,1))\n",
+    "p = np.reshape(np.loadtxt('../data/A-model-rifted-margin-parameter-vector-alphas_X_-8(1)_-7(2)_-7(1)_-6(2).txt'),(2*n+1,1))\n",
+    "gama_list = np.loadtxt('../data/A-model-rifted-margin-gama-list-alphas_X_-8(1)_-7(2)_-7(1)_-6(2).txt')"
+   ]
+  },
+  {
+   "cell_type": "raw",
+   "metadata": {},
+   "source": [
+    "g0 = g.copy()\n",
+    "ini_basement = tw + p[0:n]\n",
+    "ini_moho = S0 - p[n:n+n]\n",
+    "ini_dS0 = p[n+n]"
+   ]
+  },
+  {
+   "cell_type": "raw",
+   "metadata": {},
+   "source": [
+    "g = np.reshape(np.loadtxt('../data/A-model-rifted-margin-predicted-gravity-data-alphas_-10(3)_-7(1)_-6(2)_-7(1)_-6(2)-sgm_1.txt'),(n,1))\n",
+    "p = np.reshape(np.loadtxt('../data/A-model-rifted-margin-parameter-vector-alphas_-10(3)_-7(1)_-6(2)_-7(1)_-6(2)-sgm_1.txt'),(2*n+1,1))"
    ]
   },
   {
@@ -601,7 +620,7 @@
     "\n",
     "plt.tight_layout()    \n",
     "    \n",
-    "#mpl.savefig('../manuscript/figures/simple-model-II-grafics-estimated-model-alphas_X_1_2_1_2.png', dpi='figure', bbox_inches='tight')\n",
+    "#mpl.savefig('../manuscript/figures/A-model-rifted-margin-grafics-estimated-model-alphas_2_1_2_1_2.png', dpi='figure', bbox_inches='tight')\n",
     "plt.show()      "
    ]
   },

diff --git a/code/A-model-rifted-margin-model-(initial-guess).ipynb b/code/A-model-rifted-margin-model-(initial-guess).ipynb
diff --git a/code/A-model-rifted-margin-model-(inverse-problem)-(constant-isostatic-constrain).ipynb b/code/A-model-rifted-margin-model-(inverse-problem)-(constant-isostatic-constrain).ipynb
diff --git a/code/A-model-rifted-margin-model-(inverse-problem)-(variable-isostatic-constrain).ipynb b/code/A-model-rifted-margin-model-(inverse-problem)-(variable-isostatic-constrain).ipynb
@@ -333,9 +333,9 @@
    "source": [
     "# Known values: basement and moho surfaces\n",
     "\n",
-    "base_known = np.loadtxt('../data/A-model-rifted-margin-base-known-depths.txt')\n",
+    "base_known = np.loadtxt('../data/A-model-rifted-margin-basement-known-depths.txt', ndmin=2)\n",
     "\n",
-    "moho_known = np.loadtxt('../data/A-model-rifted-margin-moho-known-depths.txt')"
+    "moho_known = np.loadtxt('../data/A-model-rifted-margin-moho-known-depths.txt', ndmin=2)"
    ]
   },
   {