[Yt-svn] yt: Fixing CIC Deposit call.

hg at spacepope.org hg at spacepope.org
Tue Oct 26 15:18:31 PDT 2010


hg Repository: yt
details:   yt/rev/9f53eb88c444
changeset: 3467:9f53eb88c444
user:      Matthew Turk <matthewturk at gmail.com>
date:
Tue Oct 26 15:18:22 2010 -0700
description:
Fixing CIC Deposit call.

diffstat:

 yt/lagos/EnzoFields.py      |  12 ------------
 yt/lagos/UniversalFields.py |   3 +++
 2 files changed, 3 insertions(+), 12 deletions(-)

diffs (35 lines):

diff -r dafd0f4d6ec9 -r 9f53eb88c444 yt/lagos/EnzoFields.py
--- a/yt/lagos/EnzoFields.py	Tue Oct 26 11:53:53 2010 -0700
+++ b/yt/lagos/EnzoFields.py	Tue Oct 26 15:18:22 2010 -0700
@@ -243,18 +243,6 @@
     f._convert_function = _convertVelocity
     f.take_log = False
 
-def _pdensity(field, data):
-    blank = na.zeros(data.ActiveDimensions, dtype='float32', order="FORTRAN")
-    if data.NumberOfParticles == 0: return blank
-    cic_deposit.cic_deposit(data["particle_position_x"],
-                            data["particle_position_y"],
-                            data["particle_position_z"], 3,
-                            data["particle_mass"],
-                            blank, data.LeftEdge, data['dx'])
-    return blank
-add_field("particle_density", function=_pdensity,
-          validators=[ValidateSpatial(0)], convert_function=_convertDensity)
-
 def _spdensity_pyx(field, data):
     blank = na.zeros(data.ActiveDimensions, dtype='float32')
     if data.NumberOfParticles == 0: return blank
diff -r dafd0f4d6ec9 -r 9f53eb88c444 yt/lagos/UniversalFields.py
--- a/yt/lagos/UniversalFields.py	Tue Oct 26 11:53:53 2010 -0700
+++ b/yt/lagos/UniversalFields.py	Tue Oct 26 15:18:22 2010 -0700
@@ -795,6 +795,9 @@
 add_field("particle_density_pyx", function=_pdensity_pyx,
           validators=[ValidateSpatial(0)], convert_function=_convertDensity,
           display_name=r"\mathrm{Particle}\/\mathrm{Density})")
+add_field("particle_density", function=_pdensity_pyx,
+          validators=[ValidateSpatial(0)], convert_function=_convertDensity,
+          display_name=r"\mathrm{Particle}\/\mathrm{Density})")
 
 def _MagneticEnergy(field,data):
     """WARNING WARNING WARNING: Units are not yet known to be



More information about the yt-svn mailing list