[yt-svn] commit/yt: 2 new changesets
Bitbucket
commits-noreply at bitbucket.org
Wed Jan 18 14:32:00 PST 2012
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/changeset/5325731f1ba7/
changeset: 5325731f1ba7
branch: yt
user: jwise77
date: 2012-01-18 23:31:18
summary: Adding an extra +0.5 to the rounding call when calculating the
output_dims of the smoothing grid so that grids are always contained
within the output_field.
affected #: 1 file
diff -r 809ee2b7c150a079cb34a28791f715c0efc3ea01 -r 5325731f1ba7616596b762b4f65a9a58c700fc12 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -3601,7 +3601,7 @@
input_left = (self._old_global_startindex + 0.5) * rf
dx = na.fromiter((self['cd%s' % ax] for ax in 'xyz'), count=3, dtype='float64')
- output_dims = na.rint((self.right_edge-self.left_edge)/dx).astype('int32') + 2
+ output_dims = na.rint((self.right_edge-self.left_edge)/dx+0.5).astype('int32') + 2
self._cur_dims = output_dims
https://bitbucket.org/yt_analysis/yt/changeset/8bf3fafb70d1/
changeset: 8bf3fafb70d1
branch: yt
user: jwise77
date: 2012-01-18 23:31:56
summary: Merging with tip.
affected #: 2 files
diff -r 5325731f1ba7616596b762b4f65a9a58c700fc12 -r 8bf3fafb70d17df4a77564fd6ae9a4224aec325b yt/frontends/flash/fields.py
--- a/yt/frontends/flash/fields.py
+++ b/yt/frontends/flash/fields.py
@@ -25,6 +25,8 @@
from yt.data_objects.field_info_container import \
FieldInfoContainer, \
+ NullFunc, \
+ TranslationFunc, \
FieldInfo, \
ValidateParameter, \
ValidateDataField, \
@@ -82,7 +84,8 @@
"H2II_Fraction": "htwp",
"DI_Fraction": "deut",
"DII_Fraction": "dplu",
- "ParticleMass": "particle_mass"}
+ "ParticleMass": "particle_mass",
+ "Flame_Fraction": "flam"}
def _get_density(fname):
def _dens(field, data):
@@ -92,101 +95,109 @@
for fn1, fn2 in translation_dict.items():
if fn1.endswith("_Fraction"):
add_field(fn1.split("_")[0] + "_Density",
- function=_get_density(fn1), take_log=True)
-
-def _get_alias(alias):
- def _alias(field, data):
- return data[alias]
- return _alias
-
-def _generate_translation(mine, theirs):
- pfield = theirs.startswith("particle")
- add_field(theirs, function=_get_alias(mine), take_log=True,
- particle_type = pfield)
+ function=_get_density(fn1), take_log=True,
+ display_name="%s\/Density" % fn1.split("_")[0])
def _get_convert(fname):
def _conv(data):
return data.convert(fname)
return _conv
-add_flash_field("dens", function=lambda a,b: None, take_log=True,
+add_flash_field("dens", function=NullFunc, take_log=True,
convert_function=_get_convert("dens"),
units=r"\rm{g}/\rm{cm}^3")
-add_flash_field("velx", function=lambda a,b: None, take_log=False,
+add_flash_field("velx", function=NullFunc, take_log=False,
convert_function=_get_convert("velx"),
units=r"\rm{cm}/\rm{s}")
-add_flash_field("vely", function=lambda a,b: None, take_log=False,
+add_flash_field("vely", function=NullFunc, take_log=False,
convert_function=_get_convert("vely"),
units=r"\rm{cm}/\rm{s}")
-add_flash_field("velz", function=lambda a,b: None, take_log=False,
+add_flash_field("velz", function=NullFunc, take_log=False,
convert_function=_get_convert("velz"),
units=r"\rm{cm}/\rm{s}")
-add_flash_field("particle_posx", function=lambda a,b: None, take_log=False,
+add_flash_field("ener", function=NullFunc, take_log=True,
+ convert_function=_get_convert("ener"),
+ units=r"\rm{erg}/\rm{g}")
+add_flash_field("eint", function=NullFunc, take_log=True,
+ convert_function=_get_convert("eint"),
+ units=r"\rm{erg}/\rm{g}")
+add_flash_field("particle_posx", function=NullFunc, take_log=False,
convert_function=_get_convert("particle_posx"),
units=r"\rm{cm}")
-add_flash_field("particle_posy", function=lambda a,b: None, take_log=False,
+add_flash_field("particle_posy", function=NullFunc, take_log=False,
convert_function=_get_convert("particle_posy"),
units=r"\rm{cm}")
-add_flash_field("particle_posz", function=lambda a,b: None, take_log=False,
+add_flash_field("particle_posz", function=NullFunc, take_log=False,
convert_function=_get_convert("particle_posz"),
units=r"\rm{cm}")
-add_flash_field("particle_velx", function=lambda a,b: None, take_log=False,
+add_flash_field("particle_velx", function=NullFunc, take_log=False,
convert_function=_get_convert("particle_velx"),
units=r"\rm{cm}/\rm{s}")
-add_flash_field("particle_vely", function=lambda a,b: None, take_log=False,
+add_flash_field("particle_vely", function=NullFunc, take_log=False,
convert_function=_get_convert("particle_vely"),
units=r"\rm{cm}/\rm{s}")
-add_flash_field("particle_velz", function=lambda a,b: None, take_log=False,
+add_flash_field("particle_velz", function=NullFunc, take_log=False,
convert_function=_get_convert("particle_velz"),
units=r"\rm{cm}/\rm{s}")
-add_flash_field("particle_mass", function=lambda a,b: None, take_log=False,
+add_flash_field("particle_tag", function=NullFunc, take_log=False,
+ convert_function=_get_convert("particle_tag"))
+add_flash_field("particle_mass", function=NullFunc, take_log=False,
convert_function=_get_convert("particle_mass"),
units=r"\rm{g}")
-add_flash_field("temp", function=lambda a,b: None, take_log=True,
+add_flash_field("temp", function=NullFunc, take_log=True,
convert_function=_get_convert("temp"),
units=r"\rm{K}")
-add_flash_field("pres", function=lambda a,b: None, take_log=True,
+add_flash_field("pres", function=NullFunc, take_log=True,
convert_function=_get_convert("pres"),
units=r"\rm{erg}\//\/\rm{cm}^{3}")
-add_flash_field("pden", function=lambda a,b: None, take_log=True,
+add_flash_field("pden", function=NullFunc, take_log=True,
convert_function=_get_convert("pden"),
units=r"\rm{g}/\rm{cm}^3")
-add_flash_field("magx", function=lambda a,b: None, take_log=False,
+add_flash_field("magx", function=NullFunc, take_log=False,
convert_function=_get_convert("magx"),
units = r"\mathrm{Gau\ss}")
-add_flash_field("magy", function=lambda a,b: None, take_log=False,
+add_flash_field("magy", function=NullFunc, take_log=False,
convert_function=_get_convert("magy"),
units = r"\mathrm{Gau\ss}")
-add_flash_field("magz", function=lambda a,b: None, take_log=False,
+add_flash_field("magz", function=NullFunc, take_log=False,
convert_function=_get_convert("magz"),
units = r"\mathrm{Gau\ss}")
-add_flash_field("magp", function=lambda a,b: None, take_log=True,
+add_flash_field("magp", function=NullFunc, take_log=True,
convert_function=_get_convert("magp"),
units = r"\rm{erg}\//\/\rm{cm}^{3}")
-add_flash_field("divb", function=lambda a,b: None, take_log=True,
+add_flash_field("divb", function=NullFunc, take_log=False,
convert_function=_get_convert("divb"),
units = r"\mathrm{Gau\ss}\/\rm{cm}")
-add_flash_field("game", function=lambda a,b: None, take_log=True,
+add_flash_field("game", function=NullFunc, take_log=False,
convert_function=_get_convert("game"),
units=r"\rm{ratio\/of\/specific\/heats}")
-add_flash_field("gamc", function=lambda a,b: None, take_log=True,
+add_flash_field("gamc", function=NullFunc, take_log=False,
convert_function=_get_convert("gamc"),
units=r"\rm{ratio\/of\/specific\/heats}")
-add_flash_field("gpot", function=lambda a,b: None, take_log=True,
+add_flash_field("gpot", function=NullFunc, take_log=False,
convert_function=_get_convert("gpot"),
units=r"\rm{ergs\//\/g}")
-add_flash_field("gpol", function=lambda a,b: None, take_log=False,
+add_flash_field("gpol", function=NullFunc, take_log=False,
convert_function=_get_convert("gpol"),
units = r"\rm{ergs\//\/g}")
+add_flash_field("flam", function=NullFunc, take_log=False,
+ convert_function=_get_convert("flam"))
for f,v in translation_dict.items():
if v not in KnownFLASHFields:
pfield = v.startswith("particle")
- add_field(v, function=lambda a,b: None, take_log=False,
+ add_flash_field(v, function=NullFunc, take_log=False,
validators = [ValidateDataField(v)],
particle_type = pfield)
- #print "Setting up translator from %s to %s" % (v, f)
- _generate_translation(v, f)
+ else:
+ if f.endswith("_Fraction") :
+ dname = "%s\/Fraction" % f.split("_")[0]
+ else :
+ dname = f
+ ff = KnownFLASHFields[v]
+ add_field(f, TranslationFunc(v),
+ take_log=KnownFLASHFields[v].take_log,
+ units = ff._units, display_name=dname)
def _convertParticleMassMsun(data):
return 1.0/1.989e33
diff -r 5325731f1ba7616596b762b4f65a9a58c700fc12 -r 8bf3fafb70d17df4a77564fd6ae9a4224aec325b yt/startup_tasks.py
--- a/yt/startup_tasks.py
+++ b/yt/startup_tasks.py
@@ -95,6 +95,8 @@
param, val = values.split("=")
mylog.debug("Overriding config: %s = %s", param, val)
ytcfg["yt",param] = val
+ if param == "loglevel": # special case
+ mylog.setLevel(int(val))
parser = argparse.ArgumentParser(description = 'yt command line arguments')
parser.add_argument("--config", action=SetConfigOption,
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