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

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/a3f0bf738e65/
Changeset:   a3f0bf738e65
Branch:      yt
User:        ngoldbaum
Date:        2016-04-19 20:39:43+00:00
Summary:     Merged in MatthewTurk/yt (pull request #2116)

Ensuring mask for dt in octree is in correct order. Closes #1175
Affected #:  2 files

diff -r d8eec89b2c86f300ce9cfb0205b97cefb5dd0c45 -r a3f0bf738e6566959d9144adc81c2a918099615b yt/data_objects/octree_subset.py
--- a/yt/data_objects/octree_subset.py
+++ b/yt/data_objects/octree_subset.py
@@ -125,7 +125,7 @@
         # memory usage.
         dts, ts = [], []
         for sl, mask in self.select_blocks(dobj.selector):
-            sl.child_mask = mask
+            sl.child_mask = np.asfortranarray(mask)
             dt, t = dobj.selector.get_dt(sl)
             dts.append(dt)
             ts.append(t)

diff -r d8eec89b2c86f300ce9cfb0205b97cefb5dd0c45 -r a3f0bf738e6566959d9144adc81c2a918099615b yt/data_objects/tests/test_rays.py
--- a/yt/data_objects/tests/test_rays.py
+++ b/yt/data_objects/tests/test_rays.py
@@ -1,9 +1,12 @@
 import numpy as np
 
+from yt import \
+    load
 from yt.testing import \
     fake_random_ds, \
     assert_equal, \
-    assert_rel_equal
+    assert_rel_equal, \
+    requires_file
 from yt.units.yt_array import \
     uconcatenate
 
@@ -48,3 +51,12 @@
             yield assert_rel_equal, my_ray['density'][ray_cells].sum(), \
                                     my_all['density'][my_cells].sum(), 14
             yield assert_rel_equal, my_ray['dts'].sum(), unitary, 14
+
+ at requires_file('GadgetDiskGalaxy/snapshot_200.hdf5')
+def test_ray_in_particle_octree():
+    ds = load('GadgetDiskGalaxy/snapshot_200.hdf5')
+    start = ds.arr([31995.63476562, 31473.6640625, 28969.88671875], "code_length")
+    end = ds.arr([31995.63476562, 31473.6640625, 29219.88671875], "code_length")
+    ray = ds.ray(start, end)
+    ray["t"]
+    assert_equal(ray["dts"].sum(dtype="f8"), 1.0)

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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.spacepope.org/pipermail/yt-svn-spacepope.org/attachments/20160419/e7cfad8f/attachment.htm>