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

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Sun Feb 21 10:44:26 2010
New Revision: 1638
URL: http://yt.enzotools.org/changeset/1638

Log:
Adding comoving fields.



Modified:
   trunk/yt/lagos/EnzoFields.py

Modified: trunk/yt/lagos/EnzoFields.py
==============================================================================
--- trunk/yt/lagos/EnzoFields.py	(original)
+++ trunk/yt/lagos/EnzoFields.py	Sun Feb 21 10:44:26 2010
@@ -48,6 +48,10 @@
                 "H2I":2.0,"H2II":2.0,"HM":1.0,
                 "DI":2.0,"DII":2.0,"HDI":3.0}
 
+def _SpeciesComovingDensity(field, data):
+    sp = field.name.split("_")[0] + "_Density"
+    ef = (1.0 + data.pf["CosmologyCurrentRedshift"])**3.0
+    return data[sp]/ef
 def _SpeciesFraction(field, data):
     sp = field.name.split("_")[0] + "_Density"
     return data[sp]/data["Density"]
@@ -62,6 +66,9 @@
     add_field("%s_Fraction" % species,
              function=_SpeciesFraction,
              validators=ValidateDataField("%s_Density" % species))
+    add_field("Comoving_%s_Density" % species,
+             function=_SpeciesComovingDensity,
+             validators=ValidateDataField("%s_Density" % species))
     if _speciesMass.has_key(species):
         add_field("%s_NumberDensity" % species,
                   function=_SpeciesNumberDensity,
@@ -170,6 +177,11 @@
           function=_NumberDensity,
           convert_function=_ConvertNumberDensity)
 
+def _ComovingDensity(field,data):
+    ef = (1.0 + data.pf["CosmologyCurrentRedshift"])**3.0
+    return data["Density"]/ef
+add_field("ComovingDensity", function=_ComovingDensity, units=r"\rm{g}/\rm{cm}^3")
+
 def Overdensity(field,data):
     return (data['Density'] + data['Dark_Matter_Density']) / \
         (rho_crit_now * (data.pf['CosmologyHubbleConstantNow']**2) * ((1+data.pf['CosmologyCurrentRedshift'])**3))