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

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Wed Jul 22 07:11:05 2009
New Revision: 1387
URL: http://yt.spacepope.org/changeset/1387

Log:
Adding unpacked 2d HDF5



Modified:
   branches/yt-1.5/yt/lagos/DataReadingFuncs.py
   branches/yt-1.5/yt/lagos/HierarchyType.py

Modified: branches/yt-1.5/yt/lagos/DataReadingFuncs.py
==============================================================================
--- branches/yt-1.5/yt/lagos/DataReadingFuncs.py	(original)
+++ branches/yt-1.5/yt/lagos/DataReadingFuncs.py	Wed Jul 22 07:11:05 2009
@@ -184,6 +184,21 @@
                     (grid.id, field)).transpose()
     return t
 
+def readDataSliceUnpacked2D(self, grid, field, axis, coord):
+    """
+    Reads a slice through the HDF5 data
+
+    @param grid: Grid to slice
+    @type grid: L{EnzoGrid<EnzoGrid>}
+    @param field: field to get
+    @type field: string
+    @param sl: region to get
+    @type sl: SliceType
+    """
+    t = HDF5LightReader.ReadData(grid.filename, "/%s" %
+                    (grid.id, field)).transpose()
+    return t
+
 def readDataSlicePacked1D(self, grid, field, axis, coord):
     """
     Reads a slice through the HDF5 data

Modified: branches/yt-1.5/yt/lagos/HierarchyType.py
==============================================================================
--- branches/yt-1.5/yt/lagos/HierarchyType.py	(original)
+++ branches/yt-1.5/yt/lagos/HierarchyType.py	Wed Jul 22 07:11:05 2009
@@ -42,6 +42,7 @@
          getExceptionHDF5, DataQueueNative), \
      8: (readDataInMemory, readAllDataInMemory, getFieldsInMemory, readDataSliceInMemory,
          getExceptionInMemory, DataQueueInMemory),
+     'enzo_unpacked_2d': (readDataPacked, readAllDataPacked, getFieldsPacked, readDataSliceUnpacked2D),
      'enzo_packed_2d': (readDataPacked, readAllDataPacked, getFieldsPacked, readDataSlicePacked2D,
          getExceptionHDF5, DataQueuePacked2D),
      'enzo_packed_1d': (readDataPacked, readAllDataPacked, getFieldsPacked, readDataSlicePacked1D,
@@ -714,6 +715,9 @@
             elif len(list_of_sets) > 0 and rank == 3:
                 mylog.debug("Detected unpacked HDF5")
                 self.data_style = 5
+            elif len(list_of_sets) > 0 and rank == 2:
+                mylog.debug("Detect unpacked 2D")
+                self.data_style = 'enzo_unpacked_2d'
             elif len(list_of_sets) == 0 and rank == 2:
                 mylog.debug("Detect packed 2D")
                 self.data_style = 'enzo_packed_2d'