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

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/5673e4b09797/
Changeset:   5673e4b09797
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-06-24 18:55:04
Summary:     Merged in ngoldbaum/yt/yt-3.0 (pull request #970)

Improve error discovery for user-defined derived fields.
Affected #:  2 files

diff -r 9d49401f21e703885835e9c01ff7295bdafadc85 -r 5673e4b09797721a28e461a09a6bb167df9b5d04 yt/analysis_modules/sunyaev_zeldovich/projection.py
--- a/yt/analysis_modules/sunyaev_zeldovich/projection.py
+++ b/yt/analysis_modules/sunyaev_zeldovich/projection.py
@@ -41,16 +41,17 @@
         return data["gas","density"]*data["gas","kT"]*data["gas","kT"]
     ds.add_field(("gas", "t_squared"), function = _t_squared,
                  units="g*keV**2/cm**3")
-    def _beta_perp_squared(field, data):
-        return data["gas","density"]*data["gas","velocity_magnitude"]**2/clight/clight - data["gas","beta_par_squared"]
-    ds.add_field(("gas","beta_perp_squared"), function = _beta_perp_squared,
-                 units="g/cm**3")
 
     def _beta_par_squared(field, data):
         return data["gas","beta_par"]**2/data["gas","density"]
     ds.add_field(("gas","beta_par_squared"), function = _beta_par_squared,
                  units="g/cm**3")
 
+    def _beta_perp_squared(field, data):
+        return data["gas","density"]*data["gas","velocity_magnitude"]**2/clight/clight - data["gas","beta_par_squared"]
+    ds.add_field(("gas","beta_perp_squared"), function = _beta_perp_squared,
+                 units="g/cm**3")
+
     def _t_beta_par(field, data):
         return data["gas","kT"]*data["gas","beta_par"]
     ds.add_field(("gas","t_beta_par"), function = _t_beta_par,
@@ -91,7 +92,6 @@
     def __init__(self, ds, freqs, mue=1.143, high_order=False):
 
         self.ds = ds
-        setup_sunyaev_zeldovich_fields(self.ds)
         self.num_freqs = len(freqs)
         self.high_order = high_order
         self.freqs = ds.arr(freqs, "GHz")
@@ -141,6 +141,7 @@
 
         beta_par = generate_beta_par(L)
         self.ds.add_field(("gas","beta_par"), function=beta_par, units="g/cm**3")
+        setup_sunyaev_zeldovich_fields(self.ds)
         proj = self.ds.proj("density", axis, center=ctr, data_source=source)
         frb = proj.to_frb(width, nx)
         dens = frb["density"]
@@ -209,6 +210,7 @@
 
         beta_par = generate_beta_par(L)
         self.ds.add_field(("gas","beta_par"), function=beta_par, units="g/cm**3")
+        setup_sunyaev_zeldovich_fields(self.ds)
 
         dens    = off_axis_projection(self.ds, ctr, L, w, nx, "density")
         Te      = off_axis_projection(self.ds, ctr, L, w, nx, "t_sz")/dens

diff -r 9d49401f21e703885835e9c01ff7295bdafadc85 -r 5673e4b09797721a28e461a09a6bb167df9b5d04 yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -692,6 +692,7 @@
         """
         self.index
         self.field_info.add_field(name, function=function, **kwargs)
+        self.field_info._show_field_errors.append(name)
         deps, _ = self.field_info.check_derived_fields([name])
         self.field_dependencies.update(deps)

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.