gempy 0.996

aprenoveau · Sep 11, 2017 · 6ea3c5c · 6ea3c5c
1 parent 25cc1fc
commit 6ea3c5c
Show file tree

Hide file tree

Showing 189 changed files with 6,962 additions and 1,919 deletions.
diff --git a/Tutorial/ch1.ipynb b/Tutorial/ch1.ipynb
diff --git a/Tutorial/ch2.ipynb b/Tutorial/ch2.ipynb
diff --git a/Tutorial/ch3.ipynb b/Tutorial/ch3.ipynb
diff --git a/Tutorial/ch4.ipynb b/Tutorial/ch4.ipynb
@@ -884,18 +884,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [
     {
-     "ename": "NameError",
-     "evalue": "name 'model' is not defined",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mNameError\u001b[0m                                 Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-1-182c03240c70>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0mtheano\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mprinting\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mpydotprint\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      2\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 3\u001b[0;31m \u001b[0mpydotprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mmodel\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mlogpt\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
-      "\u001b[0;31mNameError\u001b[0m: name 'model' is not defined"
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "The output file is available at /home/miguel/.theano/compiledir_Linux-4.10--generic-x86_64-with-debian-stretch-sid-x86_64-3.6.1-64/theano.pydotprint.cpu.png\n"
      ]
     }
    ],
@@ -905,17 +901,6 @@
     "pydotprint(model.logpt)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 15,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": [
-    "import pydot"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

diff --git a/Tutorial/ch5.ipynb b/Tutorial/ch5.ipynb
@@ -430,15 +430,6 @@
     "plt.imshow(grav.reshape(50,50), cmap='viridis', origin='lower', extent=[7.050000e+05,747000,6863000,6950000] )\n",
     "plt.colorbar()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

diff --git a/Tutorial/ch6.ipynb b/Tutorial/ch6.ipynb
@@ -10,9 +10,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "import sys\n",
@@ -314,9 +312,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": []
   }
@@ -337,17 +333,30 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.2"
+   "version": "3.6.1"
+  },
+  "latex_envs": {
+   "LaTeX_envs_menu_present": true,
+   "autocomplete": true,
+   "bibliofile": "biblio.bib",
+   "cite_by": "apalike",
+   "current_citInitial": 1,
+   "eqLabelWithNumbers": true,
+   "eqNumInitial": 1,
+   "hotkeys": {
+    "equation": "Ctrl-E",
+    "itemize": "Ctrl-I"
+   },
+   "labels_anchors": false,
+   "latex_user_defs": false,
+   "report_style_numbering": false,
+   "user_envs_cfg": false
   },
   "toc": {
    "colors": {
     "hover_highlight": "#DAA520",
-    "navigate_num": "#000000",
-    "navigate_text": "#333333",
     "running_highlight": "#FF0000",
-    "selected_highlight": "#FFD700",
-    "sidebar_border": "#EEEEEE",
-    "wrapper_background": "#FFFFFF"
+    "selected_highlight": "#FFD700"
    },
    "moveMenuLeft": true,
    "nav_menu": {

diff --git a/Tutorial/pymc2_tutorial b/Tutorial/pymc2_tutorial
diff --git a/docs/build/doctrees/Notebooks/ch1.doctree b/docs/build/doctrees/Notebooks/ch1.doctree
diff --git a/docs/build/doctrees/Notebooks/ch2.doctree b/docs/build/doctrees/Notebooks/ch2.doctree
diff --git a/docs/build/doctrees/Notebooks/ch3.doctree b/docs/build/doctrees/Notebooks/ch3.doctree
diff --git a/docs/build/doctrees/Notebooks/ch4.doctree b/docs/build/doctrees/Notebooks/ch4.doctree
diff --git a/docs/build/doctrees/code.doctree b/docs/build/doctrees/code.doctree
diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle
diff --git a/docs/build/html/Notebooks/ch1.html b/docs/build/html/Notebooks/ch1.html
diff --git a/docs/build/html/Notebooks/ch2.html b/docs/build/html/Notebooks/ch2.html
@@ -151,7 +151,7 @@ <h2>Data Management<a class="headerlink" href="#data-management" title="Permalin
               <span class="n">verbose</span><span class="o">=</span><span class="mi">1</span><span class="p">)</span>
 </pre></div>
 </div>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">&lt;</span><span class="n">gempy</span><span class="o">.</span><span class="n">strat_pile</span><span class="o">.</span><span class="n">StratigraphicPile</span> <span class="n">at</span> <span class="mh">0x7fc851df16a0</span><span class="o">&gt;</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">&lt;</span><span class="n">gempy</span><span class="o">.</span><span class="n">strat_pile</span><span class="o">.</span><span class="n">StratigraphicPile</span> <span class="n">at</span> <span class="mh">0x7fa8f69f0588</span><span class="o">&gt;</span>
 </pre></div>
 </div>
 <img alt="../_images/ch2_11_1.png" src="../_images/ch2_11_1.png" />
@@ -167,7 +167,7 @@ <h2>Computing the model<a class="headerlink" href="#computing-the-model" title="
 <div class="highlight-ipython3"><div class="highlight"><pre><span></span><span class="n">interp_data</span> <span class="o">=</span> <span class="n">gp</span><span class="o">.</span><span class="n">InterpolatorInput</span><span class="p">(</span><span class="n">geo_data</span><span class="p">)</span>
 </pre></div>
 </div>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">Level</span> <span class="n">of</span> <span class="n">Optimization</span><span class="p">:</span>  <span class="n">fast_compile</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">Level</span> <span class="n">of</span> <span class="n">Optimization</span><span class="p">:</span>  <span class="n">fast_run</span>
 <span class="n">Device</span><span class="p">:</span>  <span class="n">cpu</span>
 <span class="n">Precision</span><span class="p">:</span>  <span class="n">float32</span>
 </pre></div>
@@ -186,23 +186,31 @@ <h2>Computing the model<a class="headerlink" href="#computing-the-model" title="
 </pre></div>
 </div>
 <img alt="../_images/ch2_18_0.png" src="../_images/ch2_18_0.png" />
+<div class="highlight-ipython3"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">matplotlib.pyplot</span> <span class="kn">as</span> <span class="nn">plt</span>
+
+<span class="n">gp</span><span class="o">.</span><span class="n">plot_section</span><span class="p">(</span><span class="n">geo_data</span><span class="p">,</span> <span class="n">lith_block</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="o">-</span><span class="mi">1</span><span class="p">,</span> <span class="n">plot_data</span><span class="o">=</span><span class="bp">True</span><span class="p">,</span> <span class="n">direction</span><span class="o">=</span><span class="s1">&#39;z&#39;</span><span class="p">)</span>
+<span class="n">fig</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">gcf</span><span class="p">()</span>
+<span class="n">fig</span><span class="o">.</span><span class="n">set_size_inches</span><span class="p">(</span><span class="mf">18.5</span><span class="p">,</span> <span class="mf">10.5</span><span class="p">)</span>
+</pre></div>
+</div>
+<img alt="../_images/ch2_19_0.png" src="../_images/ch2_19_0.png" />
 <div class="highlight-ipython3"><div class="highlight"><pre><span></span><span class="o">%</span><span class="k">matplotlib</span> inline
 <span class="n">gp</span><span class="o">.</span><span class="n">plot_section</span><span class="p">(</span><span class="n">geo_data</span><span class="p">,</span> <span class="n">lith_block</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span><span class="mi">25</span><span class="p">,</span> <span class="n">plot_data</span><span class="o">=</span><span class="bp">True</span><span class="p">,</span> <span class="n">direction</span><span class="o">=</span><span class="s1">&#39;x&#39;</span><span class="p">)</span>
 <span class="n">fig</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">gcf</span><span class="p">()</span>
 <span class="n">fig</span><span class="o">.</span><span class="n">set_size_inches</span><span class="p">(</span><span class="mf">18.5</span><span class="p">,</span> <span class="mf">10.5</span><span class="p">)</span>
 </pre></div>
 </div>
-<img alt="../_images/ch2_19_0.png" src="../_images/ch2_19_0.png" />
+<img alt="../_images/ch2_20_0.png" src="../_images/ch2_20_0.png" />
 <p>The second row keeps the potential field:</p>
 <div class="highlight-ipython3"><div class="highlight"><pre><span></span><span class="n">gp</span><span class="o">.</span><span class="n">plot_potential_field</span><span class="p">(</span><span class="n">geo_data</span><span class="p">,</span> <span class="n">lith_block</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span> <span class="mi">11</span><span class="p">,</span> <span class="n">cmap</span><span class="o">=</span><span class="s1">&#39;inferno_r&#39;</span><span class="p">)</span>
 <span class="kn">import</span> <span class="nn">matplotlib.pyplot</span> <span class="kn">as</span> <span class="nn">plt</span>
 <span class="n">plt</span><span class="o">.</span><span class="n">colorbar</span><span class="p">()</span>
 </pre></div>
 </div>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">&lt;</span><span class="n">matplotlib</span><span class="o">.</span><span class="n">colorbar</span><span class="o">.</span><span class="n">Colorbar</span> <span class="n">at</span> <span class="mh">0x7f2f98338ef0</span><span class="o">&gt;</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">&lt;</span><span class="n">matplotlib</span><span class="o">.</span><span class="n">colorbar</span><span class="o">.</span><span class="n">Colorbar</span> <span class="n">at</span> <span class="mh">0x7fa8e40e4a90</span><span class="o">&gt;</span>
 </pre></div>
 </div>
-<img alt="../_images/ch2_21_1.png" src="../_images/ch2_21_1.png" />
+<img alt="../_images/ch2_22_1.png" src="../_images/ch2_22_1.png" />
 <p>And the axis 2 keeps the faults network that in this model since there
 is not faults does not represent anything.</p>
 <p>Additionally with can export the blocks to vtk in order to visualize
@@ -237,8 +245,6 @@ <h3><a href="../index.html">Table Of Contents</a></h3>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="ch3.html">Chapter 3: Stochastic Simulations in pymc2</a></li>
-<li class="toctree-l2"><a class="reference internal" href="ch3.html#setting-up-the-pymc-functions">Setting up the pymc-Functions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="ch3.html#analyzing-the-results">Analyzing the results</a></li>
 <li class="toctree-l2"><a class="reference internal" href="ch4.html">Chapter 4: Bayesian Statistics in pymc3 (Working in progress proof of concept)</a></li>
 </ul>
 </li>