[Yt-svn] commit/yt: 2 new changesets
Bitbucket
commits-noreply at bitbucket.org
Sun May 1 19:24:37 PDT 2011
2 new changesets in yt:
http://bitbucket.org/yt_analysis/yt/changeset/258083307f14/
changeset: r4227:258083307f14
branch: yt
user: samskillman
date: 2011-05-02 04:18:00
summary: Fix to stop field definition recursion, and moving from Total_Energy
and Gas_Energy to TotalEnergy and GasEnergy. This changeset was
orchestrated by Matt.
affected #: 5 files (175 bytes)
--- a/yt/frontends/art/data_structures.py Thu Apr 28 13:36:15 2011 -0400
+++ b/yt/frontends/art/data_structures.py Sun May 01 22:18:00 2011 -0400
@@ -124,9 +124,9 @@
def _detect_fields(self):
# This will need to be generalized to be used elsewhere.
- self.field_list = [ 'Density','Total_Energy',
+ self.field_list = [ 'Density','TotalEnergy',
'x-momentum','y-momentum','z-momentum',
- 'Pressure','Gamma','Gas_Energy',
+ 'Pressure','Gamma','GasEnergy',
'Metal_DensitySNII', 'Metal_DensitySNIa',
'Potential_New','Potential_Old']
@@ -434,7 +434,7 @@
self.tr = 2./3. *(3.03e5*self.r0**2.0*wmu*self.omega_matter)*(1.0/(aexpn**2))
self.conversion_factors["Density"] = \
self.rho0*(aexpn**-3.0)
- self.conversion_factors["Gas_Energy"] = \
+ self.conversion_factors["GasEnergy"] = \
self.rho0*self.v0**2*(aexpn**-5.0)
tr = self.tr
self.conversion_factors["Temperature"] = tr
--- a/yt/frontends/art/fields.py Thu Apr 28 13:36:15 2011 -0400
+++ b/yt/frontends/art/fields.py Sun May 01 22:18:00 2011 -0400
@@ -45,13 +45,13 @@
add_field = add_art_field
translation_dict = {"Density":"density",
- "Total_Energy":"Total_Energy",
+ "TotalEnergy":"TotalEnergy",
"x-velocity":"velocity_x",
"y-velocity":"velocity_y",
"z-velocity":"velocity_z",
"Pressure":"pressure",
"Metallicity":"metallicity",
- "Gas_Energy":"Gas_Energy"
+ "GasEnergy":"GasEnergy"
}
def _generate_translation(mine, theirs):
@@ -78,13 +78,13 @@
ARTFieldInfo["Density"]._convert_function=_convertDensity
def _convertEnergy(data):
- return data.convert("Gas_Energy")
-ARTFieldInfo["Gas_Energy"]._units = r"\rm{ergs}/\rm{g}"
-ARTFieldInfo["Gas_Energy"]._convert_function=_convertEnergy
+ return data.convert("GasEnergy")
+ARTFieldInfo["GasEnergy"]._units = r"\rm{ergs}/\rm{g}"
+ARTFieldInfo["GasEnergy"]._convert_function=_convertEnergy
def _Temperature(field, data):
- tr = data["Gas_Energy"] / data["Density"]
- tr /= data.pf.conversion_factors["Gas_Energy"]
+ tr = data["GasEnergy"] / data["Density"]
+ tr /= data.pf.conversion_factors["GasEnergy"]
tr *= data.pf.conversion_factors["Density"]
return tr
def _convertTemperature(data):
--- a/yt/frontends/enzo/fields.py Thu Apr 28 13:36:15 2011 -0400
+++ b/yt/frontends/enzo/fields.py Sun May 01 22:18:00 2011 -0400
@@ -125,12 +125,12 @@
def _ThermalEnergy(field, data):
if data.pf["HydroMethod"] == 2:
- return data["Total_Energy"]
+ return data["TotalEnergy"]
else:
if data.pf["DualEnergyFormalism"]:
return data["GasEnergy"]
else:
- return data["Total_Energy"] - 0.5*(
+ return data["TotalEnergy"] - 0.5*(
data["x-velocity"]**2.0
+ data["y-velocity"]**2.0
+ data["z-velocity"]**2.0 )
@@ -154,9 +154,7 @@
def _convertEnergy(data):
return data.convert("x-velocity")**2.0
-def _GasEnergy(field, data):
- return data["Gas_Energy"] / _convertEnergy(data)
-add_field("GasEnergy", function=_GasEnergy,
+add_field("GasEnergy", function=lambda a, b: None,
units=r"\rm{ergs}/\rm{g}", convert_function=_convertEnergy)
def _Gas_Energy(field, data):
@@ -164,9 +162,7 @@
add_field("Gas_Energy", function=_Gas_Energy,
units=r"\rm{ergs}/\rm{g}", convert_function=_convertEnergy)
-def _TotalEnergy(field, data):
- return data["Total_Energy"] / _convertEnergy(data)
-add_field("TotalEnergy", function=_TotalEnergy,
+add_field("TotalEnergy", function=lambda a, b: None,
display_name = "\mathrm{Total}\/\mathrm{Energy}",
units=r"\rm{ergs}/\rm{g}", convert_function=_convertEnergy)
--- a/yt/frontends/flash/fields.py Thu Apr 28 13:36:15 2011 -0400
+++ b/yt/frontends/flash/fields.py Sun May 01 22:18:00 2011 -0400
@@ -61,8 +61,8 @@
"y-velocity": "vely",
"z-velocity": "velz",
"Density": "dens",
- "Total_Energy": "ener",
- "Gas_Energy": "eint",
+ "TotalEnergy": "ener",
+ "GasEnergy": "eint",
"Temperature": "temp",
"particle_position_x" : "particle_posx",
"particle_position_y" : "particle_posy",
--- a/yt/frontends/orion/fields.py Thu Apr 28 13:36:15 2011 -0400
+++ b/yt/frontends/orion/fields.py Sun May 01 22:18:00 2011 -0400
@@ -73,7 +73,7 @@
"y-velocity": "yvel",
"z-velocity": "zvel",
"Density": "density",
- "Total_Energy": "eden",
+ "TotalEnergy": "eden",
"Temperature": "temperature",
"x-momentum": "xmom",
"y-momentum": "ymom",
@@ -123,9 +123,9 @@
leave that commented out for now.
"""
#if data.pf["DualEnergyFormalism"]:
- # return data["Gas_Energy"]
+ # return data["GasEnergy"]
#else:
- return data["Total_Energy"] - 0.5 * data["density"] * (
+ return data["TotalEnergy"] - 0.5 * data["density"] * (
data["x-velocity"]**2.0
+ data["y-velocity"]**2.0
+ data["z-velocity"]**2.0 )
http://bitbucket.org/yt_analysis/yt/changeset/d279da21b49a/
changeset: r4228:d279da21b49a
branch: yt
user: samskillman
date: 2011-05-02 04:23:11
summary: Merging.
affected #: 5 files (175 bytes)
--- a/yt/frontends/art/data_structures.py Fri Apr 29 13:03:21 2011 -0400
+++ b/yt/frontends/art/data_structures.py Sun May 01 22:23:11 2011 -0400
@@ -124,9 +124,9 @@
def _detect_fields(self):
# This will need to be generalized to be used elsewhere.
- self.field_list = [ 'Density','Total_Energy',
+ self.field_list = [ 'Density','TotalEnergy',
'x-momentum','y-momentum','z-momentum',
- 'Pressure','Gamma','Gas_Energy',
+ 'Pressure','Gamma','GasEnergy',
'Metal_DensitySNII', 'Metal_DensitySNIa',
'Potential_New','Potential_Old']
@@ -434,7 +434,7 @@
self.tr = 2./3. *(3.03e5*self.r0**2.0*wmu*self.omega_matter)*(1.0/(aexpn**2))
self.conversion_factors["Density"] = \
self.rho0*(aexpn**-3.0)
- self.conversion_factors["Gas_Energy"] = \
+ self.conversion_factors["GasEnergy"] = \
self.rho0*self.v0**2*(aexpn**-5.0)
tr = self.tr
self.conversion_factors["Temperature"] = tr
--- a/yt/frontends/art/fields.py Fri Apr 29 13:03:21 2011 -0400
+++ b/yt/frontends/art/fields.py Sun May 01 22:23:11 2011 -0400
@@ -45,13 +45,13 @@
add_field = add_art_field
translation_dict = {"Density":"density",
- "Total_Energy":"Total_Energy",
+ "TotalEnergy":"TotalEnergy",
"x-velocity":"velocity_x",
"y-velocity":"velocity_y",
"z-velocity":"velocity_z",
"Pressure":"pressure",
"Metallicity":"metallicity",
- "Gas_Energy":"Gas_Energy"
+ "GasEnergy":"GasEnergy"
}
def _generate_translation(mine, theirs):
@@ -78,13 +78,13 @@
ARTFieldInfo["Density"]._convert_function=_convertDensity
def _convertEnergy(data):
- return data.convert("Gas_Energy")
-ARTFieldInfo["Gas_Energy"]._units = r"\rm{ergs}/\rm{g}"
-ARTFieldInfo["Gas_Energy"]._convert_function=_convertEnergy
+ return data.convert("GasEnergy")
+ARTFieldInfo["GasEnergy"]._units = r"\rm{ergs}/\rm{g}"
+ARTFieldInfo["GasEnergy"]._convert_function=_convertEnergy
def _Temperature(field, data):
- tr = data["Gas_Energy"] / data["Density"]
- tr /= data.pf.conversion_factors["Gas_Energy"]
+ tr = data["GasEnergy"] / data["Density"]
+ tr /= data.pf.conversion_factors["GasEnergy"]
tr *= data.pf.conversion_factors["Density"]
return tr
def _convertTemperature(data):
--- a/yt/frontends/enzo/fields.py Fri Apr 29 13:03:21 2011 -0400
+++ b/yt/frontends/enzo/fields.py Sun May 01 22:23:11 2011 -0400
@@ -125,12 +125,12 @@
def _ThermalEnergy(field, data):
if data.pf["HydroMethod"] == 2:
- return data["Total_Energy"]
+ return data["TotalEnergy"]
else:
if data.pf["DualEnergyFormalism"]:
return data["GasEnergy"]
else:
- return data["Total_Energy"] - 0.5*(
+ return data["TotalEnergy"] - 0.5*(
data["x-velocity"]**2.0
+ data["y-velocity"]**2.0
+ data["z-velocity"]**2.0 )
@@ -154,9 +154,7 @@
def _convertEnergy(data):
return data.convert("x-velocity")**2.0
-def _GasEnergy(field, data):
- return data["Gas_Energy"] / _convertEnergy(data)
-add_field("GasEnergy", function=_GasEnergy,
+add_field("GasEnergy", function=lambda a, b: None,
units=r"\rm{ergs}/\rm{g}", convert_function=_convertEnergy)
def _Gas_Energy(field, data):
@@ -164,9 +162,7 @@
add_field("Gas_Energy", function=_Gas_Energy,
units=r"\rm{ergs}/\rm{g}", convert_function=_convertEnergy)
-def _TotalEnergy(field, data):
- return data["Total_Energy"] / _convertEnergy(data)
-add_field("TotalEnergy", function=_TotalEnergy,
+add_field("TotalEnergy", function=lambda a, b: None,
display_name = "\mathrm{Total}\/\mathrm{Energy}",
units=r"\rm{ergs}/\rm{g}", convert_function=_convertEnergy)
--- a/yt/frontends/flash/fields.py Fri Apr 29 13:03:21 2011 -0400
+++ b/yt/frontends/flash/fields.py Sun May 01 22:23:11 2011 -0400
@@ -61,8 +61,8 @@
"y-velocity": "vely",
"z-velocity": "velz",
"Density": "dens",
- "Total_Energy": "ener",
- "Gas_Energy": "eint",
+ "TotalEnergy": "ener",
+ "GasEnergy": "eint",
"Temperature": "temp",
"particle_position_x" : "particle_posx",
"particle_position_y" : "particle_posy",
--- a/yt/frontends/orion/fields.py Fri Apr 29 13:03:21 2011 -0400
+++ b/yt/frontends/orion/fields.py Sun May 01 22:23:11 2011 -0400
@@ -73,7 +73,7 @@
"y-velocity": "yvel",
"z-velocity": "zvel",
"Density": "density",
- "Total_Energy": "eden",
+ "TotalEnergy": "eden",
"Temperature": "temperature",
"x-momentum": "xmom",
"y-momentum": "ymom",
@@ -123,9 +123,9 @@
leave that commented out for now.
"""
#if data.pf["DualEnergyFormalism"]:
- # return data["Gas_Energy"]
+ # return data["GasEnergy"]
#else:
- return data["Total_Energy"] - 0.5 * data["density"] * (
+ return data["TotalEnergy"] - 0.5 * data["density"] * (
data["x-velocity"]**2.0
+ data["y-velocity"]**2.0
+ data["z-velocity"]**2.0 )
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list