Bump version: 0.1.7 → 0.1.8 (+7 squashed commits)

Squashed commits:
[ac5bb36] Bump version: 0.1.8 → 0.1.9
[8acd6b2] ImportException --> ImportError
[ac410a8] matplotlib.pyplot has errors on import, put these in the functions
that rely on them directly.
[f128a20] Bump version: 0.1.6 → 0.1.7
[5866bea] Remove IPython utils.

These are out of date, and have problems on Linux (without a proper
visual backend).
[a519e56] Bump version: 0.1.5 → 0.1.6
[f45aa83] Bump version: 0.1.4 → 0.1.5

.bumpversion.cfg

@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 0.1.4
+current_version = 0.1.9
 files = setup.py SimPEG/__init__.py docs/conf.py
 

SimPEG/EM/Analytics/FDEM.py

@@ -2,7 +2,6 @@ from __future__ import division
 import numpy as np
 from scipy.constants import mu_0, pi
 from scipy.special import erf
-import matplotlib.pyplot as plt
 from SimPEG import Utils
 
 

SimPEG/Examples/EM_FDEM_1D_Inversion.py

@@ -1,7 +1,7 @@
 from SimPEG import *
 import SimPEG.EM as EM
 from scipy.constants import mu_0
-import matplotlib.pyplot as plt
+
 
 def run(plotIt=True):
     """
@@ -31,6 +31,7 @@ def run(plotIt=True):
 
 
     if plotIt:
+        import matplotlib.pyplot as plt
         fig, ax = plt.subplots(1,1, figsize = (3, 6))
         plt.semilogx(sigma[active], mesh.vectorCCz[active])
         ax.set_ylim(-600, 0)
@@ -60,6 +61,7 @@ def run(plotIt=True):
     survey.Wd = 1/(abs(survey.dobs)*std)
 
     if plotIt:
+        import matplotlib.pyplot as plt
         fig, ax = plt.subplots(1,1, figsize = (10, 6))
         ax.loglog(rx.times, dtrue, 'b.-')
         ax.loglog(rx.times, survey.dobs, 'r.-')
@@ -88,6 +90,7 @@ def run(plotIt=True):
     mopt = inv.run(m0)
 
     if plotIt:
+        import matplotlib.pyplot as plt
         fig, ax = plt.subplots(1,1, figsize = (3, 6))
         plt.semilogx(sigma[active], mesh.vectorCCz[active])
         plt.semilogx(np.exp(mopt), mesh.vectorCCz[active])

SimPEG/Examples/FLOW_Richards_1D_Celia1990.py

@@ -1,6 +1,5 @@
 from SimPEG import *
 from SimPEG.FLOW import Richards
-import matplotlib.pyplot as plt
 
 def run(plotIt=True):
     """
@@ -61,6 +60,7 @@ def run(plotIt=True):
     Hs_H120= getFields(120.,'head')
 
     if not plotIt:return
+    import matplotlib.pyplot as plt
     plt.figure(figsize=(13,5))
     plt.subplot(121)
     plt.plot(40-M.gridCC, Hs_M10[-1],'b-')

SimPEG/Examples/Forward_BasicDirectCurrent.py

@@ -1,7 +1,4 @@
 from SimPEG import Mesh, Utils, np, SolverLU
-import matplotlib.pyplot as plt
-import matplotlib
-from matplotlib.mlab import griddata
 
 ## 2D DC forward modeling example with Tensor and Curvilinear Meshes
 
@@ -39,6 +36,10 @@ def run(plotIt=True):
 
     if not plotIt: return
 
+    import matplotlib.pyplot as plt
+    import matplotlib
+    from matplotlib.mlab import griddata
+
     #Step4: Making Figure
     fig, axes = plt.subplots(1,2,figsize=(12*1.2,4*1.2))
     label = ["(a)", "(b)"]

SimPEG/Mesh/TreeMesh.py

@@ -90,11 +90,6 @@
 #
 
 from SimPEG import np, sp, Utils, Solver
-import matplotlib.pyplot as plt
-import matplotlib
-from mpl_toolkits.mplot3d import Axes3D
-import matplotlib.colors as colors
-import matplotlib.cm as cmx
 
 try:
     import TreeUtils
@@ -1973,6 +1968,13 @@ class TreeMesh(BaseTensorMesh, InnerProducts):
         facesX=False, facesY=False, facesZ=False,
         edgesX=False, edgesY=False, edgesZ=False):
 
+
+        import matplotlib.pyplot as plt
+        import matplotlib
+        from mpl_toolkits.mplot3d import Axes3D
+        import matplotlib.colors as colors
+        import matplotlib.cm as cmx
+
         # self.number()
 
         axOpts = {'projection':'3d'} if self.dim == 3 else {}
@@ -2094,6 +2096,13 @@ class TreeMesh(BaseTensorMesh, InnerProducts):
     def plotImage(self, I, ax=None, showIt=False, grid=False, clim=None):
         if self.dim == 3: raise Exception('Use plot slice?')
 
+
+        import matplotlib.pyplot as plt
+        import matplotlib
+        from mpl_toolkits.mplot3d import Axes3D
+        import matplotlib.colors as colors
+        import matplotlib.cm as cmx
+
         if ax is None: ax = plt.subplot(111)
         jet = cm = plt.get_cmap('jet')
         cNorm  = colors.Normalize(
@@ -2123,6 +2132,13 @@ class TreeMesh(BaseTensorMesh, InnerProducts):
         assert vType in ['CC','F','E']
         assert self.dim == 3
 
+
+        import matplotlib.pyplot as plt
+        import matplotlib
+        from mpl_toolkits.mplot3d import Axes3D
+        import matplotlib.colors as colors
+        import matplotlib.cm as cmx
+
         szSliceDim = len(getattr(self, 'h'+normal.lower())) #: Size of the sliced dimension
         if ind is None: ind = int(szSliceDim/2)
         assert type(ind) in [int, long], 'ind must be an integer'
@@ -2269,6 +2285,13 @@ class CellLookUpException(TreeException):
 
 if __name__ == '__main__':
 
+
+    import matplotlib.pyplot as plt
+    import matplotlib
+    from mpl_toolkits.mplot3d import Axes3D
+    import matplotlib.colors as colors
+    import matplotlib.cm as cmx
+
     def topo(x):
         return np.sin(x*(2.*np.pi))*0.3 + 0.5
 

SimPEG/Mesh/View.py

@@ -1,8 +1,11 @@
 import numpy as np
-import matplotlib.pyplot as plt
-import matplotlib
-from mpl_toolkits.mplot3d import Axes3D
-from SimPEG.Utils import mkvc, animate
+from SimPEG.Utils import mkvc
+try:
+    import matplotlib.pyplot as plt
+    import matplotlib
+    from mpl_toolkits.mplot3d import Axes3D
+except ImportError, e:
+    print 'Trouble importing matplotlib.'
 
 
 class TensorView(object):
@@ -479,63 +482,6 @@ class TensorView(object):
         ax.grid(True)
         if showIt: plt.show()
 
-    def slicer(mesh, var, imageType='CC', normal='z', index=0, ax=None, clim=None):
-        assert normal in 'xyz', 'normal must be x, y, or z'
-        if ax is None: ax = plt.subplot(111)
-        I = mesh.r(var,'CC','CC','M')
-        axes = [p for p in 'xyz' if p not in normal.lower()]
-        if normal is 'x': I = I[index,:,:]
-        if normal is 'y': I = I[:,index,:]
-        if normal is 'z': I = I[:,:,index]
-        if clim is None: clim = [I.min(),I.max()]
-        p = ax.pcolormesh(getattr(mesh,'vectorN'+axes[0]),getattr(mesh,'vectorN'+axes[1]),I.T,vmin=clim[0],vmax=clim[1])
-        ax.axis('tight')
-        ax.set_xlabel(axes[0])
-        ax.set_ylabel(axes[1])
-        return p
-
-    def videoSlicer(mesh,var,imageType='CC',normal='z',figsize=(10,8)):
-        assert mesh.dim > 2, 'This is for 3D meshes only.'
-        # First set up the figure, the axis, and the plot element we want to animate
-        fig = plt.figure(figsize=figsize)
-        ax = plt.axes()
-        clim = [var.min(),var.max()]
-        plt.colorbar(mesh.slicer(var, imageType=imageType, normal=normal, index=0, ax=ax, clim=clim))
-        tlt = plt.title(normal)
-
-        def animateFrame(i):
-            mesh.slicer(var, imageType=imageType, normal=normal, index=i, ax=ax, clim=clim)
-            tlt.set_text(normal.upper()+('-Slice: %d, %4.4f' % (i,getattr(mesh,'vectorCC'+normal)[i])))
-
-        return animate(fig, animateFrame, frames=mesh.vnC['xyz'.index(normal)])
-
-    def video(mesh, var, function, figsize=(10, 8), colorbar=True, skip=1):
-        """
-        Call a function for a list of models to create a video.
-
-        ::
-
-            def function(var, ax, clim, tlt, i):
-                tlt.set_text('%d'%i)
-                return mesh.plotImage(var, imageType='CC', ax=ax, clim=clim)
-
-            mesh.video([model1, model2, ..., modeln],function)
-        """
-        # First set up the figure, the axis, and the plot element we want to animate
-        fig = plt.figure(figsize=figsize)
-        ax = plt.axes()
-        VAR = np.concatenate(var)
-        clim = [VAR.min(),VAR.max()]
-        tlt = plt.title('')
-        if colorbar:
-            plt.colorbar(function(var[0],ax,clim,tlt,0))
-
-        frames = np.arange(0,len(var),skip)
-        def animateFrame(j):
-            i = frames[j]
-            function(var[i],ax,clim,tlt,i)
-
-        return animate(fig, animateFrame, frames=len(frames))
 
 class CylView(object):
 

SimPEG/Tests.py

@@ -1,5 +1,4 @@
 import numpy as np
-import matplotlib.pyplot as plt
 from numpy.linalg import norm
 from SimPEG.Utils import mkvc, sdiag, diagEst
 from SimPEG import Utils
@@ -311,6 +310,7 @@ def checkDerivative(fctn, x0, num=7, plotIt=True, dx=None, expectedOrder=2, tole
 
 
     if plotIt:
+        import matplotlib.pyplot as plt
         ax = ax or plt.subplot(111)
         ax.loglog(h, E0, 'b')
         ax.loglog(h, E1, 'g--')

SimPEG/Utils/__init__.py

@@ -3,7 +3,6 @@ from codeutils import *
 from meshutils import exampleLrmGrid, meshTensor, closestPoints, readUBCTensorMesh, writeUBCTensorMesh, writeUBCTensorModel, readVTRFile, writeVTRFile
 from curvutils import volTetra, faceInfo, indexCube
 from interputils import interpmat
-from ipythonutils import easyAnimate as animate
 from CounterUtils import *
 import ModelBuilder
 import SolverUtils

SimPEG/Utils/ipythonutils.py

@@ -1,28 +0,0 @@
-from tempfile import NamedTemporaryFile
-import matplotlib.pyplot as plt
-from matplotlib import animation
-
-# http://jakevdp.github.io/blog/2013/05/12/embedding-matplotlib-animations/
-# http://www.renevolution.com/how-to-install-ffmpeg-on-mac-os-x/
-
-VIDEO_TAG = """<video controls loop>
- <source src="data:video/x-m4v;base64,{0}" type="video/mp4">
- Your browser does not support the video tag.
-</video>"""
-
-def anim_to_html(anim):
-    if not hasattr(anim, '_encoded_video'):
-        with NamedTemporaryFile(suffix='.mp4') as f:
-            anim.save(f.name, fps=20, extra_args=['-vcodec', 'libx264', '-pix_fmt', 'yuv420p'])
-            video = open(f.name, "rb").read()
-        anim._encoded_video = video.encode("base64")
-
-    return VIDEO_TAG.format(anim._encoded_video)
-
-def display_animation(anim):
-    plt.close(anim._fig)
-    return anim_to_html(anim)
-
-animation.Animation._repr_html_ = display_animation
-
-easyAnimate = animation.FuncAnimation

SimPEG/__init__.py

@@ -15,7 +15,7 @@ import Directives
 import Inversion
 import Tests
 
-__version__   = '0.1.4'
+__version__   = '0.1.9'
 __author__    = 'Rowan Cockett'
 __license__   = 'MIT'
 __copyright__ = 'Copyright 2014 Rowan Cockett'

docs/conf.py

@@ -51,9 +51,9 @@ copyright = u'2013, SimPEG Developers'
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.4'
+version = '0.1.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.4'
+release = '0.1.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -77,7 +77,7 @@ with open("README.rst") as f:
 
 setup(
     name = "SimPEG",
-    version = "0.1.4",
+    version = "0.1.9",
     packages = find_packages(),
     install_requires = ['numpy>=1.7',
                         'scipy>=0.13',