[yt-svn] commit/yt: 6 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Apr 30 12:01:18 PDT 2013
6 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/0639ecad15ba/
Changeset: 0639ecad15ba
Branch: yt
User: scopatz
Date: 2013-04-29 21:39:38
Summary: back ported flash fields from yt-3.0
Affected #: 1 file
diff -r 5b6b482fd29eac3ed397588d25ddb4ab0d8b7385 -r 0639ecad15baece1e4588d45acafd62856ff3f46 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.
@@ -24,6 +24,7 @@
"""
import numpy as np
+from yt.utilities.exceptions import *
from yt.data_objects.field_info_container import \
FieldInfoContainer, \
NullFunc, \
@@ -154,15 +155,41 @@
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,
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("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, 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}")
+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}")
@@ -192,6 +219,34 @@
units = r"\rm{ergs}/\rm{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")
+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,
+ display_name="Emission Minus Absorption Diffusion Terms")
+
+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:
@@ -300,3 +355,23 @@
units=r"\rm{Gauss}\/\rm{cm}^{-1}")
+
+## 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{cm}^{-3}")
+add_field('edens', function=_nele, take_log=True, units=r"\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{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/commits/7605932bcd7a/
Changeset: 7605932bcd7a
Branch: yt
User: scopatz
Date: 2013-04-29 22:39:44
Summary: fixed ye units
Affected #: 1 file
diff -r 0639ecad15baece1e4588d45acafd62856ff3f46 -r 7605932bcd7af866e8a64622bc2870926c5190f4 yt/frontends/flash/fields.py
--- a/yt/frontends/flash/fields.py
+++ b/yt/frontends/flash/fields.py
@@ -188,8 +188,7 @@
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("ye", function=NullFunc, take_log=True,)
add_flash_field("magx", function=NullFunc, take_log=False,
convert_function=_get_convert("magx"),
units = r"\mathrm{Gau\ss}")
https://bitbucket.org/yt_analysis/yt/commits/15403b956871/
Changeset: 15403b956871
Branch: yt
User: scopatz
Date: 2013-04-29 23:08:53
Summary: updated nele computation.
Affected #: 1 file
diff -r 7605932bcd7af866e8a64622bc2870926c5190f4 -r 15403b956871ebcf5c596548abb4a7491bf77305 yt/frontends/flash/fields.py
--- a/yt/frontends/flash/fields.py
+++ b/yt/frontends/flash/fields.py
@@ -357,7 +357,7 @@
## Derived FLASH Fields
def _nele(field, data):
- return data['ye'] * data['dens'] * data['sumy'] * 6.022E23
+ return data['dens'] * data['ye'] * 6.022E23
add_field('nele', function=_nele, take_log=True, units=r"\rm{cm}^{-3}")
add_field('edens', function=_nele, take_log=True, units=r"\rm{cm}^{-3}")
https://bitbucket.org/yt_analysis/yt/commits/3879cc8a93df/
Changeset: 3879cc8a93df
Branch: yt
User: scopatz
Date: 2013-04-30 17:01:32
Summary: updated pressure units to ergs
Affected #: 1 file
diff -r 15403b956871ebcf5c596548abb4a7491bf77305 -r 3879cc8a93df108d41af7267fe5fbff5c81c7967 yt/frontends/flash/fields.py
--- a/yt/frontends/flash/fields.py
+++ b/yt/frontends/flash/fields.py
@@ -167,22 +167,22 @@
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")
+ units=r"\rm{erg}/\rm{cm}^3")
add_flash_field("pele", function=NullFunc, take_log=True,
display_name="Electron Pressure, P_e",
- units=r"\rm{J}/\rm{cm}^3")
+ units=r"\rm{erg}/\rm{cm}^3")
add_flash_field("prad", function=NullFunc, take_log=True,
display_name="Radiation Pressure",
- units = r"\rm{J}/\rm{cm}^3")
+ units = r"\rm{erg}/\rm{cm}^3")
add_flash_field("eion", function=NullFunc, take_log=True,
display_name="Ion Internal Energy",
- units=r"\rm{J}")
+ units=r"\rm{erg}")
add_flash_field("eele", function=NullFunc, take_log=True,
display_name="Electron Internal Energy",
- units=r"\rm{J}")
+ units=r"\rm{erg}")
add_flash_field("erad", function=NullFunc, take_log=True,
display_name="Radiation Internal Energy",
- units=r"\rm{J}")
+ units=r"\rm{erg}")
add_flash_field("pden", function=NullFunc, take_log=True,
convert_function=_get_convert("pden"),
units=r"\rm{g}/\rm{cm}^{3}")
https://bitbucket.org/yt_analysis/yt/commits/532858bcf68d/
Changeset: 532858bcf68d
Branch: yt
User: scopatz
Date: 2013-04-30 19:53:07
Summary: removed velo
Affected #: 1 file
Diff not available.
https://bitbucket.org/yt_analysis/yt/commits/aa91cc1e668b/
Changeset: aa91cc1e668b
Branch: yt
User: scopatz
Date: 2013-04-30 20:54:00
Summary: added Na
Affected #: 2 files
Diff not available.
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