Changeset 476 for inundation/ga/storm_surge/pyvolution/test_quantity.py

Timestamp:

Nov 1, 2004, 3:49:47 PM (20 years ago)

Author:

ole

Message:

Reimplemented unit tests for semi implicit updates and fixed comments.

File:

• inundation/ga/storm_surge/pyvolution/test_quantity.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -7 +7 @@
 from quantity import *
 from config import epsilon
-from Numeric import allclose, array
+from Numeric import allclose, array, ones, Float
 
         
@@ -412 +412 @@
         assert allclose( quantity.centroid_values, x)
 
-    #FIXME: Update these tests once I understand the semi_implicit scheme    
-#     def test_update_semi_implicit(self):
-#         quantity = Conserved_quantity(self.mesh4)
-
-#         #Test centroids
-#         quantity.set_values([1.,2.,3.,4.], location = 'centroids')
-#         assert allclose(quantity.centroid_values, [1, 2, 3, 4]) #Centroid
-
-#         #Set semi implicit update
-#         quantity.semi_implicit_update = array( [1.,1.,1.,1.] )
-
-#         #Update with given timestep
-#         quantity.update(0.1)
-
-#         x = array([1, 2, 3, 4])/array( [.9,.9,.9,.9] )
-#         assert allclose( quantity.centroid_values, x)
-
-#     def test_both_updates(self):
-#         quantity = Conserved_quantity(self.mesh4)
-
-#         #Test centroids
-#         quantity.set_values([1.,2.,3.,4.], location = 'centroids')
-#         assert allclose(quantity.centroid_values, [1, 2, 3, 4]) #Centroid
-
-#         #Set explicit_update
-#         quantity.explicit_update = array( [4.,3.,2.,1.] )
-        
-#         #Set semi implicit update
-#         quantity.semi_implicit_update = array( [1.,1.,1.,1.] )
-
-#         #Update with given timestep
-#         quantity.update(0.1)
-
-#         x = array([1, 2, 3, 4]) + array( [.4,.3,.2,.1] )
-#         x /= array( [.9,.9,.9,.9] )
-#         assert allclose( quantity.centroid_values, x)        
+    def test_update_semi_implicit(self):
+        quantity = Conserved_quantity(self.mesh4)
+
+        #Test centroids
+        quantity.set_values([1.,2.,3.,4.], location = 'centroids')
+        assert allclose(quantity.centroid_values, [1, 2, 3, 4]) #Centroid
+
+        #Set semi implicit update
+        quantity.semi_implicit_update = array([1.,1.,1.,1.])
+
+        #Update with given timestep
+        timestep = 0.1
+        quantity.update(timestep)
+
+        sem = array([1.,1.,1.,1.])/array([1, 2, 3, 4])
+        denom = ones(4, Float)-timestep*sem
+        
+        x = array([1, 2, 3, 4])/denom
+        assert allclose( quantity.centroid_values, x)
+
+
+    def test_both_updates(self):
+        quantity = Conserved_quantity(self.mesh4)
+
+        #Test centroids
+        quantity.set_values([1.,2.,3.,4.], location = 'centroids')
+        assert allclose(quantity.centroid_values, [1, 2, 3, 4]) #Centroid
+
+        #Set explicit_update
+        quantity.explicit_update = array( [4.,3.,2.,1.] )
+       
+        #Set semi implicit update
+        quantity.semi_implicit_update = array( [1.,1.,1.,1.] )
+
+        #Update with given timestep
+        timestep = 0.1        
+        quantity.update(0.1)
+
+        sem = array([1.,1.,1.,1.])/array([1, 2, 3, 4])
+        denom = ones(4, Float)-timestep*sem
+
+        x = array([1, 2, 3, 4]) + array( [.4,.3,.2,.1] )
+        x /= denom
+        assert allclose( quantity.centroid_values, x)