Changeset 2491 for inundation/pyvolution/test_data_manager.py

Timestamp:

Mar 8, 2006, 1:39:11 PM (19 years ago)

Author:

ole

Message:

Changed domain.get_quantity() to return a quantity object rather than the values.
Updated tests accordingly

File:

• inundation/pyvolution/test_data_manager.py (modified) (8 diffs)

inundation/pyvolution/test_data_manager.py

@@ -2277 +2277 @@
         elevation = domain.quantities['elevation'].vertex_values
         domain.set_quantity('stage', elevation + h)
-        #elevation = domain.get_quantity('elevation')
-        #domain.set_quantity('stage', elevation + h)
 
         domain.check_integrity()
@@ -2307 +2305 @@
         bits = ['vertex_coordinates']
         for quantity in ['elevation']+domain.quantities_to_be_stored:
-            bits.append('quantities["%s"].get_integral()'%quantity)
-            bits.append('get_quantity("%s")'%quantity)
+            bits.append('get_quantity("%s").get_integral()' %quantity)
+            bits.append('get_quantity("%s").get_values()' %quantity)
 
         for bit in bits:
@@ -2368 +2366 @@
 
         for quantity in ['elevation','xmomentum','ymomentum']:#+domain.quantities_to_be_stored:
-            bits.append('quantities["%s"].get_integral()'%quantity)
-            bits.append('get_quantity("%s")'%quantity)
+            bits.append('get_quantity("%s").get_integral()' %quantity)
+            bits.append('get_quantity("%s").get_values()' %quantity)
 
         for bit in bits:
@@ -2450 +2448 @@
 
         for quantity in ['elevation']+domain.quantities_to_be_stored:
-            bits.append('quantities["%s"].get_integral()'%quantity)
-            bits.append('get_quantity("%s")'%quantity)
+            bits.append('get_quantity("%s").get_integral()' %quantity)
+            bits.append('get_quantity("%s").get_values()' %quantity)
 
         for bit in bits:
@@ -2457 +2455 @@
             assert allclose(eval('domain.'+bit),eval('domain2.'+bit))
 
-        assert max(max(domain2.get_quantity('xmomentum')))==filler
-        assert min(min(domain2.get_quantity('xmomentum')))==filler
-        assert max(max(domain2.get_quantity('ymomentum')))==filler
-        assert min(min(domain2.get_quantity('ymomentum')))==filler
+        assert max(max(domain2.get_quantity('xmomentum').get_values()))==filler
+        assert min(min(domain2.get_quantity('xmomentum').get_values()))==filler
+        assert max(max(domain2.get_quantity('ymomentum').get_values()))==filler
+        assert min(min(domain2.get_quantity('ymomentum').get_values()))==filler
 
 
@@ -2526 +2524 @@
         elevation = domain.quantities['elevation'].vertex_values
         domain.set_quantity('stage', elevation + h)
-        #elevation = domain.get_quantity('elevation')
-        #domain.set_quantity('stage', elevation + h)
+
 
         domain.check_integrity()
@@ -2559 +2556 @@
         for quantity in ['elevation']+domain.quantities_to_be_stored:
             bits.append('quantities["%s"].get_integral()'%quantity)
-            #bits.append('get_quantity("%s")'%quantity)
+
 
         for bit in bits:
@@ -2616 +2613 @@
         ##################
 
+        print '><><><><>>'
         bits = [ 'vertex_coordinates']
 
         for quantity in ['elevation','xmomentum','ymomentum']:#+domain.quantities_to_be_stored:
             #bits.append('quantities["%s"].get_integral()'%quantity)
-            bits.append('get_quantity("%s")'%quantity)
+            bits.append('get_quantity("%s").get_values()' %quantity)
 
         for bit in bits: