[yt-svn] commit/yt: 6 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Sat Jul 23 05:50:15 PDT 2016
6 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/72dcc3e680b2/
Changeset: 72dcc3e680b2
Branch: yt
User: ngoldbaum
Date: 2016-07-22 17:44:07+00:00
Summary: Mask out zero temperature data as well as zero density data. Closes #1232
Affected #: 1 file
diff -r 67200f8bbde35f9f6d03ba012c76cb3e64aa603c -r 72dcc3e680b2e8ae41030ac3048702758395c1a6 yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
--- a/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
+++ b/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
@@ -603,10 +603,13 @@
extra_attrs = {"data_type": "yt_light_ray"}
field_types = dict([(field, "grid") for field in data.keys()])
# Only return LightRay elements with non-zero density
- if 'density' in data:
- mask = data['density'] > 0
- for key in data.keys():
- data[key] = data[key][mask]
+ mask_fields = ['density', 'temperature']
+ for f in mask_fields:
+ if f in data:
+ mask = data[f] > 0
+ for key in data.keys():
+ data[key] = data[key][mask]
+
save_as_dataset(ds, filename, data, field_types=field_types,
extra_attrs=extra_attrs)
https://bitbucket.org/yt_analysis/yt/commits/2444f12e6e77/
Changeset: 2444f12e6e77
Branch: yt
User: ngoldbaum
Date: 2016-07-22 18:03:55+00:00
Summary: Also raise an exception when the no nonzero cells are found along the ray
Affected #: 1 file
diff -r 72dcc3e680b2e8ae41030ac3048702758395c1a6 -r 2444f12e6e77fae685704362f24a8e02edd29298 yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
--- a/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
+++ b/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
@@ -607,9 +607,11 @@
for f in mask_fields:
if f in data:
mask = data[f] > 0
+ if not np.any(mask):
+ raise RuntimeError("No zones along light ray with nonzero "
+ "%s." % (f,))
for key in data.keys():
data[key] = data[key][mask]
-
save_as_dataset(ds, filename, data, field_types=field_types,
extra_attrs=extra_attrs)
https://bitbucket.org/yt_analysis/yt/commits/e943aa0c4c80/
Changeset: e943aa0c4c80
Branch: yt
User: ngoldbaum
Date: 2016-07-22 18:33:57+00:00
Summary: Check to mask fields based on field units
Affected #: 1 file
diff -r 2444f12e6e77fae685704362f24a8e02edd29298 -r e943aa0c4c80860d6998e448f84ccf9bfdadecbe yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
--- a/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
+++ b/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
@@ -21,6 +21,8 @@
load
from yt.frontends.ytdata.utilities import \
save_as_dataset
+from yt.units.unit_object import \
+ Unit
from yt.units.yt_array import \
YTArray
from yt.utilities.cosmology import \
@@ -603,15 +605,17 @@
extra_attrs = {"data_type": "yt_light_ray"}
field_types = dict([(field, "grid") for field in data.keys()])
# Only return LightRay elements with non-zero density
- mask_fields = ['density', 'temperature']
- for f in mask_fields:
- if f in data:
- mask = data[f] > 0
- if not np.any(mask):
- raise RuntimeError("No zones along light ray with nonzero "
- "%s." % (f,))
- for key in data.keys():
- data[key] = data[key][mask]
+ mask_field_units = ['K', 'cm**-3', 'g/cm**3']
+ mask_field_units = [Unit(u) for u in mask_field_units]
+ for f in data:
+ for u in mask_field_units:
+ if data[f].units == u:
+ mask = data[f] > 0
+ if not np.any(mask):
+ raise RuntimeError(
+ "No zones along light ray with nonzero %s." % (f,))
+ for key in data.keys():
+ data[key] = data[key][mask]
save_as_dataset(ds, filename, data, field_types=field_types,
extra_attrs=extra_attrs)
https://bitbucket.org/yt_analysis/yt/commits/2d79c347e8e4/
Changeset: 2d79c347e8e4
Branch: yt
User: ngoldbaum
Date: 2016-07-22 18:48:50+00:00
Summary: Use same_dimensions_as instead of ==
Affected #: 1 file
diff -r e943aa0c4c80860d6998e448f84ccf9bfdadecbe -r 2d79c347e8e4a123811b6fac31ff7529d6bf7c91 yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
--- a/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
+++ b/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
@@ -609,7 +609,7 @@
mask_field_units = [Unit(u) for u in mask_field_units]
for f in data:
for u in mask_field_units:
- if data[f].units == u:
+ if data[f].units.same_dimensions_as(u):
mask = data[f] > 0
if not np.any(mask):
raise RuntimeError(
https://bitbucket.org/yt_analysis/yt/commits/cbc5bd0ee2e5/
Changeset: cbc5bd0ee2e5
Branch: yt
User: ngoldbaum
Date: 2016-07-23 00:41:23+00:00
Summary: Adding an admonition to update the light ray trajectory
Affected #: 1 file
diff -r 2d79c347e8e4a123811b6fac31ff7529d6bf7c91 -r cbc5bd0ee2e5ea8687445aaa7de9a98436cb079e yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
--- a/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
+++ b/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
@@ -613,7 +613,8 @@
mask = data[f] > 0
if not np.any(mask):
raise RuntimeError(
- "No zones along light ray with nonzero %s." % (f,))
+ "No zones along light ray with nonzero %s. "
+ "Please modify your light ray trajectory." % (f,))
for key in data.keys():
data[key] = data[key][mask]
save_as_dataset(ds, filename, data, field_types=field_types,
https://bitbucket.org/yt_analysis/yt/commits/3def30daea80/
Changeset: 3def30daea80
Branch: yt
User: chummels
Date: 2016-07-23 12:49:41+00:00
Summary: Merged in ngoldbaum/yt (pull request #2300)
Mask out zero temperature data as well as zero density data. Closes #1232
Affected #: 1 file
diff -r 2d8f160304978d5fe9836fa54c80db779bf92f8e -r 3def30daea80724afecc4b301ff3338e64e07cd5 yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
--- a/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
+++ b/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
@@ -21,6 +21,8 @@
load
from yt.frontends.ytdata.utilities import \
save_as_dataset
+from yt.units.unit_object import \
+ Unit
from yt.units.yt_array import \
YTArray
from yt.utilities.cosmology import \
@@ -603,10 +605,18 @@
extra_attrs = {"data_type": "yt_light_ray"}
field_types = dict([(field, "grid") for field in data.keys()])
# Only return LightRay elements with non-zero density
- if 'density' in data:
- mask = data['density'] > 0
- for key in data.keys():
- data[key] = data[key][mask]
+ mask_field_units = ['K', 'cm**-3', 'g/cm**3']
+ mask_field_units = [Unit(u) for u in mask_field_units]
+ for f in data:
+ for u in mask_field_units:
+ if data[f].units.same_dimensions_as(u):
+ mask = data[f] > 0
+ if not np.any(mask):
+ raise RuntimeError(
+ "No zones along light ray with nonzero %s. "
+ "Please modify your light ray trajectory." % (f,))
+ for key in data.keys():
+ data[key] = data[key][mask]
save_as_dataset(ds, filename, data, field_types=field_types,
extra_attrs=extra_attrs)
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