[yt-svn] commit/yt: 6 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Dec 8 15:36:31 PST 2015
6 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/49997c148e1f/
Changeset: 49997c148e1f
Branch: yt
User: jzuhone
Date: 2015-12-04 23:40:02+00:00
Summary: python2/3 bugfix
Affected #: 1 file
diff -r 315acc8b8296a1655efbc5fa6dfc9c88fab44b62 -r 49997c148e1fefd9e3906f64a489d8347386adf8 yt/fields/derived_field.py
--- a/yt/fields/derived_field.py
+++ b/yt/fields/derived_field.py
@@ -14,7 +14,7 @@
import contextlib
import inspect
-from yt.extern.six import string_types
+from yt.extern.six import string_types, PY2
from yt.funcs import \
ensure_list
from .field_exceptions import \
@@ -215,9 +215,14 @@
return data_label
def __repr__(self):
+ if PY2:
+ func_name = self._function.func_name
+ else:
+ func_name = self._function.__name__
+
if self._function == NullFunc:
s = "On-Disk Field "
- elif self._function.func_name == "_TranslationFunc":
+ elif func_name == "_TranslationFunc":
s = "Alias Field for \"%s\" " % (self._function.alias_name,)
else:
s = "Derived Field "
https://bitbucket.org/yt_analysis/yt/commits/50d238e15456/
Changeset: 50d238e15456
Branch: yt
User: jzuhone
Date: 2015-12-05 17:51:46+00:00
Summary: Add aliases for fields
Affected #: 1 file
diff -r 49997c148e1fefd9e3906f64a489d8347386adf8 -r 50d238e15456e85485ee822a102cc17fcdc72af2 yt/frontends/stream/fields.py
--- a/yt/frontends/stream/fields.py
+++ b/yt/frontends/stream/fields.py
@@ -19,54 +19,54 @@
class StreamFieldInfo(FieldInfoContainer):
known_other_fields = (
- ("density", ("code_mass/code_length**3", [], None)),
- ("dark_matter_density", ("code_mass/code_length**3", [], None)),
- ("number_density", ("1/code_length**3", [], None)),
- ("pressure", ("dyne/code_length**2", [], None)),
- ("thermal_energy", ("erg / g", [], None)),
- ("temperature", ("K", [], None)),
- ("velocity_x", ("code_length/code_time", [], None)),
- ("velocity_y", ("code_length/code_time", [], None)),
- ("velocity_z", ("code_length/code_time", [], None)),
- ("magnetic_field_x", ("gauss", [], None)),
- ("magnetic_field_y", ("gauss", [], None)),
- ("magnetic_field_z", ("gauss", [], None)),
- ("radiation_acceleration_x", ("code_length/code_time**2", [], None)),
- ("radiation_acceleration_y", ("code_length/code_time**2", [], None)),
- ("radiation_acceleration_z", ("code_length/code_time**2", [], None)),
+ ("density", ("code_mass/code_length**3", ["density"], None)),
+ ("dark_matter_density", ("code_mass/code_length**3", ["dark_matter_density"], None)),
+ ("number_density", ("1/code_length**3", ["number_density"], None)),
+ ("pressure", ("dyne/code_length**2", ["pressure"], None)),
+ ("thermal_energy", ("erg / g", ["thermal_energy"], None)),
+ ("temperature", ("K", ["temperature"], None)),
+ ("velocity_x", ("code_length/code_time", ["velocity_x"], None)),
+ ("velocity_y", ("code_length/code_time", ["velocity_y"], None)),
+ ("velocity_z", ("code_length/code_time", ["velocity_z"], None)),
+ ("magnetic_field_x", ("gauss", ["magnetic_field_x"], None)),
+ ("magnetic_field_y", ("gauss", ["magnetic_field_y"], None)),
+ ("magnetic_field_z", ("gauss", ["magnetic_field_z"], None)),
+ ("radiation_acceleration_x", ("code_length/code_time**2", ["radiation_acceleration_x"], None)),
+ ("radiation_acceleration_y", ("code_length/code_time**2", ["radiation_acceleration_y"], None)),
+ ("radiation_acceleration_z", ("code_length/code_time**2", ["radiation_acceleration_z"], None)),
# We need to have a bunch of species fields here, too
- ("metal_density", ("code_mass/code_length**3", [], None)),
- ("hi_density", ("code_mass/code_length**3", [], None)),
- ("hii_density", ("code_mass/code_length**3", [], None)),
- ("h2i_density", ("code_mass/code_length**3", [], None)),
- ("h2ii_density", ("code_mass/code_length**3", [], None)),
- ("h2m_density", ("code_mass/code_length**3", [], None)),
- ("hei_density", ("code_mass/code_length**3", [], None)),
- ("heii_density", ("code_mass/code_length**3", [], None)),
- ("heiii_density", ("code_mass/code_length**3", [], None)),
- ("hdi_density", ("code_mass/code_length**3", [], None)),
- ("di_density", ("code_mass/code_length**3", [], None)),
- ("dii_density", ("code_mass/code_length**3", [], None)),
+ ("metal_density", ("code_mass/code_length**3", ["metal_density"], None)),
+ ("hi_density", ("code_mass/code_length**3", ["hi_density"], None)),
+ ("hii_density", ("code_mass/code_length**3", ["hii_density"], None)),
+ ("h2i_density", ("code_mass/code_length**3", ["h2i_density"], None)),
+ ("h2ii_density", ("code_mass/code_length**3", ["h2ii_density"], None)),
+ ("h2m_density", ("code_mass/code_length**3", ["h2m_density"], None)),
+ ("hei_density", ("code_mass/code_length**3", ["hei_density"], None)),
+ ("heii_density", ("code_mass/code_length**3", ["heii_density"], None)),
+ ("heiii_density", ("code_mass/code_length**3", ["heiii_density"], None)),
+ ("hdi_density", ("code_mass/code_length**3", ["hdi_density"], None)),
+ ("di_density", ("code_mass/code_length**3", ["di_density"], None)),
+ ("dii_density", ("code_mass/code_length**3", ["dii_density"], None)),
)
known_particle_fields = (
- ("particle_position", ("code_length", [], None)),
- ("particle_position_x", ("code_length", [], None)),
- ("particle_position_y", ("code_length", [], None)),
- ("particle_position_z", ("code_length", [], None)),
- ("particle_velocity", ("code_length/code_time", [], None)),
- ("particle_velocity_x", ("code_length/code_time", [], None)),
- ("particle_velocity_y", ("code_length/code_time", [], None)),
- ("particle_velocity_z", ("code_length/code_time", [], None)),
- ("particle_index", ("", [], None)),
- ("particle_gas_density", ("code_mass/code_length**3", [], None)),
- ("particle_gas_temperature", ("K", [], None)),
- ("particle_mass", ("code_mass", [], None)),
- ("smoothing_length", ("code_length", [], None)),
- ("density", ("code_mass/code_length**3", [], None)),
- ("temperature", ("code_temperature", [], None)),
- ("creation_time", ("code_time", [], None)),
+ ("particle_position", ("code_length", ["particle_position"], None)),
+ ("particle_position_x", ("code_length", ["particle_position_x"], None)),
+ ("particle_position_y", ("code_length", ["particle_position_y"], None)),
+ ("particle_position_z", ("code_length", ["particle_position_z"], None)),
+ ("particle_velocity", ("code_length/code_time", ["particle_velocity"], None)),
+ ("particle_velocity_x", ("code_length/code_time", ["particle_velocity_x"], None)),
+ ("particle_velocity_y", ("code_length/code_time", ["particle_velocity_y"], None)),
+ ("particle_velocity_z", ("code_length/code_time", ["particle_velocity_z"], None)),
+ ("particle_index", ("", ["particle_index"], None)),
+ ("particle_gas_density", ("code_mass/code_length**3", ["particle_gas_density"], None)),
+ ("particle_gas_temperature", ("K", ["particle_gas_temperature"], None)),
+ ("particle_mass", ("code_mass", ["particle_mass"], None)),
+ ("smoothing_length", ("code_length", ["smoothing_length"], None)),
+ ("density", ("code_mass/code_length**3", ["density"], None)),
+ ("temperature", ("code_temperature", ["temperature"], None)),
+ ("creation_time", ("code_time", ["creation_time"], None)),
)
def setup_fluid_fields(self):
https://bitbucket.org/yt_analysis/yt/commits/dbc7a9317714/
Changeset: dbc7a9317714
Branch: yt
User: jzuhone
Date: 2015-12-05 17:52:10+00:00
Summary: Make ftype of stream fields "stream"
Affected #: 2 files
diff -r 50d238e15456e85485ee822a102cc17fcdc72af2 -r dbc7a9317714f7bf5a46db6628d47dc8d4470367 yt/frontends/stream/data_structures.py
--- a/yt/frontends/stream/data_structures.py
+++ b/yt/frontends/stream/data_structures.py
@@ -293,7 +293,7 @@
#self._parameter_override = parameter_override
#if conversion_override is None: conversion_override = {}
#self._conversion_override = conversion_override
-
+ self.fluid_types += ("stream",)
self.geometry = geometry
self.stream_handler = stream_handler
name = "InMemoryParameterFile_%s" % (uuid.uuid4().hex)
@@ -375,7 +375,7 @@
if len(s) == 1:
field = ("io", k)
elif len(s) == 3:
- field = ("gas", k)
+ field = ("stream", k)
elif len(s) == 0:
continue
else:
@@ -501,7 +501,7 @@
elif len(data[field].shape) in (1, 2):
new_field = ("io", field)
elif len(data[field].shape) == 3:
- new_field = ("gas", field)
+ new_field = ("stream", field)
else:
raise RuntimeError
new_data[new_field] = data[field]
diff -r 50d238e15456e85485ee822a102cc17fcdc72af2 -r dbc7a9317714f7bf5a46db6628d47dc8d4470367 yt/frontends/stream/io.py
--- a/yt/frontends/stream/io.py
+++ b/yt/frontends/stream/io.py
@@ -44,7 +44,7 @@
def _read_fluid_selection(self, chunks, selector, fields, size):
chunks = list(chunks)
- if any((ftype not in ("gas",) for ftype, fname in fields)):
+ if any((ftype not in ("gas","stream") for ftype, fname in fields)):
raise NotImplementedError
rv = {}
for field in fields:
https://bitbucket.org/yt_analysis/yt/commits/0b11f098be99/
Changeset: 0b11f098be99
Branch: yt
User: jzuhone
Date: 2015-12-07 14:48:20+00:00
Summary: Make this more general
Affected #: 1 file
diff -r dbc7a9317714f7bf5a46db6628d47dc8d4470367 -r 0b11f098be99dd689febd0fbbbe8894fbcd15058 yt/frontends/stream/io.py
--- a/yt/frontends/stream/io.py
+++ b/yt/frontends/stream/io.py
@@ -44,7 +44,7 @@
def _read_fluid_selection(self, chunks, selector, fields, size):
chunks = list(chunks)
- if any((ftype not in ("gas","stream") for ftype, fname in fields)):
+ if any((ftype not in self.ds.fluid_types for ftype, fname in fields)):
raise NotImplementedError
rv = {}
for field in fields:
https://bitbucket.org/yt_analysis/yt/commits/02106b55c8bc/
Changeset: 02106b55c8bc
Branch: yt
User: jzuhone
Date: 2015-12-07 21:51:09+00:00
Summary: Fix VR test
Affected #: 1 file
diff -r 0b11f098be99dd689febd0fbbbe8894fbcd15058 -r 02106b55c8bc7afb57a02f7e5b2bdac2111b6d56 yt/visualization/volume_rendering/tests/test_vr_orientation.py
--- a/yt/visualization/volume_rendering/tests/test_vr_orientation.py
+++ b/yt/visualization/volume_rendering/tests/test_vr_orientation.py
@@ -84,7 +84,7 @@
arr[idx] = 0.6
- data = dict(Density=arr)
+ data = dict(density=(arr, "g/cm**3"))
ds = load_uniform_grid(data, arr.shape, bbox=bbox)
return ds
@@ -96,7 +96,7 @@
sc = Scene()
- vol = VolumeSource(ds, field=('gas', 'Density'))
+ vol = VolumeSource(ds, field=('gas', 'density'))
tf = vol.transfer_function
tf = ColorTransferFunction((0.1, 1.0))
https://bitbucket.org/yt_analysis/yt/commits/81762aa466f3/
Changeset: 81762aa466f3
Branch: yt
User: ngoldbaum
Date: 2015-12-08 23:36:24+00:00
Summary: Merged in jzuhone/yt-nonspatial (pull request #1896)
Make ftype of "on-disk" stream fields "stream"
Affected #: 5 files
diff -r da35da6e1f39944797ea2b76df26ac69a606cbb8 -r 81762aa466f368a730c369e7841f7234a06579b2 yt/fields/derived_field.py
--- a/yt/fields/derived_field.py
+++ b/yt/fields/derived_field.py
@@ -14,7 +14,7 @@
import contextlib
import inspect
-from yt.extern.six import string_types
+from yt.extern.six import string_types, PY2
from yt.funcs import \
ensure_list
from .field_exceptions import \
@@ -215,9 +215,14 @@
return data_label
def __repr__(self):
+ if PY2:
+ func_name = self._function.func_name
+ else:
+ func_name = self._function.__name__
+
if self._function == NullFunc:
s = "On-Disk Field "
- elif self._function.func_name == "_TranslationFunc":
+ elif func_name == "_TranslationFunc":
s = "Alias Field for \"%s\" " % (self._function.alias_name,)
else:
s = "Derived Field "
diff -r da35da6e1f39944797ea2b76df26ac69a606cbb8 -r 81762aa466f368a730c369e7841f7234a06579b2 yt/frontends/stream/data_structures.py
--- a/yt/frontends/stream/data_structures.py
+++ b/yt/frontends/stream/data_structures.py
@@ -293,7 +293,7 @@
#self._parameter_override = parameter_override
#if conversion_override is None: conversion_override = {}
#self._conversion_override = conversion_override
-
+ self.fluid_types += ("stream",)
self.geometry = geometry
self.stream_handler = stream_handler
name = "InMemoryParameterFile_%s" % (uuid.uuid4().hex)
@@ -375,7 +375,7 @@
if len(s) == 1:
field = ("io", k)
elif len(s) == 3:
- field = ("gas", k)
+ field = ("stream", k)
elif len(s) == 0:
continue
else:
@@ -501,7 +501,7 @@
elif len(data[field].shape) in (1, 2):
new_field = ("io", field)
elif len(data[field].shape) == 3:
- new_field = ("gas", field)
+ new_field = ("stream", field)
else:
raise RuntimeError
new_data[new_field] = data[field]
diff -r da35da6e1f39944797ea2b76df26ac69a606cbb8 -r 81762aa466f368a730c369e7841f7234a06579b2 yt/frontends/stream/fields.py
--- a/yt/frontends/stream/fields.py
+++ b/yt/frontends/stream/fields.py
@@ -19,54 +19,54 @@
class StreamFieldInfo(FieldInfoContainer):
known_other_fields = (
- ("density", ("code_mass/code_length**3", [], None)),
- ("dark_matter_density", ("code_mass/code_length**3", [], None)),
- ("number_density", ("1/code_length**3", [], None)),
- ("pressure", ("dyne/code_length**2", [], None)),
- ("thermal_energy", ("erg / g", [], None)),
- ("temperature", ("K", [], None)),
- ("velocity_x", ("code_length/code_time", [], None)),
- ("velocity_y", ("code_length/code_time", [], None)),
- ("velocity_z", ("code_length/code_time", [], None)),
- ("magnetic_field_x", ("gauss", [], None)),
- ("magnetic_field_y", ("gauss", [], None)),
- ("magnetic_field_z", ("gauss", [], None)),
- ("radiation_acceleration_x", ("code_length/code_time**2", [], None)),
- ("radiation_acceleration_y", ("code_length/code_time**2", [], None)),
- ("radiation_acceleration_z", ("code_length/code_time**2", [], None)),
+ ("density", ("code_mass/code_length**3", ["density"], None)),
+ ("dark_matter_density", ("code_mass/code_length**3", ["dark_matter_density"], None)),
+ ("number_density", ("1/code_length**3", ["number_density"], None)),
+ ("pressure", ("dyne/code_length**2", ["pressure"], None)),
+ ("thermal_energy", ("erg / g", ["thermal_energy"], None)),
+ ("temperature", ("K", ["temperature"], None)),
+ ("velocity_x", ("code_length/code_time", ["velocity_x"], None)),
+ ("velocity_y", ("code_length/code_time", ["velocity_y"], None)),
+ ("velocity_z", ("code_length/code_time", ["velocity_z"], None)),
+ ("magnetic_field_x", ("gauss", ["magnetic_field_x"], None)),
+ ("magnetic_field_y", ("gauss", ["magnetic_field_y"], None)),
+ ("magnetic_field_z", ("gauss", ["magnetic_field_z"], None)),
+ ("radiation_acceleration_x", ("code_length/code_time**2", ["radiation_acceleration_x"], None)),
+ ("radiation_acceleration_y", ("code_length/code_time**2", ["radiation_acceleration_y"], None)),
+ ("radiation_acceleration_z", ("code_length/code_time**2", ["radiation_acceleration_z"], None)),
# We need to have a bunch of species fields here, too
- ("metal_density", ("code_mass/code_length**3", [], None)),
- ("hi_density", ("code_mass/code_length**3", [], None)),
- ("hii_density", ("code_mass/code_length**3", [], None)),
- ("h2i_density", ("code_mass/code_length**3", [], None)),
- ("h2ii_density", ("code_mass/code_length**3", [], None)),
- ("h2m_density", ("code_mass/code_length**3", [], None)),
- ("hei_density", ("code_mass/code_length**3", [], None)),
- ("heii_density", ("code_mass/code_length**3", [], None)),
- ("heiii_density", ("code_mass/code_length**3", [], None)),
- ("hdi_density", ("code_mass/code_length**3", [], None)),
- ("di_density", ("code_mass/code_length**3", [], None)),
- ("dii_density", ("code_mass/code_length**3", [], None)),
+ ("metal_density", ("code_mass/code_length**3", ["metal_density"], None)),
+ ("hi_density", ("code_mass/code_length**3", ["hi_density"], None)),
+ ("hii_density", ("code_mass/code_length**3", ["hii_density"], None)),
+ ("h2i_density", ("code_mass/code_length**3", ["h2i_density"], None)),
+ ("h2ii_density", ("code_mass/code_length**3", ["h2ii_density"], None)),
+ ("h2m_density", ("code_mass/code_length**3", ["h2m_density"], None)),
+ ("hei_density", ("code_mass/code_length**3", ["hei_density"], None)),
+ ("heii_density", ("code_mass/code_length**3", ["heii_density"], None)),
+ ("heiii_density", ("code_mass/code_length**3", ["heiii_density"], None)),
+ ("hdi_density", ("code_mass/code_length**3", ["hdi_density"], None)),
+ ("di_density", ("code_mass/code_length**3", ["di_density"], None)),
+ ("dii_density", ("code_mass/code_length**3", ["dii_density"], None)),
)
known_particle_fields = (
- ("particle_position", ("code_length", [], None)),
- ("particle_position_x", ("code_length", [], None)),
- ("particle_position_y", ("code_length", [], None)),
- ("particle_position_z", ("code_length", [], None)),
- ("particle_velocity", ("code_length/code_time", [], None)),
- ("particle_velocity_x", ("code_length/code_time", [], None)),
- ("particle_velocity_y", ("code_length/code_time", [], None)),
- ("particle_velocity_z", ("code_length/code_time", [], None)),
- ("particle_index", ("", [], None)),
- ("particle_gas_density", ("code_mass/code_length**3", [], None)),
- ("particle_gas_temperature", ("K", [], None)),
- ("particle_mass", ("code_mass", [], None)),
- ("smoothing_length", ("code_length", [], None)),
- ("density", ("code_mass/code_length**3", [], None)),
- ("temperature", ("code_temperature", [], None)),
- ("creation_time", ("code_time", [], None)),
+ ("particle_position", ("code_length", ["particle_position"], None)),
+ ("particle_position_x", ("code_length", ["particle_position_x"], None)),
+ ("particle_position_y", ("code_length", ["particle_position_y"], None)),
+ ("particle_position_z", ("code_length", ["particle_position_z"], None)),
+ ("particle_velocity", ("code_length/code_time", ["particle_velocity"], None)),
+ ("particle_velocity_x", ("code_length/code_time", ["particle_velocity_x"], None)),
+ ("particle_velocity_y", ("code_length/code_time", ["particle_velocity_y"], None)),
+ ("particle_velocity_z", ("code_length/code_time", ["particle_velocity_z"], None)),
+ ("particle_index", ("", ["particle_index"], None)),
+ ("particle_gas_density", ("code_mass/code_length**3", ["particle_gas_density"], None)),
+ ("particle_gas_temperature", ("K", ["particle_gas_temperature"], None)),
+ ("particle_mass", ("code_mass", ["particle_mass"], None)),
+ ("smoothing_length", ("code_length", ["smoothing_length"], None)),
+ ("density", ("code_mass/code_length**3", ["density"], None)),
+ ("temperature", ("code_temperature", ["temperature"], None)),
+ ("creation_time", ("code_time", ["creation_time"], None)),
)
def setup_fluid_fields(self):
diff -r da35da6e1f39944797ea2b76df26ac69a606cbb8 -r 81762aa466f368a730c369e7841f7234a06579b2 yt/frontends/stream/io.py
--- a/yt/frontends/stream/io.py
+++ b/yt/frontends/stream/io.py
@@ -44,7 +44,7 @@
def _read_fluid_selection(self, chunks, selector, fields, size):
chunks = list(chunks)
- if any((ftype not in ("gas",) for ftype, fname in fields)):
+ if any((ftype not in self.ds.fluid_types for ftype, fname in fields)):
raise NotImplementedError
rv = {}
for field in fields:
diff -r da35da6e1f39944797ea2b76df26ac69a606cbb8 -r 81762aa466f368a730c369e7841f7234a06579b2 yt/visualization/volume_rendering/tests/test_vr_orientation.py
--- a/yt/visualization/volume_rendering/tests/test_vr_orientation.py
+++ b/yt/visualization/volume_rendering/tests/test_vr_orientation.py
@@ -84,7 +84,7 @@
arr[idx] = 0.6
- data = dict(Density=arr)
+ data = dict(density=(arr, "g/cm**3"))
ds = load_uniform_grid(data, arr.shape, bbox=bbox)
return ds
@@ -96,7 +96,7 @@
sc = Scene()
- vol = VolumeSource(ds, field=('gas', 'Density'))
+ vol = VolumeSource(ds, field=('gas', 'density'))
tf = vol.transfer_function
tf = ColorTransferFunction((0.1, 1.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