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

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/d96b0f9e1767/
Changeset:   d96b0f9e1767
Branch:      yt
User:        xarthisius
Date:        2016-10-26 15:39:05+00:00
Summary:     Merged in ngoldbaum/yt (pull request #2423)

Use output_units instead of units in ProfileND._get_data
Affected #:  2 files

diff -r 9030614870c430b62d09a43cf11277551ea493c0 -r d96b0f9e17673b388fb19ce09b71dbf0512ed0ae tests/tests.yaml
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -39,7 +39,7 @@
   local_owls_000:
     - yt/frontends/owls/tests/test_outputs.py
 
-  local_pw_009:
+  local_pw_010:
     - yt/visualization/tests/test_plotwindow.py:test_attributes
     - yt/visualization/tests/test_plotwindow.py:test_attributes_wt
     - yt/visualization/tests/test_profile_plots.py:test_phase_plot_attributes

diff -r 9030614870c430b62d09a43cf11277551ea493c0 -r d96b0f9e17673b388fb19ce09b71dbf0512ed0ae yt/data_objects/profiles.py
--- a/yt/data_objects/profiles.py
+++ b/yt/data_objects/profiles.py
@@ -239,10 +239,10 @@
         if not np.any(filter): return None
         arr = np.zeros((bin_fields[0].size, len(fields)), dtype="float64")
         for i, field in enumerate(fields):
-            units = chunk.ds.field_info[field].units
+            units = chunk.ds.field_info[field].output_units
             arr[:,i] = chunk[field][filter].in_units(units)
         if self.weight_field is not None:
-            units = chunk.ds.field_info[self.weight_field].units
+            units = chunk.ds.field_info[self.weight_field].output_units
             weight_data = chunk[self.weight_field].in_units(units)
         else:
             weight_data = np.ones(filter.size, dtype="float64")

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.