[yt-svn] commit/yt: ngoldbaum: Merged in MatthewTurk/yt (pull request #2049)

[commits-noreply at bitbucket.org]

1 new commit in yt:

http://link.bitbucket.org/wf/click?upn=8USRlNyft-2BCzk2l4Ywl6gDx2lD2xxoS9E7MwXb2SMR-2BXcTD42YocdnOFkyGBVHOU7BTw6GywY3-2BWcPFH-2FTA4ffVg68ZGJh0nsA-2FYhwaNs0k-3D_ll4ctv0L-2ByeRZFC1LslHcg6aJmnQ70VruLbmeLQr27D-2Bme1yIdPb77yrtfWmIOochQhRfO74lf1KLUCHRXaQ44trvQzPjcg1uvvF9r5xFaAc7I84OfGPx5IejnvyajMl2FdtQrimOoU-2Bo6dwfC46O-2FGkgAc04pB-2Fx2-2B5W4fRNyQp9J4l74ABcILAnP4QIw6j7TsN-2BxvhiOupe8u-2F-2Fz2tOi5Y0GFUf10wj35-2BhSp3LVA-3D
Changeset:   293bfec508a7
Branch:      yt
User:        ngoldbaum
Date:        2016-03-23 20:48:54+00:00
Summary:     Merged in MatthewTurk/yt (pull request #2049)

Fix some types of octree block traversal.
Affected #:  1 file

diff -r b6563d32400e520b26ccbb6793998537d91e61af -r 293bfec508a7e0d143791ffd2f67eb974638bd0e yt/data_objects/octree_subset.py
--- a/yt/data_objects/octree_subset.py
+++ b/yt/data_objects/octree_subset.py
@@ -118,7 +118,7 @@
         mask = self.oct_handler.mask(selector, domain_id = self.domain_id)
         slicer = OctreeSubsetBlockSlice(self)
         for i, sl in slicer:
-            yield sl, mask[i,...]
+            yield sl, np.atleast_3d(mask[i,...])
 
     def select_tcoords(self, dobj):
         # These will not be pre-allocated, which can be a problem for speed and
@@ -129,6 +129,8 @@
             dt, t = dobj.selector.get_dt(sl)
             dts.append(dt)
             ts.append(t)
+        if len(dts) == len(ts) == 0:
+            return np.empty(0, "f8"), np.empty(0, "f8")
         return np.concatenate(dts), np.concatenate(ts)
 
     @property

Repository URL: http://link.bitbucket.org/wf/click?upn=8USRlNyft-2BCzk2l4Ywl6gDx2lD2xxoS9E7MwXb2SMR-2BI0v8SbQq-2B8-2FZaaHaJT85r_ll4ctv0L-2ByeRZFC1LslHcg6aJmnQ70VruLbmeLQr27D-2Bme1yIdPb77yrtfWmIOochQhRfO74lf1KLUCHRXaQ40iJQNP4MhHQGCOGHZfu1YxNKFJgsy7PedZEWIOMoX9E0IUVefo9e2uIY30Mh5liVmZDAsV36RSPY4UyAXHUPDKrLa6F6caPFbOq0r24W7eF4kZBfM2I705NgINLXiCjxXBWNiZJFbKL7WBJOi6FSBU-3D

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.spacepope.org/pipermail/yt-svn-spacepope.org/attachments/20160323/5e507fd1/attachment.htm>