[Yt-svn] yt-commit r1065 - trunk/yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Thu Jan  1 15:41:46 2009
New Revision: 1065
URL: http://yt.spacepope.org/changeset/1065

Log:
Added back in factor of 0.5 in the get_cut_mask, and changed _is_fully_enclosed
to reflect changes in the cut mask function.  Fixes #178 for me, waiting for
confirmation from Stephen about Ranger.



Modified:
   trunk/yt/lagos/BaseDataTypes.py

Modified: trunk/yt/lagos/BaseDataTypes.py
==============================================================================
--- trunk/yt/lagos/BaseDataTypes.py	(original)
+++ trunk/yt/lagos/BaseDataTypes.py	Thu Jan  1 15:41:46 2009
@@ -1545,19 +1545,19 @@
 
     def _is_fully_enclosed(self, grid):
         return na.all( (grid._corners < self.right_edge)
-                     & (grid._corners >= self.left_edge))
+                     & (grid._corners > self.left_edge))
 
     @cache_mask
     def _get_cut_mask(self, grid):
         if self._is_fully_enclosed(grid):
             return True
         else:
-            cm = ( (grid['x'] - grid['dx'] < self.right_edge[0])
-                 & (grid['x'] + grid['dx'] > self.left_edge[0])
-                 & (grid['y'] - grid['dy'] < self.right_edge[1])
-                 & (grid['y'] + grid['dy'] > self.left_edge[1])
-                 & (grid['z'] - grid['dz'] < self.right_edge[2])
-                 & (grid['z'] + grid['dz'] > self.left_edge[2]) )
+            cm = ( (grid['x'] - 0.5 * grid['dx'] < self.right_edge[0])
+                 & (grid['x'] + 0.5 * grid['dx'] > self.left_edge[0])
+                 & (grid['y'] - 0.5 * grid['dy'] < self.right_edge[1])
+                 & (grid['y'] + 0.5 * grid['dy'] > self.left_edge[1])
+                 & (grid['z'] - 0.5 * grid['dz'] < self.right_edge[2])
+                 & (grid['z'] + 0.5 * grid['dz'] > self.left_edge[2]) )
         return cm
 
 class AMRPeriodicRegionBase(AMR3DData):