Merge pull request #86 from simpeg/ref/view

ref/view

Author: lheagy

.bumpversion.cfg

@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 0.1.13
+current_version = 0.1.14
 files = setup.py discretize/__init__.py docs/conf.py
 

discretize/View.py

@@ -48,7 +48,8 @@ def plotImage(
         streamOpts=None,
         gridOpts=None,
         numbering=True, annotationColor='w',
-        range_x=None, range_y=None, sample_grid=None
+        range_x=None, range_y=None, sample_grid=None,
+        stream_threshold=None
     ):
         """
         Mesh.plotImage(v)
@@ -116,7 +117,7 @@ def plotImage(
                 ax=ax, clim=clim, showIt=showIt,
                 pcolorOpts=pcolorOpts, streamOpts=streamOpts,
                 gridOpts=gridOpts, range_x=range_x, range_y=range_y,
-                sample_grid=sample_grid
+                sample_grid=sample_grid, stream_threshold=stream_threshold
             )
         elif self.dim == 3:
             # get copy of image and average to cell-centers is necessary
@@ -186,14 +187,15 @@ def plotImage(
             plt.show()
         return ph
 
-    def plotSlice(self, v, vType='CC',
-                  normal='Z', ind=None, grid=False, view='real',
-                  ax=None, clim=None, showIt=False,
-                  pcolorOpts=None,
-                  streamOpts=None,
-                  gridOpts=None,
-                  range_x=None, range_y=None
-                  ):
+    def plotSlice(
+        self, v, vType='CC',
+        normal='Z', ind=None, grid=False, view='real',
+        ax=None, clim=None, showIt=False,
+        pcolorOpts=None,
+        streamOpts=None,
+        gridOpts=None,
+        range_x=None, range_y=None
+    ):
 
         """
         Plots a slice of a 3D mesh.
@@ -321,7 +323,8 @@ def _plotImage2D(
         gridOpts=None,
         range_x=None,
         range_y=None,
-        sample_grid=None
+        sample_grid=None,
+        stream_threshold=None
     ):
 
         if pcolorOpts is None:
@@ -427,8 +430,21 @@ def _plotImage2D(
                 U = Ui
                 V = Vi
 
-            out += (ax.pcolormesh(x, y, np.sqrt(U**2+V**2).T, vmin=clim[0], vmax=clim[1], **pcolorOpts),)
-            out += (ax.streamplot(tMi.vectorCCx, tMi.vectorCCy, Ui.T, Vi.T, **streamOpts),)
+            if stream_threshold is not None:
+                mask_me = np.sqrt(U**2 + V**2) <= stream_threshold
+                Ui = np.ma.masked_where(mask_me, Ui)
+                Vi = np.ma.masked_where(mask_me, Vi)
+
+            out += (
+                ax.pcolormesh(
+                    x, y, np.sqrt(U**2+V**2).T, vmin=clim[0], vmax=clim[1],
+                    **pcolorOpts),
+            )
+            out += (
+                ax.streamplot(
+                    tMi.vectorCCx, tMi.vectorCCy, Ui.T, Vi.T, **streamOpts
+                ),
+            )
 
         if grid:
             xXGrid = np.c_[self.vectorNx, self.vectorNx, np.nan*np.ones(self.nNx)].flatten()

discretize/__init__.py

@@ -18,7 +18,7 @@
         """
     )
 
-__version__   = '0.1.13'
+__version__   = '0.1.14'
 __author__    = 'SimPEG Team'
 __license__   = 'MIT'
 __copyright__ = '2013 - 2017, SimPEG Developers, http://simpeg.xyz'

docs/conf.py

@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.13'
+version = '0.1.14'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.13'
+release = '0.1.14'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -56,7 +56,7 @@ def configuration(parent_package='', top_path=None):
 
 setup(
     name="discretize",
-    version="0.1.13",
+    version="0.1.14",
     install_requires=[
         'numpy>=1.7',
         'scipy>=0.13',