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

mturk at wrangler.dreamhost.com mturk at wrangler.dreamhost.com
Fri Oct 10 14:23:19 PDT 2008


Author: mturk
Date: Fri Oct 10 14:23:19 2008
New Revision: 820
URL: http://yt.spacepope.org/changeset/820

Log:
Fix for cut masking in periodic grids



Modified:
   trunk/yt/lagos/BaseDataTypes.py

Modified: trunk/yt/lagos/BaseDataTypes.py
==============================================================================
--- trunk/yt/lagos/BaseDataTypes.py	(original)
+++ trunk/yt/lagos/BaseDataTypes.py	Fri Oct 10 14:23:19 2008
@@ -1507,15 +1507,14 @@
         if self._is_fully_enclosed(grid):
             return True
         else:
-            cm = na.array(na.shape(grid['x'])[0],dtype=bool)
-            offsets = na.array([-1,0,1])
+            cm = na.zeros(grid.ActiveDimensions,dtype='bool')
             for off_x, off_y, off_z in self.offsets:
-                cm = cm | ( (grid['x'] < self.right_edge[0]+off_x)
-                          & (grid['x'] >= self.left_edge[0]+off_x)
-                          & (grid['y'] < self.right_edge[1]+off_y)
-                          & (grid['y'] >= self.left_edge[1]+off_y)
-                          & (grid['z'] < self.right_edge[2]+off_z)
-                          & (grid['z'] >= self.left_edge[2]+off_z) )
+                cm = cm | ( (grid['x'] + off_x < self.right_edge[0])
+                          & (grid['x'] + off_x >= self.left_edge[0])
+                          & (grid['y'] + off_y < self.right_edge[1])
+                          & (grid['y'] + off_y >= self.left_edge[1])
+                          & (grid['z'] + off_z < self.right_edge[2])
+                          & (grid['z'] + off_z >= self.left_edge[2]) )
             return cm
 
 class EnzoGridCollection(Enzo3DData):



More information about the yt-svn mailing list