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

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Tue May 13 19:18:00 2008
New Revision: 471
URL: http://yt.spacepope.org/changeset/471

Log:

Fix for serialization in small hierarchies.  Also, turned back on serialization
of projections, but *only* when they are of the entire domain.



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

Modified: trunk/yt/lagos/BaseDataTypes.py
==============================================================================
--- trunk/yt/lagos/BaseDataTypes.py	(original)
+++ trunk/yt/lagos/BaseDataTypes.py	Tue May 13 19:18:00 2008
@@ -678,7 +678,9 @@
         if not source:
             self._check_region = False
             source = EnzoGridCollection(center, self.hierarchy.grids)
+            self._okay_to_serialize = True
         else:
+            self._okay_to_serialize = False
             self._check_region = True
         self.source = source
         if max_level == None:
@@ -697,6 +699,7 @@
             if self.hierarchy.data_style == 6 and False:
                 self.__cache_data()
             self._refresh_data()
+            if self._okay_to_serialize: self._serialize()
 
     #@time_execution
     def __cache_data(self):
@@ -742,6 +745,7 @@
         mylog.info("Done serializing...")
 
     def _deserialize(self):
+        if not self._okay_to_serialize: return
         node_name = "%s_%s_%s" % (self.fields[0], self._weight, self.axis)
         mylog.debug("Trying to get node %s", node_name)
         array=self.hierarchy.get_data("/Projections", node_name)

Modified: trunk/yt/lagos/HierarchyType.py
==============================================================================
--- trunk/yt/lagos/HierarchyType.py	(original)
+++ trunk/yt/lagos/HierarchyType.py	Tue May 13 19:18:00 2008
@@ -333,7 +333,8 @@
         allArrays[:,15:16] = self.gridLevels[:]
         allArrays[:,16:17] = self.gridTimes[:]
         allArrays[:,17:18] = self.gridNumberOfParticles[:]
-        self.save_data(allArrays, "/","Hierarchy")
+        if self.num_grids > 1000:
+            self.save_data(allArrays, "/","Hierarchy")
         del allArrays
 
     def __setup_grid_tree(self):