[Yt-svn] yt-commit r1499 - branches/yt-1.5/yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Sun Oct 25 15:59:38 2009
New Revision: 1499
URL: http://yt.enzotools.org/changeset/1499

Log:
Bringing the fix for the extraction of covering data back to yt-1.5.



Modified:
   branches/yt-1.5/yt/lagos/BaseDataTypes.py

Modified: branches/yt-1.5/yt/lagos/BaseDataTypes.py
==============================================================================
--- branches/yt-1.5/yt/lagos/BaseDataTypes.py	(original)
+++ branches/yt-1.5/yt/lagos/BaseDataTypes.py	Sun Oct 25 15:59:38 2009
@@ -1911,12 +1911,13 @@
                    obtain_fields, len(self._grids))
         if self._use_pbar: pbar = \
                 get_pbar('Searching grids for values ', len(self._grids))
+        count = self.ActiveDimensions.prod()
         for i, grid in enumerate(self._grids):
             if self._use_pbar: pbar.update(i)
-            self._get_data_from_grid(grid, obtain_fields)
-            if not na.any(self[obtain_fields[0]] == -999): break
+            count -= self._get_data_from_grid(grid, obtain_fields)
+            if count <= 0: break
         if self._use_pbar: pbar.finish()
-        if na.any(self[obtain_fields[0]] == -999):
+        if count > 0 or na.any(self[obtain_fields[0]] == -999):
             # and self.dx < self.hierarchy.grids[0].dx:
             print "COVERING PROBLEM", na.where(self[obtain_fields[0]]==-999)[0].size
             print na.where(self[obtain_fields[0]]==-999)
@@ -1952,10 +1953,11 @@
         c_dx = self.dds.ravel()
         g_fields = [grid[field] for field in ensure_list(fields)]
         c_fields = [self[field] for field in ensure_list(fields)]
-        PointCombine.DataCubeRefine(
+        count = PointCombine.DataCubeRefine(
             grid.LeftEdge, g_dx, g_fields, grid.child_mask,
             self.left_edge, self.right_edge, c_dx, c_fields,
             ll, self.pf["DomainLeftEdge"], self.pf["DomainRightEdge"])
+        return count
 
     def _flush_data_to_grid(self, grid, fields):
         ll = int(grid.Level == self.level)