[Yt-svn] yt-commit r1521 - branches/yt-1.5/yt/lagos trunk/yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Fri Nov  6 14:01:54 2009
New Revision: 1521
URL: http://yt.enzotools.org/changeset/1521

Log:
Fixing a bug where the contours were at the data_source region boundary, but
not included in the data_source -- so they showed up in the covering grid, got
sent to the grids, and then the tempContours value was not cleared.  So now we
clear the tempContours value from the cg and its grids as well.



Modified:
   branches/yt-1.5/yt/lagos/ContourFinder.py
   trunk/yt/lagos/ContourFinder.py

Modified: branches/yt-1.5/yt/lagos/ContourFinder.py
==============================================================================
--- branches/yt-1.5/yt/lagos/ContourFinder.py	(original)
+++ branches/yt-1.5/yt/lagos/ContourFinder.py	Fri Nov  6 14:01:54 2009
@@ -24,6 +24,7 @@
 """
 
 from yt.lagos import *
+from itertools import chain
 
 class GridConsiderationQueue:
     def __init__(self, white_list, priority_func=None):
@@ -148,7 +149,7 @@
         i += 1
     mylog.info("Identified %s contours between %0.5e and %0.5e",
                len(contour_ind.keys()),min_val,max_val)
-    for grid in data_source._grids:
+    for grid in chain(data_source._grids, cg._grids):
         grid.data.pop("tempContours", None)
     del data_source.data["tempContours"]
     return contour_ind

Modified: trunk/yt/lagos/ContourFinder.py
==============================================================================
--- trunk/yt/lagos/ContourFinder.py	(original)
+++ trunk/yt/lagos/ContourFinder.py	Fri Nov  6 14:01:54 2009
@@ -24,6 +24,7 @@
 """
 
 from yt.lagos import *
+from itertools import chain
 
 class GridConsiderationQueue:
     def __init__(self, white_list, priority_func=None):
@@ -148,7 +149,7 @@
         i += 1
     mylog.info("Identified %s contours between %0.5e and %0.5e",
                len(contour_ind.keys()),min_val,max_val)
-    for grid in data_source._grids:
+    for grid in chain(data_source._grids, cg._grids):
         grid.data.pop("tempContours", None)
     del data_source.data["tempContours"]
     return contour_ind