[yt-svn] commit/yt: 2 new changesets

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/64b9daded5b7/
changeset:   64b9daded5b7
branch:      yt
user:        sskory
date:        2012-01-26 23:03:09
summary:     Fixing the boolean containers so they work with clump containers.
affected #:  1 file

diff -r d0bcb602126125d833333f18642a92e12ff088ae -r 64b9daded5b76bc9a61d8a23a648b086bf05dc68 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -3642,14 +3642,19 @@
         # Using the processed cut_masks, we'll figure out what grids
         # are left in the hybrid region.
         for region in self._all_regions:
-            region._get_list_of_grids()
-            for grid in region._grids:
+            try:
+                region._get_list_of_grids()
+                alias = region
+            except AttributeError:
+                region.data._get_list_of_grids()
+                alias = region.data
+            for grid in alias._grids:
                 if grid in self._some_overlap or grid in self._all_overlap:
                     continue
                 # Get the cut_mask for this grid in this region, and see
                 # if there's any overlap with the overall cut_mask.
                 overall = self._get_cut_mask(grid)
-                local = force_array(region._get_cut_mask(grid),
+                local = force_array(alias._get_cut_mask(grid),
                     grid.ActiveDimensions)
                 # Below we don't want to match empty masks.
                 if overall.sum() == 0 and local.sum() == 0: continue
@@ -3723,6 +3728,11 @@
                         break
                 level_masks.append(force_array(self._get_level_mask(ops[i + 1:end],
                     grid), grid.ActiveDimensions))
+            elif isinstance(item.data, AMRData):
+                level_masks.append(force_array(item.data._get_cut_mask(grid),
+                    grid.ActiveDimensions))
+            else:
+                mylog.error("Item in the boolean construction unidentified.")
         # Now we do the logic on our level_mask.
         # There should be no nested logic anymore.
         # The first item should be a cut_mask,



https://bitbucket.org/yt_analysis/yt/changeset/38669b9052b5/
changeset:   38669b9052b5
branch:      yt
user:        sskory
date:        2012-01-26 23:04:50
summary:     Deleted unneeded line.
affected #:  1 file

diff -r 64b9daded5b76bc9a61d8a23a648b086bf05dc68 -r 38669b9052b5f5083451948fd08060bf91d75d3c yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -3646,7 +3646,6 @@
                 region._get_list_of_grids()
                 alias = region
             except AttributeError:
-                region.data._get_list_of_grids()
                 alias = region.data
             for grid in alias._grids:
                 if grid in self._some_overlap or grid in self._all_overlap:

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.