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

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Sun Dec 20 09:57:12 2009
New Revision: 1558
URL: http://yt.enzotools.org/changeset/1558

Log:
Minor fixes for regex parser, to allow for spaces after grid id in the
hierarchy, and a fix for property guessing from parents in the grids.



Modified:
   trunk/yt/lagos/BaseGridType.py
   trunk/yt/lagos/HierarchyType.py

Modified: trunk/yt/lagos/BaseGridType.py
==============================================================================
--- trunk/yt/lagos/BaseGridType.py	(original)
+++ trunk/yt/lagos/BaseGridType.py	Sun Dec 20 09:57:12 2009
@@ -473,9 +473,7 @@
         rf = self.pf["RefineBy"]
         my_ind = self.id - self._id_offset
         le = self.LeftEdge
-        self['dx'] = self.Parent['dx']/rf
-        self['dy'] = self.Parent['dy']/rf
-        self['dz'] = self.Parent['dz']/rf
+        self.dds = self.Parent.dds/rf
         ParentLeftIndex = na.rint((self.LeftEdge-self.Parent.LeftEdge)/self.Parent.dds)
         self.start_index = rf*(ParentLeftIndex + self.Parent.get_global_startindex()).astype('int64')
         self.LeftEdge = self.Parent.LeftEdge + self.Parent.dds * ParentLeftIndex

Modified: trunk/yt/lagos/HierarchyType.py
==============================================================================
--- trunk/yt/lagos/HierarchyType.py	(original)
+++ trunk/yt/lagos/HierarchyType.py	Sun Dec 20 09:57:12 2009
@@ -426,7 +426,7 @@
         if os.path.exists(self.hierarchy_filename[:-9] + "harrays"):
             if self._parse_binary_hierarchy(): return
         t1 = time.time()
-        pattern = r"Pointer: Grid\[(\d*)\]->NextGrid(Next|This)Level = (\d*)$"
+        pattern = r"Pointer: Grid\[(\d*)\]->NextGrid(Next|This)Level = (\d*)\s+$"
         patt = re.compile(pattern)
         f = open(self.hierarchy_filename, "rb")
         self.grids = [self.grid(1, self)]