[yt-svn] commit/yt-3.0: 3 new changesets
Bitbucket
commits-noreply at bitbucket.org
Wed Aug 22 11:53:49 PDT 2012
3 new commits in yt-3.0:
https://bitbucket.org/yt_analysis/yt-3.0/changeset/3a9b24dcba03/
changeset: 3a9b24dcba03
branch: yt-3.0
user: scopatz
date: 2012-08-22 19:58:47
summary: Added some FLASH HEDP fields.
affected #: 1 file
diff -r 7acef43a54b131d9f75c0680b9e2cbc6f333d1ee -r 3a9b24dcba035926946823f2280f6f3c8c7b5e75 yt/frontends/flash/fields.py
--- a/yt/frontends/flash/fields.py
+++ b/yt/frontends/flash/fields.py
@@ -158,14 +158,24 @@
convert_function=_get_convert("temp"),
units=r"\rm{K}")
add_flash_field("tele", function=NullFunc, take_log=True,
- convert_function=_get_convert("tele"),
+ units = r"\rm{K}")
+add_flash_field("trad", function=NullFunc, take_log=True,
units = r"\rm{K}")
add_flash_field("pres", function=NullFunc, take_log=True,
convert_function=_get_convert("pres"),
units=r"\rm{erg}\//\/\rm{cm}^{3}")
+add_flash_field("pele", function=NullFunc, take_log=True,
+ display_name="Electron Pressure",
+ units=r"\rm{J}/\rm{cm}^3")
+add_flash_field("prad", function=NullFunc, take_log=True,
+ units = r"\rm{J}/\rm{cm}^3")
add_flash_field("pden", function=NullFunc, take_log=True,
convert_function=_get_convert("pden"),
units=r"\rm{g}/\rm{cm}^3")
+add_flash_field("depo", function=NullFunc, take_log=True,
+ units = r"\rm{ergs}/\rm{g}")
+add_flash_field("ye", function=NullFunc, take_log=True,
+ units = r"\rm{ergs}/\rm{g}")
add_flash_field("magx", function=NullFunc, take_log=False,
convert_function=_get_convert("magx"),
units = r"\mathrm{Gau\ss}")
@@ -195,6 +205,8 @@
units = r"\rm{ergs\//\/g}")
add_flash_field("flam", function=NullFunc, take_log=False,
convert_function=_get_convert("flam"))
+add_flash_field("absr", function=NullFunc, take_log=False,
+ display_name="Absorption Coefficient")
for f,v in translation_dict.items():
if v not in KnownFLASHFields:
@@ -349,3 +361,24 @@
def _CylindricalVolume(field, data):
return data["dtheta"] * data["r"] * data["dr"] * data["dz"]
add_pol_field("CellVolume", function=_CylindricalVolume)
+
+
+## Derived FLASH Fields
+def _nele(field, data):
+ return data['ye'] * data['dens'] * data['sumy'] * 6.022E23
+add_field('nele', function=_nele, take_log=True, units=r"\rm{n}/\rm{cm}^3")
+add_field('edens', function=_nele, take_log=True, units=r"\rm{n}/\rm{cm}^3")
+
+def _nion(field, data):
+ return data['dens'] * data['sumy'] * 6.022E23
+add_field('nion', function=_nion, take_log=True, units=r"\rm{n}/\rm{cm}^3")
+
+
+def _abar(field, data):
+ return 1.0 / data['sumy']
+add_field('abar', function=_abar, take_log=False)
+
+
+def _velo(field, data):
+ return (data['velx']**2 + data['vely']**2 + data['velz']**2)**0.5
+add_field ('velo', function=_velo, take_log=True, units=r"\rm{cm}/\rm{s}")
https://bitbucket.org/yt_analysis/yt-3.0/changeset/48512e3628b6/
changeset: 48512e3628b6
branch: yt-3.0
user: scopatz
date: 2012-08-22 19:59:23
summary: Merge commit
affected #: 1 file
diff -r 3a9b24dcba035926946823f2280f6f3c8c7b5e75 -r 48512e3628b60a87c3d8046ccf8f5d4fa0a88a97 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -671,10 +671,11 @@
self.plots[f].axes.set_ylabel(labels[1])
ftype, fname = f
+ field_name = self.data_source._get_field_info(ftype, fname).display_name
if md['units'] == None or md['units'] == '':
- label = r'$\rm{'+fname.encode('string-escape')+r'}$'
+ label = r'$\rm{'+field_name.encode('string-escape')+r'}$'
else:
- label = r'$\rm{'+fname.encode('string-escape')+r'}\/\/('+md['units']+r')$'
+ label = r'$\rm{'+field_name.encode('string-escape')+r'}\/\/('+md['units']+r')$'
self.plots[f].cb.set_label(label)
https://bitbucket.org/yt_analysis/yt-3.0/changeset/ca74dd8e5133/
changeset: ca74dd8e5133
branch: yt-3.0
user: scopatz
date: 2012-08-22 20:53:26
summary: More FLASH fields added.
affected #: 1 file
diff -r 48512e3628b60a87c3d8046ccf8f5d4fa0a88a97 -r ca74dd8e5133a931efd33830d379e85fdc23eb90 yt/frontends/flash/fields.py
--- a/yt/frontends/flash/fields.py
+++ b/yt/frontends/flash/fields.py
@@ -5,7 +5,7 @@
Affiliation: UCSD
Homepage: http://yt-project.org/
License:
- Copyright (C) 2010-2011 Matthew Turk, John ZuHone. All Rights Reserved.
+ Copyright (C) 2010-2012 Matthew Turk, John ZuHone, Anthony Scopatz. All Rights Reserved.
This file is part of yt.
@@ -157,6 +157,8 @@
add_flash_field("temp", function=NullFunc, take_log=True,
convert_function=_get_convert("temp"),
units=r"\rm{K}")
+add_flash_field("tion", function=NullFunc, take_log=True,
+ units=r"\rm{K}")
add_flash_field("tele", function=NullFunc, take_log=True,
units = r"\rm{K}")
add_flash_field("trad", function=NullFunc, take_log=True,
@@ -164,11 +166,24 @@
add_flash_field("pres", function=NullFunc, take_log=True,
convert_function=_get_convert("pres"),
units=r"\rm{erg}\//\/\rm{cm}^{3}")
+add_flash_field("pion", function=NullFunc, take_log=True,
+ display_name="Ion Pressure",
+ units=r"\rm{J}/\rm{cm}^3")
add_flash_field("pele", function=NullFunc, take_log=True,
- display_name="Electron Pressure",
+ display_name="Electron Pressure, P_e",
units=r"\rm{J}/\rm{cm}^3")
add_flash_field("prad", function=NullFunc, take_log=True,
+ display_name="Radiation Pressure",
units = r"\rm{J}/\rm{cm}^3")
+add_flash_field("eion", function=NullFunc, take_log=True,
+ display_name="Ion Internal Energy",
+ units=r"\rm{J}")
+add_flash_field("eele", function=NullFunc, take_log=True,
+ display_name="Electron Internal Energy",
+ units=r"\rm{J}")
+add_flash_field("erad", function=NullFunc, take_log=True,
+ display_name="Radiation Internal Energy",
+ units=r"\rm{J}")
add_flash_field("pden", function=NullFunc, take_log=True,
convert_function=_get_convert("pden"),
units=r"\rm{g}/\rm{cm}^3")
@@ -207,6 +222,31 @@
convert_function=_get_convert("flam"))
add_flash_field("absr", function=NullFunc, take_log=False,
display_name="Absorption Coefficient")
+add_flash_field("emis", function=NullFunc, take_log=False,
+ display_name="Emissivity")
+add_flash_field("cond", function=NullFunc, take_log=False,
+ display_name="Conductivity")
+add_flash_field("dfcf", function=NullFunc, take_log=False,
+ display_name="Diffusion Equation Scalar")
+add_flash_field("fllm", function=NullFunc, take_log=False,
+ display_name="Flux Limit")
+add_flash_field("pipe", function=NullFunc, take_log=False,
+ display_name="P_i/P_e")
+add_flash_field("tite", function=NullFunc, take_log=False,
+ display_name="T_i/T_e")
+add_flash_field("dbgs", function=NullFunc, take_log=False,
+ display_name="Debug for Shocks")
+add_flash_field("cham", function=NullFunc, take_log=False,
+ display_name="Chamber Material Fraction")
+add_flash_field("targ", function=NullFunc, take_log=False,
+ display_name="Target Material Fraction")
+add_flash_field("sumy", function=NullFunc, take_log=False)
+add_flash_field("mgdc", function=NullFunc, take_log=False)
+
+for i in range(1, 1000):
+ add_flash_field("r{0:03}".format(i), function=NullFunc, take_log=False,
+ display_name="Energy Group {0}".format(i))
+
for f,v in translation_dict.items():
if v not in KnownFLASHFields:
Repository URL: https://bitbucket.org/yt_analysis/yt-3.0/
--
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