Changeset 1753 for inundation/pyvolution/test_shallow_water.py

Timestamp:

Aug 24, 2005, 1:49:47 PM (19 years ago)

Author:

ole

Message:

Embedded caching functionality within quantity.set_values and modified validation example lwru2.py to illustrate the advantages that can be gained from supervised caching.

File:

• inundation/pyvolution/test_shallow_water.py (modified) (7 diffs)

inundation/pyvolution/test_shallow_water.py

@@ -1238 +1238 @@
         val3 = 2.
 
-        domain.set_quantity('stage', [val0, val1, val2, val3], 'centroids')
+        domain.set_quantity('stage', [val0, val1, val2, val3],
+                            location='centroids')
         L = domain.quantities['stage'].vertex_values
 
@@ -1274 +1275 @@
             return x**2
 
-        domain.set_quantity('stage', stage, 'centroids')
+        domain.set_quantity('stage', stage, location='centroids')
 
         a, b = domain.quantities['stage'].compute_gradients()
@@ -1311 +1312 @@
             return x**4+y**2
 
-        domain.set_quantity('stage', stage, 'centroids')
+        domain.set_quantity('stage', stage, location='centroids')
         #print domain.quantities['stage'].centroid_values
 
@@ -1355 +1356 @@
 
         domain.set_quantity('elevation', slope)
-        domain.set_quantity('stage', stage, 'centroids')
+        domain.set_quantity('stage', stage, location='centroids')
 
         #print domain.quantities['elevation'].centroid_values
@@ -1443 +1444 @@
         domain.set_quantity('elevation', slope)
         domain.set_quantity('stage',
-                            [0.01298164, 0.00365611, 0.01440365, -0.0381856437096],
-                            'centroids')
+                            [0.01298164, 0.00365611,
+                             0.01440365, -0.0381856437096],
+                            location='centroids')
         domain.set_quantity('xmomentum',
-                            [0.00670439, 0.01263789, 0.00647805, 0.0178180740668],
-                            'centroids')
+                            [0.00670439, 0.01263789,
+                             0.00647805, 0.0178180740668],
+                            location='centroids')
         domain.set_quantity('ymomentum',
-                            [-7.23510980e-004, -6.30413883e-005, 6.30413883e-005, 0.000200907255866],
-                            'centroids')
+                            [-7.23510980e-004, -6.30413883e-005,
+                             6.30413883e-005, 0.000200907255866],
+                            location='centroids')
 
         E = domain.quantities['elevation'].vertex_values
@@ -1466 +1470 @@
         #print Y[1,:]
 
-        assert allclose(L[1,:], [-0.00825735775384, -0.00801881482869, 0.0272445025825])
-        assert allclose(X[1,:], [0.0143507718962, 0.0142502147066, 0.00931268339717])
-        assert allclose(Y[1,:], [-0.000117062180693, 7.94434448109e-005, -0.000151505429018])
+        assert allclose(L[1,:], [-0.00825735775384,
+                                 -0.00801881482869,
+                                 0.0272445025825])
+        assert allclose(X[1,:], [0.0143507718962,
+                                 0.0142502147066,
+                                 0.00931268339717])
+        assert allclose(Y[1,:], [-0.000117062180693,
+                                 7.94434448109e-005,
+                                 -0.000151505429018])
 
 
@@ -2211 +2221 @@
 
 
-                domain.set_quantity('stage', L, 'centroids')
-                domain.set_quantity('xmomentum', X, 'centroids')
-                domain.set_quantity('ymomentum', Y, 'centroids')
+                domain.set_quantity('stage', L, location='centroids')
+                domain.set_quantity('xmomentum', X, location='centroids')
+                domain.set_quantity('ymomentum', Y, location='centroids')
 
                 domain.check_integrity()