[Yt-svn] yt-commit r954 - in trunk/yt: . lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Wed Nov 19 10:46:56 2008
New Revision: 954
URL: http://yt.spacepope.org/changeset/954

Log:
Quick fix for function referencing, and adding some new fields and changing
where fieldInfo gets set to EnzoFieldInfo.



Modified:
   trunk/yt/lagos/UniversalFields.py
   trunk/yt/lagos/__init__.py
   trunk/yt/mods.py

Modified: trunk/yt/lagos/UniversalFields.py
==============================================================================
--- trunk/yt/lagos/UniversalFields.py	(original)
+++ trunk/yt/lagos/UniversalFields.py	Wed Nov 19 10:46:56 2008
@@ -175,6 +175,11 @@
           function=_ParticleMass, validators=[ValidateSpatial(0)],
           particle_type=True, convert_function=_convertParticleMassMsun)
 
+def _RadialMachNumber(field, data):
+    """M{|v|/t_sound}"""
+    return data["RadialVelocity"] / data["SoundSpeed"]
+add_field("RadialMachNumber", function=_RadialMachNumber)
+
 def _MachNumber(field, data):
     """M{|v|/t_sound}"""
     return data["VelocityMagnitude"] / data["SoundSpeed"]
@@ -229,9 +234,10 @@
 add_field("Pressure", function=_Pressure, units=r"\rm{dyne}/\rm{cm}^{2}")
 
 def _Entropy(field, data):
-    return data["Density"]**(-2./3.) * \
-           data["Temperature"]
-add_field("Entropy", function=_Entropy, units="WhoKnows")
+    return (kboltz/mh) * data["Temperature"] / \
+           (data["MeanMolecularWeight"] * data["Density"]**(2./3.))
+add_field("Entropy", units=r"\rm{ergs}\/\rm{cm}^{2}",
+          function=_Entropy)
 
 def _Height(field, data):
     # We take the dot product of the radius vector with the height-vector
@@ -592,6 +598,8 @@
                 + (data['y']-center[1])*(data["y-velocity"]-bulk_velocity[1])
                 + (data['z']-center[2])*(data["z-velocity"]-bulk_velocity[2])
                 )/data["RadiusCode"]
+    if na.any(na.isnan(new_field)): # to fix center = point
+        new_field[na.isnan(new_field)] = 0.0
     return new_field
 def _RadialVelocityABS(field, data):
     return na.abs(_RadialVelocity(field, data))
@@ -599,16 +607,13 @@
     return 1e-5
 add_field("RadialVelocity", function=_RadialVelocity,
           units=r"\rm{cm}/\rm{s}",
-          validators=[ValidateParameter("center"),
-                      ValidateParameter("bulk_velocity")])
+          validators=[ValidateParameter("center")])
 add_field("RadialVelocityABS", function=_RadialVelocityABS,
           units=r"\rm{cm}/\rm{s}",
-          validators=[ValidateParameter("center"),
-                      ValidateParameter("bulk_velocity")])
+          validators=[ValidateParameter("center")])
 add_field("RadialVelocityKMS", function=_RadialVelocity,
           convert_function=_ConvertRadialVelocityKMS, units=r"\rm{km}/\rm{s}",
-          validators=[ValidateParameter("center"),
-                      ValidateParameter("bulk_velocity")])
+          validators=[ValidateParameter("center")])
 
 def _CuttingPlaneVelocityX(field, data):
     x_vec, y_vec, z_vec = [data.get_field_parameter("cp_%s_vec" % (ax))

Modified: trunk/yt/lagos/__init__.py
==============================================================================
--- trunk/yt/lagos/__init__.py	(original)
+++ trunk/yt/lagos/__init__.py	Wed Nov 19 10:46:56 2008
@@ -85,6 +85,8 @@
 from UniversalFields import *
 from EnzoFields import *
 
+fieldInfo = EnzoFieldInfo
+
 from DerivedQuantities import DerivedQuantityCollection, GridChildMaskWrapper
 from DataReadingFuncs import *
 from ClusterFiles import *

Modified: trunk/yt/mods.py
==============================================================================
--- trunk/yt/mods.py	(original)
+++ trunk/yt/mods.py	Wed Nov 19 10:46:56 2008
@@ -46,7 +46,7 @@
 # This is a temporary solution -- in the future, we will allow the user to
 # select this via ytcfg.
 
-fieldInfo = lagos.fieldInfo = EnzoFieldInfo
+fieldInfo = EnzoFieldInfo
 
 # Now individual component imports from raven
 from yt.raven import PlotCollection, PlotCollectionInteractive, \