Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix(contour_array_cvfd): fix for masked value crash issue using trico… #613

Merged
merged 1 commit into from
Jul 11, 2019
Merged

Fix(contour_array_cvfd): fix for masked value crash issue using trico… #613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions flopy/plot/map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,12 @@ def contour_array_cvfd(self, vertc, a, masked_values=None, **kwargs):
contour_set : matplotlib.pyplot.contour

"""
try:
import matplotlib.tri as tri
except ImportError:
err_msg = "Matplotlib must be updated to use contour_array"
raise ImportError(err_msg)

if 'ncpl' in kwargs:
nlay = self.layer + 1
ncpl = kwargs.pop('ncpl')
Expand All @@ -635,9 +641,14 @@ def contour_array_cvfd(self, vertc, a, masked_values=None, **kwargs):

plotarray = a[i0:i1]

ismasked = None
if masked_values is not None:
for mval in masked_values:
plotarray = np.ma.masked_equal(plotarray, mval)
if ismasked is None:
ismasked = np.equal(plotarray, mval)
else:
t = np.equal(plotarray, mval)
ismasked += t

if 'ax' in kwargs:
ax = kwargs.pop('ax')
Expand All @@ -648,8 +659,15 @@ def contour_array_cvfd(self, vertc, a, masked_values=None, **kwargs):
if 'cmap' in kwargs.keys():
kwargs.pop('cmap')

contour_set = ax.tricontour(vertc[:, 0], vertc[:, 1],
plotarray, **kwargs)
triang = tri.Triangulation(vertc[:, 0], vertc[:, 1])

if ismasked is not None:
ismasked = ismasked.flatten()
mask = np.any(np.where(ismasked[triang.triangles],
True, False), axis=1)
triang.set_mask(mask)

contour_set = ax.tricontour(triang, plotarray, **kwargs)

return contour_set

Expand Down Expand Up @@ -1395,17 +1413,17 @@ def __new__(cls, sr=None, ax=None, model=None, dis=None, layer=0,

modelgrid = None
if model is not None:
if (xul, yul, xll, yll, rotation) != (
None, None, None, None, None):
if (xul, yul, xll, yll, rotation) != (None, None,
None, None, None):
modelgrid = plotutil._set_coord_info(model.modelgrid,
xul, yul, xll, yll,
rotation)
elif sr is not None:
if length_multiplier is not None:
sr.length_multiplier = length_multiplier

if (xul, yul, xll, yll, rotation) != (
None, None, None, None, None):
if (xul, yul, xll, yll, rotation) != (None, None,
None, None, None):
sr.set_spatialreference(xul, yul, xll, yll, rotation)

if isinstance(sr, SpatialReferenceUnstructured):
Expand Down