[yt-svn] commit/yt: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/f78ce962295f/
Changeset:   f78ce962295f
Branch:      yt
User:        MatthewTurk
Date:        2014-10-16 02:30:36+00:00
Summary:     Another corner-case check for unitful fields.
Affected #:  1 file

diff -r 9d022af9c4de627a45b1250f8c5427b9d8562989 -r f78ce962295fc9ba49dc345d641c467d4afa5a5e yt/frontends/stream/data_structures.py
--- a/yt/frontends/stream/data_structures.py
+++ b/yt/frontends/stream/data_structures.py
@@ -473,7 +473,8 @@
             field_units[k] = v.units
             new_data[k] = v.copy().d
         data = new_data
-    elif all([(len(val) == 2) for val in data.values()]):
+    elif all([((not isinstance(val, np.ndarray)) and (len(val) == 2))
+             for val in data.values()]):
         new_data, field_units = {}, {}
         for field in data:
             try:


https://bitbucket.org/yt_analysis/yt/commits/1089b61212d7/
Changeset:   1089b61212d7
Branch:      yt
User:        xarthisius
Date:        2014-10-16 15:52:21+00:00
Summary:     Merged in MatthewTurk/yt (pull request #1254)

[BUGFIX] Another corner-case check for unitful fields.
Affected #:  1 file

diff -r 39285f3a563b2d3575f6e3f4c756f4e541bd5871 -r 1089b61212d7bfd105a109728fb804b6ef84aadf yt/frontends/stream/data_structures.py
--- a/yt/frontends/stream/data_structures.py
+++ b/yt/frontends/stream/data_structures.py
@@ -473,7 +473,8 @@
             field_units[k] = v.units
             new_data[k] = v.copy().d
         data = new_data
-    elif all([(len(val) == 2) for val in data.values()]):
+    elif all([((not isinstance(val, np.ndarray)) and (len(val) == 2))
+             for val in data.values()]):
         new_data, field_units = {}, {}
         for field in data:
             try:

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.