[yt-svn] commit/yt: 4 new changesets
Bitbucket
commits-noreply at bitbucket.org
Tue Jun 5 21:49:48 PDT 2012
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/changeset/3d67dbec6db8/
changeset: 3d67dbec6db8
branch: yt
user: chummels
date: 2012-06-05 04:40:32
summary: Adding l_max keyword to homogenized volume. Thanks, Matt.
affected #: 1 file
diff -r 2f074d314956f5b004e73dbae6abc3ea1edfd0e1 -r 3d67dbec6db863f80f8d64eed078ceffca66b6cf yt/visualization/volume_rendering/grid_partitioner.py
--- a/yt/visualization/volume_rendering/grid_partitioner.py
+++ b/yt/visualization/volume_rendering/grid_partitioner.py
@@ -41,7 +41,8 @@
class HomogenizedVolume(ParallelAnalysisInterface):
bricks = None
def __init__(self, fields = "Density", source = None, pf = None,
- log_fields = None, no_ghost = False):
+ log_fields = None, no_ghost = False,
+ max_level = 48):
# Typically, initialized as hanging off a hierarchy. But, not always.
ParallelAnalysisInterface.__init__(self)
self.no_ghost = no_ghost
@@ -54,6 +55,7 @@
else:
log_fields = [self.pf.field_info[field].take_log
for field in self.fields]
+ self.max_level = max_level
self.log_fields = log_fields
def traverse(self, back_point, front_point, image):
@@ -84,8 +86,13 @@
PP = ProtoPrism(grid.id, grid.LeftEdge, grid.RightEdge, GF)
pgs = []
+ cm = grid.child_mask.copy()
+ if grid.Level > self.max_level:
+ return pgs
+ elif grid.Level == self.max_level:
+ cm[:] = 1
for P in PP.sweep(0):
- sl = P.get_brick(grid.LeftEdge, grid.dds, grid.child_mask)
+ sl = P.get_brick(grid.LeftEdge, grid.dds, cm)
if len(sl) == 0: continue
dd = [d[sl[0][0]:sl[0][1]+1,
sl[1][0]:sl[1][1]+1,
https://bitbucket.org/yt_analysis/yt/changeset/971f5867d8c0/
changeset: 971f5867d8c0
branch: yt
user: chummels
date: 2012-06-05 04:42:13
summary: Merging.
affected #: 0 files
https://bitbucket.org/yt_analysis/yt/changeset/8e9b0ec65e45/
changeset: 8e9b0ec65e45
branch: yt
user: chummels
date: 2012-06-05 18:44:50
summary: Corrected bug in multi-dimensional widths in camera interface introduced in PR #152.
affected #: 1 file
diff -r 971f5867d8c0fd21d8848b4de4b296fe32613177 -r 8e9b0ec65e4549da41cf911634918a968303fce0 yt/visualization/volume_rendering/camera.py
--- a/yt/visualization/volume_rendering/camera.py
+++ b/yt/visualization/volume_rendering/camera.py
@@ -214,8 +214,8 @@
unit_vectors[1]*width[1],
unit_vectors[2]*width[2]])
self.origin = center - 0.5*na.dot(width,unit_vectors)
- self.back_center = center - 0.5*width[0]*unit_vectors[2]
- self.front_center = center + 0.5*width[0]*unit_vectors[2]
+ self.back_center = center - 0.5*width[2]*unit_vectors[2]
+ self.front_center = center + 0.5*width[2]*unit_vectors[2]
def look_at(self, new_center, north_vector = None):
r"""Change the view direction based on a new focal point.
https://bitbucket.org/yt_analysis/yt/changeset/8eb893f367cb/
changeset: 8eb893f367cb
branch: yt
user: chummels
date: 2012-06-06 06:49:38
summary: Merging.
affected #: 2 files
diff -r 8e9b0ec65e4549da41cf911634918a968303fce0 -r 8eb893f367cb88ce0bc679e43e987b16e4275786 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -3414,8 +3414,6 @@
The left edge of the region to be extracted
dims : array_like
Number of cells along each axis of resulting covering_grid
- right_edge : array_like, optional
- The right edge of the region to be extracted
fields : array_like, optional
A list of fields that you'd like pre-generated for your object
@@ -3574,16 +3572,13 @@
left_edge : array_like
The left edge of the region to be extracted
dims : array_like
- Number of cells along each axis of resulting covering_grid
- right_edge : array_like, optional
- The right edge of the region to be extracted
+ Number of cells along each axis of resulting covering_grid.
fields : array_like, optional
A list of fields that you'd like pre-generated for your object
Example
-------
cube = pf.h.smoothed_covering_grid(2, left_edge=[0.0, 0.0, 0.0], \
- right_edge=[1.0, 1.0, 1.0],
dims=[128, 128, 128])
"""
self._base_dx = (
@@ -3622,10 +3617,16 @@
for gi, grid in enumerate(self._grids):
if self._use_pbar: pbar.update(gi)
if grid.Level > last_level and grid.Level <= self.level:
+ mylog.debug("Updating level state to %s", last_level + 1)
self._update_level_state(last_level + 1)
self._refine(1, fields_to_get)
last_level = grid.Level
self._get_data_from_grid(grid, fields_to_get)
+ while last_level < self.level:
+ mylog.debug("Grid-free refinement %s to %s", last_level, last_level + 1)
+ self._update_level_state(last_level + 1)
+ self._refine(1, fields_to_get)
+ last_level += 1
if self.level > 0:
for field in fields_to_get:
self[field] = self[field][1:-1,1:-1,1:-1]
diff -r 8e9b0ec65e4549da41cf911634918a968303fce0 -r 8eb893f367cb88ce0bc679e43e987b16e4275786 yt/utilities/parallel_tools/parallel_analysis_interface.py
--- a/yt/utilities/parallel_tools/parallel_analysis_interface.py
+++ b/yt/utilities/parallel_tools/parallel_analysis_interface.py
@@ -343,7 +343,6 @@
def parallel_objects(objects, njobs = 0, storage = None, barrier = True):
if not parallel_capable:
njobs = 1
- mylog.warn("parallel_objects() is being used when parallel_capable is false. The loop is not being run in parallel. This may not be what was expected.")
my_communicator = communication_system.communicators[-1]
my_size = my_communicator.size
if njobs <= 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