[Yt-svn] yt-commit r1117 - in branches/grid-optimization: tests yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Thu Jan 15 21:38:56 2009
New Revision: 1117
URL: http://yt.spacepope.org/changeset/1117

Log:
Fixed up some tests, changed some names, removed a print statement.  Removed
old get_data method that is now not needed.  Fixed contouring by mandating
tempContours comes from the grids and is not generated.



Modified:
   branches/grid-optimization/tests/test_lagos.py
   branches/grid-optimization/yt/lagos/BaseDataTypes.py
   branches/grid-optimization/yt/lagos/UniversalFields.py

Modified: branches/grid-optimization/tests/test_lagos.py
==============================================================================
--- branches/grid-optimization/tests/test_lagos.py	(original)
+++ branches/grid-optimization/tests/test_lagos.py	Thu Jan 15 21:38:56 2009
@@ -172,7 +172,6 @@
         ma = self.data["Density"].max() * 0.99
         cons, contours = self.data.extract_connected_sets(
             "Density", 2, mi, ma)
-        print cons
         self.assertEqual(len(contours), 2) # number of contour levels
         self.assertEqual(len(contours[0]), 2)
         self.assertEqual(len(contours[1]), 1)
@@ -300,7 +299,7 @@
             self.assertTrue(na.all(cube1["Density"] == cube2a["Density"]))
             self.assertTrue(na.all(cube1["Temperature"] == cube2b["Temperature"]))
     
-    def testFlushBack(self):
+    def testFlushBackToGrids(self):
         ml = self.hierarchy.max_level
         cg = self.hierarchy.covering_grid(3, [0.0]*3, [1.0]*3, [64,64,64])
         cg["Ones"] *= 2.0
@@ -308,8 +307,14 @@
         for g in na.concatenate([self.hierarchy.select_grids(i) for i in range(3)]):
             self.assertEqual(g["Ones"].max(), 2.0)
             self.assertEqual(g["Ones"][g["Ones"]*g.child_mask>0].min(), 2.0)
+
+    def testFlushBackToNewCover(self):
+        ml = self.hierarchy.max_level
+        cg = self.hierarchy.covering_grid(3, [0.0]*3, [1.0]*3, [64,64,64])
+        cg["tempContours"] = cg["Ones"] * 2.0
+        cg.flush_data(field="tempContours")
         cg2 = self.hierarchy.covering_grid(3, [0.0]*3, [1.0]*3, [64,64,64])
-        self.assertTrue(na.all(cg["Ones"] == cg2["Ones"]))
+        self.assertTrue(na.all(cg["tempContours"] == cg2["tempContours"]))
 
     def testRawFlushBack(self):
         ml = self.hierarchy.max_level

Modified: branches/grid-optimization/yt/lagos/BaseDataTypes.py
==============================================================================
--- branches/grid-optimization/yt/lagos/BaseDataTypes.py	(original)
+++ branches/grid-optimization/yt/lagos/BaseDataTypes.py	Thu Jan 15 21:38:56 2009
@@ -1787,42 +1787,6 @@
         self['dy'] = self.dds[1] * na.ones(self.ActiveDimensions, dtype='float64')
         self['dz'] = self.dds[2] * na.ones(self.ActiveDimensions, dtype='float64')
 
-    def get_data(self, field=None):
-        self._get_list_of_grids()
-        # We don't generate coordinates here.
-        if field == None:
-            _fields_to_get = self.fields
-        else:
-            _fields_to_get = ensure_list(field)
-        fields_to_get = [f for f in _fields_to_get if f not in self.data]
-        if len(fields_to_get) == 0: return
-        new_fields = []
-        for field in fields_to_get:
-            if not field in self.pf.hierarchy.field_list:
-                self._generate_field(field)
-                #self[field] = self.pf.field_info[field](self)
-            else:
-                self[field] = na.zeros(self.ActiveDimensions, dtype='float64') -999
-                new_fields.append(field)
-        fields_to_get = new_fields
-        if len(new_fields) == 0: return
-        mylog.debug("Getting fields %s from %s possible grids",
-                   fields_to_get, len(self._grids))
-        if self._use_pbar: pbar = \
-                get_pbar('Searching grids for values ', len(self._grids))
-        field = fields_to_get[-1]
-        for i,grid in enumerate(self._grids):
-            if self._use_pbar: pbar.update(i)
-            self._get_data_from_grid(grid, fields_to_get)
-            if not na.any(self[field] == -999): break
-        if self._use_pbar: pbar.finish()
-        if na.any(self[field] == -999):
-            # and self.dx < self.hierarchy.grids[0].dx:
-            print "COVERING PROBLEM", na.where(self[field]==-999)[0].size
-            print na.where(self[fields_to_get[0]]==-999)
-            return
-            raise KeyError
-
     def get_data(self, fields=None):
         if self._grids is None:
             self._get_list_of_grids()
@@ -1835,6 +1799,7 @@
             if self.data.has_key(field): continue
             if field not in self.hierarchy.field_list:
                 try:
+                    #print "Generating", field
                     self._generate_field(field)
                     continue
                 except NeedsOriginalGrid, ngt_exception:
@@ -1865,7 +1830,6 @@
         else: # Can't find the field, try as it might
             raise exceptions.KeyError(field)
 
-
     def flush_data(self, field=None):
         """
         Any modifications made to the data in this object are pushed back

Modified: branches/grid-optimization/yt/lagos/UniversalFields.py
==============================================================================
--- branches/grid-optimization/yt/lagos/UniversalFields.py	(original)
+++ branches/grid-optimization/yt/lagos/UniversalFields.py	Thu Jan 15 21:38:56 2009
@@ -429,7 +429,8 @@
     return na.ones(data["Density"].shape)*-1
 add_field("Contours", validators=[ValidateSpatial(0)], take_log=False,
           display_field=False, function=_Contours)
-add_field("tempContours", function=_Contours, validators=[ValidateSpatial(0)],
+add_field("tempContours", function=_Contours,
+          validators=[ValidateSpatial(0), ValidateGridType()],
           take_log=False, display_field=False)
 
 def obtain_velocities(data):