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

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Wed Apr  1 15:28:29 2009
New Revision: 1246
URL: http://yt.spacepope.org/changeset/1246

Log:
Added 2D support for HDF4 datasets



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

Modified: trunk/yt/lagos/DataReadingFuncs.py
==============================================================================
--- trunk/yt/lagos/DataReadingFuncs.py	(original)
+++ trunk/yt/lagos/DataReadingFuncs.py	Wed Apr  1 15:28:29 2009
@@ -166,6 +166,11 @@
 def getExceptionInMemory():
     return KeyError
 
+def readDataSliceHDF4_2D(self, grid, field, axis, coord):
+    t = SD.SD(grid.filename).select(field).get()
+    return t.transpose()
+
+
 def readDataSlicePacked2D(self, grid, field, axis, coord):
     """
     Reads a slice through the HDF5 data
@@ -229,6 +234,14 @@
     def modify(self, field):
         return field.swapaxes(0,2)
 
+class DataQueueHDF4_2D(BaseDataQueue):
+    def _read_set(self, grid, field):
+        t = SD.SD(grid.filename).select(field).get()[:,:,None]
+        return t.swapaxes(0,1)
+
+    def modify(self, field):
+        pass
+
 class DataQueueHDF5(BaseDataQueue):
     def _read_set(self, grid, field):
         return readDataHDF5(grid, field)

Modified: trunk/yt/lagos/HierarchyType.py
==============================================================================
--- trunk/yt/lagos/HierarchyType.py	(original)
+++ trunk/yt/lagos/HierarchyType.py	Wed Apr  1 15:28:29 2009
@@ -32,6 +32,8 @@
 _data_style_funcs = \
    { 4: (readDataHDF4,readAllDataHDF4, getFieldsHDF4, readDataSliceHDF4,
          getExceptionHDF4, DataQueueHDF4),
+     'enzo_hdf4_2d': (readDataHDF4, readAllDataHDF4, getFieldsHDF4, readDataSliceHDF4_2D,
+         getExceptionHDF4, DataQueueHDF4_2D),
      5: (readDataHDF5, readAllDataHDF5, getFieldsHDF5, readDataSliceHDF5,
          getExceptionHDF5, DataQueueHDF5),
      6: (readDataPacked, readAllDataPacked, getFieldsPacked, readDataSlicePacked,