[Yt-svn] yt-commit r1395 - trunk/yt/lagos

[jwise at wrangler.dreamhost.com]

Author: jwise
Date: Sat Aug  8 14:44:53 2009
New Revision: 1395
URL: http://yt.spacepope.org/changeset/1395

Log:
Changed InMemory type (inline Python) to 'enzo_inline'.  Added
Metallicity field for SN_Colour (Pop III metallicity) and Cooling_Time
field.


Modified:
   trunk/yt/lagos/EnzoFields.py
   trunk/yt/lagos/HierarchyType.py
   trunk/yt/lagos/OutputTypes.py

Modified: trunk/yt/lagos/EnzoFields.py
==============================================================================
--- trunk/yt/lagos/EnzoFields.py	(original)
+++ trunk/yt/lagos/EnzoFields.py	Sat Aug  8 14:44:53 2009
@@ -54,6 +54,20 @@
           validators=ValidateDataField("Metal_Density"),
           projection_conversion="1")
 
+def _Metallicity3(field, data):
+    return data["SN_Colour"] / 0.0204
+add_field("Metallicity", units=r"Z_{\rm{Solar}}",
+          function=_Metallicity3,
+          validators=ValidateDataField("SN_Colour"),
+          projection_conversion="1")
+
+def _Cooling_Time(field, data):
+    return data["Cooling_Time"]
+add_field("Cooling_Time", units=r"\rm{s}",
+          function=_Cooling_Time,
+          validators=ValidateDataField("Cooling_Time"),
+          projection_conversion="1")
+
 def _ThermalEnergy(field, data):
     if data.pf["HydroMethod"] == 2:
         return data["Total_Energy"]

Modified: trunk/yt/lagos/HierarchyType.py
==============================================================================
--- trunk/yt/lagos/HierarchyType.py	(original)
+++ trunk/yt/lagos/HierarchyType.py	Sat Aug  8 14:44:53 2009
@@ -972,7 +972,7 @@
         return self.grids[(random_sample,)]
 
 class EnzoHierarchyInMemory(EnzoHierarchy):
-    _data_style = 'inline'
+    _data_style = 'enzo_inline'
     def _obtain_enzo(self):
         import enzo; return enzo
 

Modified: trunk/yt/lagos/OutputTypes.py
==============================================================================
--- trunk/yt/lagos/OutputTypes.py	(original)
+++ trunk/yt/lagos/OutputTypes.py	Sat Aug  8 14:44:53 2009
@@ -405,7 +405,7 @@
 
 class EnzoStaticOutputInMemory(EnzoStaticOutput):
     _hierarchy_class = EnzoHierarchyInMemory
-    _data_style = 'inline'
+    _data_style = 'enzo_inline'
 
     def __new__(cls, *args, **kwargs):
         obj = object.__new__(cls)