[Yt-svn] yt-commit r839 - in branches/yt-1.0: tests yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Sat Oct 25 09:20:58 2008
New Revision: 839
URL: http://yt.spacepope.org/changeset/839

Log:
Fix the tests to not fail on things they shouldn't fail on, and add
particle_type to a bunch of the particle fields.



Modified:
   branches/yt-1.0/tests/test_lagos.py
   branches/yt-1.0/yt/lagos/DerivedFields.py

Modified: branches/yt-1.0/tests/test_lagos.py
==============================================================================
--- branches/yt-1.0/tests/test_lagos.py	(original)
+++ branches/yt-1.0/tests/test_lagos.py	Sat Oct 25 09:20:58 2008
@@ -231,13 +231,6 @@
             self.assertFalse(na.any(na.isnan(cg["Density"])))
             self.assertFalse(na.any(cg["Density"]==-999))
 
-    def testWrongDims(self):
-        self.failUnlessRaises(ValueError,
-                self.hierarchy.smoothed_covering_grid,
-                level=2, left_edge=[0.25, 0.25, 0.25],
-                right_edge=[0.75, 0.75, 0.75],
-                dims=[123, 124, 125])
-
     def testAddField(self):
         DIMS = 64
         i = 5

Modified: branches/yt-1.0/yt/lagos/DerivedFields.py
==============================================================================
--- branches/yt-1.0/yt/lagos/DerivedFields.py	(original)
+++ branches/yt-1.0/yt/lagos/DerivedFields.py	Sat Oct 25 09:20:58 2008
@@ -753,7 +753,8 @@
     return data.convert("cm")
 add_field("ParticleRadius", function=_ParticleRadius,
           validators=[ValidateParameter("center")],
-          convert_function = _ConvertRadiusCGS, units=r"\rm{cm}")
+          convert_function = _ConvertRadiusCGS, units=r"\rm{cm}",
+          particle_type = True)
 add_field("Radius", function=_Radius,
           validators=[ValidateParameter("center")],
           convert_function = _ConvertRadiusCGS, units=r"\rm{cm}")
@@ -765,13 +766,15 @@
           convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}")
 add_field("ParticleRadiusMpc", function=_ParticleRadius,
           validators=[ValidateParameter("center")],
-          convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}")
+          convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}",
+          particle_type=True)
 
 def _ConvertRadiuskpc(data):
     return data.convert("kpc")
 add_field("ParticleRadiuskpc", function=_ParticleRadius,
           validators=[ValidateParameter("center")],
-          convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}")
+          convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}",
+          particle_type=True)
 add_field("Radiuskpc", function=_Radius,
           validators=[ValidateParameter("center")],
           convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}")
@@ -780,7 +783,8 @@
     return data.convert("kpch")
 add_field("ParticleRadiuskpch", function=_ParticleRadius,
           validators=[ValidateParameter("center")],
-          convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}")
+          convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}",
+          particle_type=True)
 add_field("Radiuskpch", function=_Radius,
           validators=[ValidateParameter("center")],
           convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}")
@@ -789,7 +793,8 @@
     return data.convert("pc")
 add_field("ParticleRadiuspc", function=_ParticleRadius,
           validators=[ValidateParameter("center")],
-          convert_function = _ConvertRadiuspc, units=r"\rm{pc}")
+          convert_function = _ConvertRadiuspc, units=r"\rm{pc}",
+          particle_type=True)
 add_field("Radiuspc", function=_Radius,
           validators=[ValidateParameter("center")],
           convert_function = _ConvertRadiuspc, units=r"\rm{pc}")
@@ -798,13 +803,15 @@
     return data.convert("au")
 add_field("ParticleRadiusAU", function=_ParticleRadius,
           validators=[ValidateParameter("center")],
-          convert_function = _ConvertRadiusAU, units=r"\rm{AU}")
+          convert_function = _ConvertRadiusAU, units=r"\rm{AU}",
+          particle_type=True)
 add_field("RadiusAU", function=_Radius,
           validators=[ValidateParameter("center")],
           convert_function = _ConvertRadiusAU, units=r"\rm{AU}")
 
 add_field("ParticleRadiusCode", function=_ParticleRadius,
-          validators=[ValidateParameter("center")])
+          validators=[ValidateParameter("center")],
+          particle_type=True)
 add_field("RadiusCode", function=_Radius,
           validators=[ValidateParameter("center")])