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

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/f20d58ca2848/
Changeset:   f20d58ca2848
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-06-15 14:46:08
Summary:     Merged in MatthewTurk/yt/yt-3.0 (pull request #952)

Fixing regression in particle deposition.
Affected #:  1 file

diff -r b6b78bc7de4c9cce495f58cefaabcee2dfe3bbaa -r f20d58ca2848dd2df5c6e97ae1627b0a623f130a yt/data_objects/octree_subset.py
--- a/yt/data_objects/octree_subset.py
+++ b/yt/data_objects/octree_subset.py
@@ -102,10 +102,11 @@
             new_shape = (nz, nz, nz, n_oct, 3)
         else:
             raise RuntimeError
-        # This will retain units now.
-        arr.shape = new_shape
-        if not arr.flags["F_CONTIGUOUS"]:
-            arr = arr.reshape(new_shape, order="F")
+        # Note that if arr is already F-contiguous, this *shouldn't* copy the
+        # data.  But, it might.  However, I can't seem to figure out how to
+        # make the assignment to .shape, which *won't* copy the data, make the
+        # resultant array viewed in Fortran order.
+        arr = arr.reshape(new_shape, order="F")
         return arr
 
     _domain_ind = None

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.