[yt-svn] commit/yt: 2 new changesets
Bitbucket
commits-noreply at bitbucket.org
Tue Nov 22 12:49:18 PST 2011
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/changeset/8e8bd909bcf0/
changeset: 8e8bd909bcf0
branch: yt
user: MatthewTurk
date: 2011-11-22 21:44:11
summary: Merge
affected #: 6 files
diff -r 2d06f5424c8c89b4c383af7a3cf2a1b220d41ca9 -r 8e8bd909bcf05e8afc8e6b959d6f5ca630aefa89 yt/visualization/color_maps.py
--- a/yt/visualization/color_maps.py
+++ b/yt/visualization/color_maps.py
@@ -34,15 +34,15 @@
except ValueError:
return False
-raven_colormaps = {}
+yt_colormaps = {}
def add_cmap(name, cdict):
- raven_colormaps[name] = \
+ yt_colormaps[name] = \
cc.LinearSegmentedColormap(name,cdict,256)
mcm.datad[name] = cdict
mcm.__dict__[name] = cdict
try: # API compatibility
- mcm.register_cmap(name, raven_colormaps[name])
+ mcm.register_cmap(name, yt_colormaps[name])
except AttributeError:
pass
diff -r 2d06f5424c8c89b4c383af7a3cf2a1b220d41ca9 -r 8e8bd909bcf05e8afc8e6b959d6f5ca630aefa89 yt/visualization/plot_collection.py
--- a/yt/visualization/plot_collection.py
+++ b/yt/visualization/plot_collection.py
@@ -1065,7 +1065,7 @@
the y-axis. All subsequent fields will be binned and their
profiles added to the underlying `BinnedProfile2D`.
cmap : string, optional
- An acceptable colormap. See either raven.color_maps or
+ An acceptable colormap. See either yt.visualization.color_maps or
http://www.scipy.org/Cookbook/Matplotlib/Show_colormaps .
weight : string, default "CellMassMsun"
The weighting field for an average. This defaults to mass-weighted
@@ -1189,7 +1189,7 @@
The center to be used for things like radius and radial velocity.
Defaults to the center of the plot collection.
cmap : string, optional
- An acceptable colormap. See either raven.color_maps or
+ An acceptable colormap. See either yt.visualization.color_maps or
http://www.scipy.org/Cookbook/Matplotlib/Show_colormaps .
weight : string, default "CellMassMsun"
The weighting field for an average. This defaults to mass-weighted
diff -r 2d06f5424c8c89b4c383af7a3cf2a1b220d41ca9 -r 8e8bd909bcf05e8afc8e6b959d6f5ca630aefa89 yt/visualization/plot_modifications.py
--- a/yt/visualization/plot_modifications.py
+++ b/yt/visualization/plot_modifications.py
@@ -723,7 +723,7 @@
font_size=8, print_halo_size=False,
print_halo_mass=False, width=None):
"""
- Accepts a :class:`yt.lagos.HopList` *hop_output* and plots up to
+ Accepts a :class:`yt.HopList` *hop_output* and plots up to
*max_number* (None for unlimited) halos as circles.
"""
self.hop_output = hop_output
diff -r 2d06f5424c8c89b4c383af7a3cf2a1b220d41ca9 -r 8e8bd909bcf05e8afc8e6b959d6f5ca630aefa89 yt/visualization/plot_types.py
--- a/yt/visualization/plot_types.py
+++ b/yt/visualization/plot_types.py
@@ -35,7 +35,7 @@
x_dict, \
y_dict, \
axis_names
-from .color_maps import raven_colormaps
+from .color_maps import yt_colormaps
class CallbackRegistryHandler(object):
def __init__(self, plot):
@@ -226,8 +226,8 @@
Change the colormap of this plot to *cmap*.
"""
if isinstance(cmap, types.StringTypes):
- if str(cmap) in raven_colormaps:
- cmap = raven_colormaps[str(cmap)]
+ if str(cmap) in yt_colormaps:
+ cmap = yt_colormaps[str(cmap)]
elif hasattr(matplotlib.cm, cmap):
cmap = getattr(matplotlib.cm, cmap)
self.cmap = cmap
diff -r 2d06f5424c8c89b4c383af7a3cf2a1b220d41ca9 -r 8e8bd909bcf05e8afc8e6b959d6f5ca630aefa89 yt/visualization/profile_plotter.py
--- a/yt/visualization/profile_plotter.py
+++ b/yt/visualization/profile_plotter.py
@@ -198,7 +198,7 @@
the y-axis. All subsequent fields will be binned and their
profiles added to the underlying `BinnedProfile2D`.
cmap : string, optional
- An acceptable colormap. See either raven.color_maps or
+ An acceptable colormap. See either yt.visualization.color_maps or
http://www.scipy.org/Cookbook/Matplotlib/Show_colormaps .
weight : string, default "CellMassMsun"
The weighting field for an average. This defaults to mass-weighted
diff -r 2d06f5424c8c89b4c383af7a3cf2a1b220d41ca9 -r 8e8bd909bcf05e8afc8e6b959d6f5ca630aefa89 yt/visualization/streamlines.py
--- a/yt/visualization/streamlines.py
+++ b/yt/visualization/streamlines.py
@@ -38,7 +38,7 @@
Parameters
----------
- pf : `~yt.lagos.StaticOutput`
+ pf : `~yt.data_objects.StaticOutput`
This is the parameter file to streamline
pos : array_like
An array of initial starting positions of the streamlines.
https://bitbucket.org/yt_analysis/yt/changeset/eff898582e95/
changeset: eff898582e95
branch: yt
user: MatthewTurk
date: 2011-11-22 21:48:46
summary: Merge
affected #: 1 file
diff -r 8e8bd909bcf05e8afc8e6b959d6f5ca630aefa89 -r eff898582e9538166e31ae224eda89020d07b096 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -2703,6 +2703,31 @@
_type_name = "extracted_region"
_con_args = ('_base_region', '_indices')
def __init__(self, base_region, indices, force_refresh=True, **kwargs):
+ """An arbitrarily defined data container that allows for selection
+ of all data meeting certain criteria.
+
+ In order to create an arbitrarily selected set of data, the
+ ExtractedRegion takes a `base_region` and a set of `indices`
+ and creates a region within the `base_region` consisting of
+ all data indexed by the `indices`. Note that `indices` must be
+ precomputed. This does not work well for parallelized
+ operations.
+
+ Parameters
+ ----------
+ base_region : yt data source
+ A previously selected data source.
+ indices : array_like
+ An array of indices
+
+ Other Parameters
+ ----------------
+ force_refresh : bool
+ Force a refresh of the data. Defaults to True.
+
+ Examples
+ --------
+ """
cen = kwargs.pop("center", None)
if cen is None: cen = base_region.get_field_parameter("center")
AMR3DData.__init__(self, center=cen,
@@ -2986,10 +3011,22 @@
_dx_pad = 0.5
def __init__(self, center, left_edge, right_edge, fields = None,
pf = None, **kwargs):
- """
- We create an object with a set of three *left_edge* coordinates,
- three *right_edge* coordinates, and a *center* that need not be the
- center.
+ """A 3D region of data with an arbitrary center.
+
+ Takes an array of three *left_edge* coordinates, three
+ *right_edge* coordinates, and a *center* that can be anywhere
+ in the domain. If the selected region extends past the edges
+ of the domain, no data will be found there, though the
+ object's `left_edge` or `right_edge` are not modified.
+
+ Parameters
+ ----------
+ center : array_like
+ The center of the region
+ left_edge : array_like
+ The left edge of the region
+ right_edge : array_like
+ The right edge of the region
"""
AMR3DData.__init__(self, center, fields, pf, **kwargs)
self.left_edge = left_edge
@@ -3034,10 +3071,25 @@
_dx_pad = 0.5
def __init__(self, center, left_edge, right_edge, fields = None,
pf = None, **kwargs):
- """
- We create an object with a set of three *left_edge* coordinates,
- three *right_edge* coordinates, and a *center* that need not be the
- center.
+ """A 3D region of data that with periodic boundary
+ conditions if the selected region extends beyond the
+ simulation domain.
+
+ Takes an array of three *left_edge* coordinates, three
+ *right_edge* coordinates, and a *center* that can be anywhere
+ in the domain. The selected region can extend past the edges
+ of the domain, in which case periodic boundary conditions will
+ be applied to fill the region.
+
+ Parameters
+ ----------
+ center : array_like
+ The center of the region
+ left_edge : array_like
+ The left edge of the region
+ right_edge : array_like
+ The right edge of the region
+
"""
AMR3DData.__init__(self, center, fields, pf, **kwargs)
self.left_edge = na.array(left_edge)
@@ -3085,6 +3137,15 @@
"""
_type_name = "periodic_region_strict"
_dx_pad = 0.0
+ def __init__(self, center, left_edge, right_edge, fields = None,
+ pf = None, **kwargs):
+ """same as periodic region, but does not include cells unless
+ the selected region encompasses their centers.
+
+ """
+ AMRPeriodicRegionBase.__init__(self, center, left_edge, right_edge,
+ fields = None, pf = None, **kwargs)
+
class AMRGridCollectionBase(AMR3DData):
"""
@@ -3126,9 +3187,20 @@
_type_name = "sphere"
_con_args = ('center', 'radius')
def __init__(self, center, radius, fields = None, pf = None, **kwargs):
- """
- The most famous of all the data objects, we define it via a
- *center* and a *radius*.
+ """A sphere f points defined by a *center* and a *radius*.
+
+ Parameters
+ ----------
+ center : array_like
+ The center of the sphere.
+ radius : float
+ The radius of the sphere.
+
+ Examples
+ --------
+ >>> pf = load("DD0010/moving7_0010")
+ >>> c = [0.5,0.5,0.5]
+ >>> sphere = pf.h.sphere(c,1.*pf['kpc'])
"""
AMR3DData.__init__(self, center, fields, pf, **kwargs)
# Unpack the radius, if necessary
@@ -3176,6 +3248,19 @@
_con_args = ('level', 'left_edge', 'right_edge', 'ActiveDimensions')
def __init__(self, level, left_edge, dims, fields = None,
pf = None, num_ghost_zones = 0, use_pbar = True, **kwargs):
+ """A 3D region with all data extracted to a single, specified
+ resolution.
+
+ Parameters
+ ----------
+ level : int
+ The resolution level data is uniformly gridded at
+ left_edge : array_like
+ The left edge of the region to be extracted
+ right_edge : array_like
+ The right edge of the region to be extracted
+
+ """
AMR3DData.__init__(self, center=kwargs.pop("center", None),
fields=fields, pf=pf, **kwargs)
self.left_edge = na.array(left_edge)
@@ -3309,6 +3394,24 @@
_type_name = "smoothed_covering_grid"
@wraps(AMRCoveringGridBase.__init__)
def __init__(self, *args, **kwargs):
+ """A 3D region with all data extracted and interpolated to a
+ single, specified resolution.
+
+ Smoothed covering grids start at level 0, interpolating to
+ fill the region to level 1, replacing any cells actually
+ covered by level 1 data, and then recursively repeating this
+ process until it reaches the specified `level`.
+
+ Parameters
+ ----------
+ level : int
+ The resolution level data is uniformly gridded at
+ left_edge : array_like
+ The left edge of the region to be extracted
+ right_edge : array_like
+ The right edge of the region to be extracted
+
+ """
self._base_dx = (
(self.pf.domain_right_edge - self.pf.domain_left_edge) /
self.pf.domain_dimensions.astype("float64"))
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