[Yt-svn] yt-commit r1556 - in trunk/yt: extensions lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Tue Dec 15 16:07:56 2009
New Revision: 1556
URL: http://yt.enzotools.org/changeset/1556

Log:
Updated the hierarchy type and hierarchy subset to work with the vtk wrappers
and widgets



Modified:
   trunk/yt/extensions/HierarchySubset.py
   trunk/yt/lagos/HierarchyType.py

Modified: trunk/yt/extensions/HierarchySubset.py
==============================================================================
--- trunk/yt/extensions/HierarchySubset.py	(original)
+++ trunk/yt/extensions/HierarchySubset.py	Tue Dec 15 16:07:56 2009
@@ -45,7 +45,6 @@
         self.pf = pf
         self.base_pf = base_pf
         self.field_parameters = {}
-        self.fields = []
         self.NumberOfParticles = 0
         self.id = 1
         self.hierarchy = hierarchy
@@ -126,10 +125,6 @@
             return [self._base_grid]
         return self.pf.h.select_grids(self.min_level + level)
 
-    def get_levels(self):
-        for level in range(self.final_level+1):
-            yield self.select_level(level)
-
     def export_output(self, afile, n, field):
         # I prefer dict access, but tables doesn't.
         # But h5py does!
@@ -220,7 +215,8 @@
         self.min_left_edge = self._convert_coords(min_left)
         self.max_right_edge = self._convert_coords(max_right)
         self.min_left, self.max_right = min_left, max_right
-        if pf.max_level == -1: max_level = pf.base_pf.h.max_level
+        max_level = pf.max_level
+        if max_level == -1: max_level = pf.base_pf.h.max_level
         self.max_level = min(max_level, pf.base_pf.h.max_level)
         self.final_level = self.max_level - self.min_level
 

Modified: trunk/yt/lagos/HierarchyType.py
==============================================================================
--- trunk/yt/lagos/HierarchyType.py	(original)
+++ trunk/yt/lagos/HierarchyType.py	Tue Dec 15 16:07:56 2009
@@ -83,6 +83,10 @@
         """
         return self.grids[self.grid_levels.flat == level]
 
+    def get_levels(self):
+        for level in range(self.max_level+1):
+            yield self.select_grids(level)
+
     def _initialize_state_variables(self):
         self._parallel_locking = False
         self._data_file = None