Merge pull request #91 from simpeg/feat/stream_threshold

Feat/stream threshold

Author: lheagy

.bumpversion.cfg

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

discretize/View.py

@@ -194,7 +194,8 @@ def plotSlice(
         pcolorOpts=None,
         streamOpts=None,
         gridOpts=None,
-        range_x=None, range_y=None
+        range_x=None, range_y=None,
+        stream_threshold=None
     ):
 
         """
@@ -228,7 +229,14 @@ def plotSlice(
             fig, axs = plt.subplots(1, len(vType))
             out = []
             for vTypeI, ax in zip(vType, axs):
-                out += [self.plotSlice(v, vType=vTypeI, normal=normal, ind=ind, grid=grid, view=view, ax=ax, clim=clim, showIt=False, pcolorOpts=pcolorOpts, streamOpts=streamOpts, gridOpts=gridOpts)]
+                out += [
+                    self.plotSlice(
+                        v, vType=vTypeI, normal=normal, ind=ind, grid=grid,
+                        view=view, ax=ax, clim=clim, showIt=False,
+                        pcolorOpts=pcolorOpts, streamOpts=streamOpts,
+                        gridOpts=gridOpts, stream_threshold=stream_threshold
+                    )
+                ]
             return out
         viewOpts = ['real', 'imag', 'abs', 'vec']
         normalOpts = ['X', 'Y', 'Z']
@@ -307,7 +315,7 @@ def doSlice(v):
             grid=grid, view=view,
             ax=ax, clim=clim, showIt=showIt,
             pcolorOpts=pcolorOpts, streamOpts=streamOpts,
-            gridOpts=gridOpts
+            gridOpts=gridOpts, stream_threshold=stream_threshold
         )
 
         ax.set_xlabel('y' if normal == 'X' else 'x')
@@ -431,7 +439,7 @@ def _plotImage2D(
                 V = Vi
 
             if stream_threshold is not None:
-                mask_me = np.sqrt(U**2 + V**2) <= stream_threshold
+                mask_me = np.sqrt(Ui**2 + Vi**2) <= stream_threshold
                 Ui = np.ma.masked_where(mask_me, Ui)
                 Vi = np.ma.masked_where(mask_me, Vi)
 

discretize/__init__.py

@@ -18,7 +18,7 @@
         """
     )
 
-__version__   = '0.1.17'
+__version__   = '0.1.18'
 __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.17'
+version = '0.1.18'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.17'
+release = '0.1.18'
 
 # 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.17",
+    version="0.1.18",
     install_requires=[
         'numpy>=1.7',
         'scipy>=0.13',