diff --git a/simpegPF/notebooks/SimPEG Tutorial - MAG Linear Problem.ipynb b/simpegPF/notebooks/SimPEG Tutorial - MAG Linear Problem.ipynb index 1b640c16..0abe8ef6 100644 --- a/simpegPF/notebooks/SimPEG Tutorial - MAG Linear Problem.ipynb +++ b/simpegPF/notebooks/SimPEG Tutorial - MAG Linear Problem.ipynb @@ -43,7 +43,7 @@ }, { "cell_type": "code", - "execution_count": 133, + "execution_count": 1, "metadata": { "collapsed": false }, @@ -53,15 +53,19 @@ "output_type": "stream", "text": [ "Using matplotlib backend: nbAgg\n", - "Populating the interactive namespace from numpy and matplotlib\n" + "Populating the interactive namespace from numpy and matplotlib\n", + "Efficiency Warning: Interpolation will be slow, use setup.py!\n", + "\n", + " python setup.py build_ext --inplace\n", + " \n" ] }, { "name": "stderr", "output_type": "stream", "text": [ - "WARNING: pylab import has clobbered these variables: ['linalg', 'beta', 'inv']\n", - "`%matplotlib` prevents importing * from pylab and numpy\n" + "C:\\Users\\dominiquef.MIRAGEOSCIENCE\\AppData\\Local\\Continuum\\Anaconda\\lib\\site-packages\\IPython\\kernel\\__init__.py:13: ShimWarning: The `IPython.kernel` package has been deprecated. You should import from ipykernel or jupyter_client instead.\n", + " \"You should import from ipykernel or jupyter_client instead.\", ShimWarning)\n" ] } ], @@ -74,7 +78,7 @@ }, { "cell_type": "code", - "execution_count": 135, + "execution_count": 2, "metadata": { "collapsed": false, "scrolled": true @@ -164,7 +168,7 @@ }, { "cell_type": "code", - "execution_count": 136, + "execution_count": 3, "metadata": { "collapsed": false }, @@ -201,7 +205,7 @@ }, { "cell_type": "code", - "execution_count": 137, + "execution_count": 4, "metadata": { "collapsed": false }, @@ -990,7 +994,7 @@ }, { "cell_type": "code", - "execution_count": 138, + "execution_count": 5, "metadata": { "collapsed": false }, @@ -1734,7 +1738,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -1746,10 +1750,10 @@ { "data": { "text/plain": [ - "" + "" ] }, - "execution_count": 138, + "execution_count": 5, "metadata": {}, "output_type": "execute_result" } @@ -1798,7 +1802,7 @@ }, { "cell_type": "code", - "execution_count": 141, + "execution_count": 6, "metadata": { "collapsed": false }, @@ -1847,7 +1851,7 @@ }, { "cell_type": "code", - "execution_count": 142, + "execution_count": 7, "metadata": { "collapsed": false }, @@ -1861,17 +1865,15 @@ "=============================== Projected GNCG ===============================\n", " # beta phi_d phi_m f |proj(x-g)-x| LS Comment \n", "-----------------------------------------------------------------------------\n", - " 0 1.00e+04 6.75e+04 3.37e-04 6.75e+04 8.30e+01 0 \n", - " 1 5.00e+03 2.77e+03 3.19e-02 2.93e+03 6.90e+01 0 \n", - " 2 2.50e+03 4.03e+02 5.53e-02 5.41e+02 7.04e+01 0 \n", - " 3 1.25e+03 2.15e+02 5.75e-02 2.87e+02 6.99e+01 0 Skip BFGS \n", - " 4 6.25e+02 2.00e+02 5.82e-02 2.37e+02 7.31e+01 0 Skip BFGS \n", + " 0 1.00e+04 6.72e+04 3.37e-04 6.72e+04 8.30e+01 0 \n", + " 1 5.00e+03 2.72e+03 3.17e-02 2.88e+03 6.90e+01 0 \n", + " 2 2.50e+03 3.73e+02 5.49e-02 5.10e+02 7.03e+01 0 \n", "------------------------- STOP! -------------------------\n", - "1 : |fc-fOld| = 0.0000e+00 <= tolF*(1+|f0|) = 6.7516e+03\n", - "1 : |xc-x_last| = 3.1475e-03 <= tolX*(1+|x0|) = 1.0111e-01\n", - "0 : |proj(x-g)-x| = 7.3120e+01 <= tolG = 1.0000e-01\n", - "0 : |proj(x-g)-x| = 7.3120e+01 <= 1e3*eps = 1.0000e-02\n", - "0 : maxIter = 10 <= iter = 5\n", + "1 : |fc-fOld| = 0.0000e+00 <= tolF*(1+|f0|) = 6.7163e+03\n", + "1 : |xc-x_last| = 6.3549e-03 <= tolX*(1+|x0|) = 1.0111e-01\n", + "0 : |proj(x-g)-x| = 7.0322e+01 <= tolG = 1.0000e-01\n", + "0 : |proj(x-g)-x| = 7.0322e+01 <= 1e3*eps = 1.0000e-02\n", + "0 : maxIter = 10 <= iter = 3\n", "------------------------- DONE! -------------------------\n" ] } @@ -1889,7 +1891,7 @@ }, { "cell_type": "code", - "execution_count": 143, + "execution_count": 8, "metadata": { "collapsed": false }, @@ -2633,7 +2635,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -2673,7 +2675,7 @@ }, { "cell_type": "code", - "execution_count": 144, + "execution_count": 9, "metadata": { "collapsed": false }, @@ -3417,7 +3419,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -3429,10 +3431,10 @@ { "data": { "text/plain": [ - "" + "" ] }, - "execution_count": 144, + "execution_count": 9, "metadata": {}, "output_type": "execute_result" }