From 45a5ab556ea6c82bb3ace0fa3c0fea70a94119b4 Mon Sep 17 00:00:00 2001 From: D Fournier Date: Tue, 19 Jan 2016 15:26:14 -0800 Subject: [PATCH] no message --- ...SimPEG Tutorial - MAG Linear Problem.ipynb | 70 +++++++------------ 1 file changed, 24 insertions(+), 46 deletions(-) diff --git a/simpegPF/notebooks/SimPEG Tutorial - MAG Linear Problem.ipynb b/simpegPF/notebooks/SimPEG Tutorial - MAG Linear Problem.ipynb index 619729be..2f4a0d74 100644 --- a/simpegPF/notebooks/SimPEG Tutorial - MAG Linear Problem.ipynb +++ b/simpegPF/notebooks/SimPEG Tutorial - MAG Linear Problem.ipynb @@ -100,7 +100,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 25, "metadata": { "collapsed": false, "scrolled": true @@ -119,9 +119,9 @@ "# Create a mesh\n", "dx = 5.\n", "\n", - "hxind = [(dx, 20)]\n", - "hyind = [(dx, 20)]\n", - "hzind = [(5, 10)]\n", + "hxind = [(dx,5,-1.3), (dx, 20), (dx,5,1.3)]\n", + "hyind = [(dx,5,-1.3), (dx, 20), (dx,5,1.3)]\n", + "hzind = [(dx,5,-1.3),(5, 10)]\n", "\n", "mesh = Mesh.TensorMesh([hxind, hyind, hzind], 'CCC')\n", "\n", @@ -145,7 +145,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 26, "metadata": { "collapsed": false }, @@ -153,10 +153,10 @@ { "data": { "text/plain": [ - "30.0" + "59.390075000000003" ] }, - "execution_count": 14, + "execution_count": 26, "metadata": {}, "output_type": "execute_result" } @@ -200,7 +200,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 27, "metadata": { "collapsed": false }, @@ -237,7 +237,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 29, "metadata": { "collapsed": false }, @@ -1000,7 +1000,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -1025,7 +1025,7 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 30, "metadata": { "collapsed": false }, @@ -1769,7 +1769,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -1809,7 +1809,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 31, "metadata": { "collapsed": false }, @@ -1850,7 +1850,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 32, "metadata": { "collapsed": false }, @@ -1889,7 +1889,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 33, "metadata": { "collapsed": false }, @@ -1904,12 +1904,12 @@ "=============================== Projected GNCG ===============================\n", " # beta phi_d phi_m f |proj(x-g)-x| LS Comment \n", "-----------------------------------------------------------------------------\n", - " 0 1.13e-02 5.62e+04 2.15e-07 5.62e+04 5.06e+01 0 \n", + " 0 9.70e-03 5.58e+04 2.22e-07 5.58e+04 8.41e+01 0 \n", "------------------------- STOP! -------------------------\n", - "1 : |fc-fOld| = 0.0000e+00 <= tolF*(1+|f0|) = 5.6238e+03\n", - "0 : |xc-x_last| = 3.9811e-02 <= tolX*(1+|x0|) = 1.0063e-10\n", - "0 : |proj(x-g)-x| = 5.0612e+01 <= tolG = 1.0000e-01\n", - "0 : |proj(x-g)-x| = 5.0612e+01 <= 1e3*eps = 1.0000e-02\n", + "1 : |fc-fOld| = 0.0000e+00 <= tolF*(1+|f0|) = 5.5847e+03\n", + "0 : |xc-x_last| = 4.1645e-02 <= tolX*(1+|x0|) = 1.0116e-10\n", + "0 : |proj(x-g)-x| = 8.4094e+01 <= tolG = 1.0000e-01\n", + "0 : |proj(x-g)-x| = 8.4094e+01 <= 1e3*eps = 1.0000e-02\n", "0 : maxIter = 6 <= iter = 1\n", "------------------------- DONE! -------------------------\n" ] @@ -1921,29 +1921,7 @@ }, { "cell_type": "code", - "execution_count": 21, - "metadata": { - "collapsed": false - }, - "outputs": [ - { - "data": { - "text/plain": [ - "False" - ] - }, - "execution_count": 21, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "np.nan <= 0.1" - ] - }, - { - "cell_type": "code", - "execution_count": 22, + "execution_count": 35, "metadata": { "collapsed": false }, @@ -2687,7 +2665,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -2699,10 +2677,10 @@ { "data": { "text/plain": [ - "" + "" ] }, - "execution_count": 22, + "execution_count": 35, "metadata": {}, "output_type": "execute_result" }