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

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Mon Oct 13 14:49:48 2008
New Revision: 827
URL: http://yt.spacepope.org/changeset/827

Log:
Adding some more intelligent node_name stuff



Modified:
   trunk/yt/lagos/BaseDataTypes.py

Modified: trunk/yt/lagos/BaseDataTypes.py
==============================================================================
--- trunk/yt/lagos/BaseDataTypes.py	(original)
+++ trunk/yt/lagos/BaseDataTypes.py	Mon Oct 13 14:49:48 2008
@@ -548,8 +548,8 @@
         self.hierarchy.save_data(array2d, self._top_node, node_name, force = force)
         mylog.info("Done serializing...")
 
-    def _deserialize(self, node_name = None):
-        if not self._okay_to_serialize: return
+    def _deserialize(self, node_name = None, override = False):
+        if not override and not self._okay_to_serialize: return
         if node_name is None: node_name = self._gen_node_name()
         mylog.debug("Trying to get node %s", node_name)
         array=self.hierarchy.get_data(self._top_node, node_name)
@@ -849,7 +849,7 @@
         self.__retval_coarse = {}
         self.__overlap_masks = {}
         self._temp = {}
-        if not self._deserialize(node_name):
+        if not self._deserialize(node_name, override = (node_name is not None)):
             self.__calculate_overlap()
             if self.hierarchy.data_style == 6 and False:
                 self.__cache_data()