[yt-svn] commit/yt: 2 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Jun 29 09:06:13 PDT 2016
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/e52ceae23f5d/
Changeset: e52ceae23f5d
Branch: yt
User: xarthisius
Date: 2016-06-24 18:01:34+00:00
Summary: Sort block indices in order of ascending levels to match order of grid patches. Closes #1078
Affected #: 1 file
diff -r 27783a435b496c47db10e1a1f5f5f1485ab2bcf1 -r e52ceae23f5da1e49941fa5aa1f5bdd6171ff09e yt/visualization/plot_modifications.py
--- a/yt/visualization/plot_modifications.py
+++ b/yt/visualization/plot_modifications.py
@@ -600,11 +600,12 @@
pxs, pys = np.mgrid[-1:1:3j,-1:1:3j]
else:
pxs, pys = np.mgrid[0:0:1j,0:0:1j]
- GLE, GRE, levels = [], [], []
+ GLE, GRE, levels, block_ids = [], [], [], []
for block, mask in plot.data.blocks:
GLE.append(block.LeftEdge.in_units("code_length"))
GRE.append(block.RightEdge.in_units("code_length"))
levels.append(block.Level)
+ block_ids.append(block.id)
if len(GLE) == 0: return
# Retain both units and registry
GLE = YTArray(GLE, input_units = GLE[0].units)
@@ -613,11 +614,12 @@
min_level = self.min_level or 0
max_level = self.max_level or levels.max()
- # sorts the three arrays in order of ascending level - this makes images look nicer
+ # sorts the four arrays in order of ascending level - this makes images look nicer
new_indices = np.argsort(levels)
levels = levels[new_indices]
GLE = GLE[new_indices]
GRE = GRE[new_indices]
+ block_ids = np.array(block_ids)[new_indices]
for px_off, py_off in zip(pxs.ravel(), pys.ravel()):
pxo = px_off * DW[px_index]
@@ -662,12 +664,11 @@
np.logical_and(xwidth > self.min_pix_ids,
ywidth > self.min_pix_ids),
np.logical_and(levels >= min_level, levels <= max_level))
- active_ids = np.unique(plot.data['grid_indices'])
for i in np.where(visible_ids)[0]:
plot._axes.text(
left_edge_x[i] + (2 * (xx1 - xx0) / xpix),
left_edge_y[i] + (2 * (yy1 - yy0) / ypix),
- "%d" % active_ids[i], clip_on=True)
+ "%d" % block_ids[i], clip_on=True)
plot._axes.hold(False)
class StreamlineCallback(PlotCallback):
https://bitbucket.org/yt_analysis/yt/commits/3215234b6e95/
Changeset: 3215234b6e95
Branch: yt
User: ngoldbaum
Date: 2016-06-29 16:05:53+00:00
Summary: Merged in xarthisius/yt (pull request #2249)
Sort block indices in order of ascending levels to match order of grid patches. Closes #1078
Affected #: 1 file
diff -r ac62b64f19a31f1f484e3ac7a064ee47f43e6673 -r 3215234b6e95186ebf3a1858937e0e476f2b260f yt/visualization/plot_modifications.py
--- a/yt/visualization/plot_modifications.py
+++ b/yt/visualization/plot_modifications.py
@@ -600,11 +600,12 @@
pxs, pys = np.mgrid[-1:1:3j,-1:1:3j]
else:
pxs, pys = np.mgrid[0:0:1j,0:0:1j]
- GLE, GRE, levels = [], [], []
+ GLE, GRE, levels, block_ids = [], [], [], []
for block, mask in plot.data.blocks:
GLE.append(block.LeftEdge.in_units("code_length"))
GRE.append(block.RightEdge.in_units("code_length"))
levels.append(block.Level)
+ block_ids.append(block.id)
if len(GLE) == 0: return
# Retain both units and registry
GLE = YTArray(GLE, input_units = GLE[0].units)
@@ -613,11 +614,12 @@
min_level = self.min_level or 0
max_level = self.max_level or levels.max()
- # sorts the three arrays in order of ascending level - this makes images look nicer
+ # sorts the four arrays in order of ascending level - this makes images look nicer
new_indices = np.argsort(levels)
levels = levels[new_indices]
GLE = GLE[new_indices]
GRE = GRE[new_indices]
+ block_ids = np.array(block_ids)[new_indices]
for px_off, py_off in zip(pxs.ravel(), pys.ravel()):
pxo = px_off * DW[px_index]
@@ -662,12 +664,11 @@
np.logical_and(xwidth > self.min_pix_ids,
ywidth > self.min_pix_ids),
np.logical_and(levels >= min_level, levels <= max_level))
- active_ids = np.unique(plot.data['grid_indices'])
for i in np.where(visible_ids)[0]:
plot._axes.text(
left_edge_x[i] + (2 * (xx1 - xx0) / xpix),
left_edge_y[i] + (2 * (yy1 - yy0) / ypix),
- "%d" % active_ids[i], clip_on=True)
+ "%d" % block_ids[i], clip_on=True)
plot._axes.hold(False)
class StreamlineCallback(PlotCallback):
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list