[Yt-svn] yt: Fixed issue with data ordering in FLASH full-dataset reading...

hg at spacepope.org hg at spacepope.org
Wed Jul 28 10:23:40 PDT 2010


hg Repository: yt
details:   yt/rev/14a60b015517
changeset: 1890:14a60b015517
user:      Matthew Turk <matthewturk at gmail.com>
date:
Wed Jul 28 10:23:36 2010 -0700
description:
Fixed issue with data ordering in FLASH full-dataset reading, and fixed an
issue with assigning levels to FLASHGrids.

diffstat:

 yt/lagos/BaseDataTypes.py    |  1 +
 yt/lagos/DataReadingFuncs.py |  2 +-
 yt/lagos/HierarchyType.py    |  4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 5fa444f2d48d -r 14a60b015517 yt/lagos/BaseDataTypes.py
--- a/yt/lagos/BaseDataTypes.py	Wed Jul 28 09:55:29 2010 -0700
+++ b/yt/lagos/BaseDataTypes.py	Wed Jul 28 10:23:36 2010 -0700
@@ -2243,6 +2243,7 @@
         """
         AMR3DData.__init__(self, center, fields, pf, **kwargs)
         self._grids = na.array(grid_list)
+        self.grid_list = self._grids
 
     def _get_list_of_grids(self):
         pass
diff -r 5fa444f2d48d -r 14a60b015517 yt/lagos/DataReadingFuncs.py
--- a/yt/lagos/DataReadingFuncs.py	Wed Jul 28 09:55:29 2010 -0700
+++ b/yt/lagos/DataReadingFuncs.py	Wed Jul 28 10:23:36 2010 -0700
@@ -508,7 +508,7 @@
 
     def _read_data_set(self, grid, field):
         f = h5py.File(grid.pf.parameter_filename, "r")
-        return f["/%s" % field][grid.id - grid._id_offset,:,:,:]
+        return f["/%s" % field][grid.id - grid._id_offset,:,:,:].transpose()
 
     def _read_data_slice(self, grid, field, axis, coord):
         sl = [slice(None), slice(None), slice(None)]
diff -r 5fa444f2d48d -r 14a60b015517 yt/lagos/HierarchyType.py
--- a/yt/lagos/HierarchyType.py	Wed Jul 28 09:55:29 2010 -0700
+++ b/yt/lagos/HierarchyType.py	Wed Jul 28 10:23:36 2010 -0700
@@ -1469,8 +1469,8 @@
         # This will become redundant, as _prepare_grid will reset it to its
         # current value.  Note that FLASH uses 1-based indexing for refinement
         # levels, but we do not, so we reduce the level by 1.
-        self.grid_levels[:] = f["/refine level"][:][:,None] - 1
-        g = [self.grid(i+1, self, self.grid_levels[i])
+        self.grid_levels.flat[:] = f["/refine level"][:][:] - 1
+        g = [self.grid(i+1, self, self.grid_levels[i,0])
                 for i in xrange(self.num_grids)]
         self.grids = na.array(g, dtype='object')
 



More information about the yt-svn mailing list