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

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/8445fdf5ae15/
Changeset:   8445fdf5ae15
Branch:      yt
User:        ngoldbaum
Date:        2016-04-04 19:35:18+00:00
Summary:     Merged in xarthisius/yt (pull request #2103)

[flash] avoid circular dependency loop in abar field definition
Affected #:  1 file

diff -r 395a07dcd3a54e1840f9ddab9a4b3ed49f780c28 -r 8445fdf5ae15434505312ef1616d910f1becb07b yt/frontends/flash/fields.py
--- a/yt/frontends/flash/fields.py
+++ b/yt/frontends/flash/fields.py
@@ -151,12 +151,14 @@
             Na_code = data.ds.quan(Na, '1/code_mass')
             return data["flash","dens"]*data["flash","sumy"]*Na_code
         self.add_field(('flash','nion'), function=_nion, units="code_length**-3")
-        def _abar(field, data):
-            try:
-                return data["flash","abar"]
-            except:
-                return 1.0/data["flash","sumy"]
-        self.add_field(("flash","abar"), function=_abar, units="1")
+        
+        if ("flash", "abar") in self.field_list:
+            self.add_output_field(("flash", "abar"), units="1")
+        else:
+            def _abar(field, data):
+                return 1.0 / data["flash","sumy"]
+            self.add_field(("flash","abar"), function=_abar, units="1")
+
         def _number_density(fields,data):
             return (data["nele"]+data["nion"])
         self.add_field(("gas","number_density"), function=_number_density,

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/20160404/5e0c14ad/attachment.htm>