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

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/c259c6a5f8ac/
Changeset:   c259c6a5f8ac
Branch:      yt-3.0
User:        brittonsmith
Date:        2014-07-30 08:56:57
Summary:     Merged in MatthewTurk/yt/yt-3.0 (pull request #903)

Adding dengo and grackle fields to Enzo.
Affected #:  1 file

diff -r d2c88a547e71b223491ca4a00fda7bc783eb2c3a -r c259c6a5f8ac42834e77c4056bdb635de93620c8 yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py
+++ b/yt/frontends/enzo/fields.py
@@ -44,12 +44,23 @@
     'DI'      : 'D',
     'DII'     : 'D_p1',
     'HDI'     : 'HD',
-    'Electron': 'El'
+    'Electron': 'El',
+    'OI'      : 'O',
+    'OII'     : 'O_p1',
+    'OIII'    : 'O_p2',
+    'OIV'     : 'O_p3',
+    'OV'      : 'O_p4',
+    'OVI'     : 'O_p5',
+    'OVII'    : 'O_p6',
+    'OVIII'   : 'O_p7',
+    'OIX'     : 'O_p8',
 }
 
 class EnzoFieldInfo(FieldInfoContainer):
     known_other_fields = (
         ("Cooling_Time", ("s", ["cooling_time"], None)),
+        ("Dengo_Cooling_Rate", ("erg/g/s", [], None)),
+        ("Grackle_Cooling_Rate", ("erg/s/cm**3", [], None)),
         ("HI_kph", ("1/code_time", [], None)),
         ("HeI_kph", ("1/code_time", [], None)),
         ("HeII_kph", ("1/code_time", [], None)),
@@ -147,9 +158,10 @@
         # Now we conditionally load a few other things.
         params = self.ds.parameters
         multi_species = params.get("MultiSpecies", None)
+        dengo = params.get("DengoChemistryModel", 0)
         if multi_species is None:
             multi_species = params["Physics"]["AtomicPhysics"]["MultiSpecies"]
-        if multi_species > 0:
+        if multi_species > 0 or dengo == 1:
             self.setup_species_fields()
         self.setup_energy_field()

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.