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

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Thu Jun  4 14:00:31 2009
New Revision: 1322
URL: http://yt.spacepope.org/changeset/1322

Log:
Fix a problem with generating a node name in some cases for cutting planes.
Fixed a bug with getting the data for the in-memory hierarchy.



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

Modified: trunk/yt/lagos/BaseDataTypes.py
==============================================================================
--- trunk/yt/lagos/BaseDataTypes.py	(original)
+++ trunk/yt/lagos/BaseDataTypes.py	Thu Jun  4 14:00:31 2009
@@ -883,7 +883,7 @@
         return na.where(k)
 
     def _gen_node_name(self):
-        cen_name = ("%s" % self.center).replace(" ","_")[1:-1]
+        cen_name = ("%s" % (self.center,)).replace(" ","_")[1:-1]
         L_name = ("%s" % self._norm_vec).replace(" ","_")[1:-1]
         return "%s/c%s_L%s" % \
             (self._top_node, cen_name, L_name)

Modified: trunk/yt/lagos/DataReadingFuncs.py
==============================================================================
--- trunk/yt/lagos/DataReadingFuncs.py	(original)
+++ trunk/yt/lagos/DataReadingFuncs.py	Thu Jun  4 14:00:31 2009
@@ -286,7 +286,7 @@
     def _read_set(self, grid, field):
         import enzo
         if grid.id not in self.grids_in_memory: raise KeyError
-        return self.grids_in_memory[grid.id][field][self.my_slice]
+        return self.grids_in_memory[grid.id][field].swapaxes(0,2)[self.my_slice]
         coef1 = max((grid.Time - t1)/(grid.Time - t2), 0.0)
         coef2 = 1.0 - coef1
         t1 = enzo.yt_parameter_file["InitialTime"]