Changeset 513

Timestamp:

Nov 9, 2004, 5:45:49 PM (20 years ago)

Author:

steve

Message:

Quantities Working

Location:

inundation/ga/storm_surge/pyvolution-1d

Files:

• quantity.py (modified) (6 diffs)
• test_quantity.py (modified) (7 diffs)

inundation/ga/storm_surge/pyvolution-1d/quantity.py

@@ -410 +410 @@
     D1 = Domain(points1)
 
-    Q1 = Quantity(D1, vertex_values)
+    Q1 = Conserved_quantity(D1, vertex_values)
 
     print Q1.vertex_values
@@ -419 +419 @@
     Q1.set_values(new_vertex_values)
     
-   
     print Q1.vertex_values
     print Q1.centroid_values
@@ -430 +429 @@
 
     def fun(x):
-
         return x**2
 
@@ -437 +435 @@
     print Q1.vertex_values
     print Q1.centroid_values
+
     Xc = Q1.domain.vertices
     Qc = Q1.vertex_values
@@ -443 +442 @@
 
     Qc[1,0] = 3
+
+    Q1.extrapolate_second_order()
+    Q1.limit()
+    
     from matplotlib.matlab import *
     plot(Xc,Qc)
@@ -448 +451 @@
     show()
 
-
-
-    
-    
-
-    
-
-
-
-
+    
+
+
+
+    
+    
+
+    
+
+
+
+

inundation/ga/storm_surge/pyvolution-1d/test_quantity.py

@@ -97 +97 @@
         assert allclose(quantity.centroid_values, [1., 2., 3., 4., 5.]) #Centroid
 
-        #Test exceptionsdatamining.anu.edu.au/svn/
+        #Test exceptions
         try:
             quantity.set_values([[1,2], [5,5], [0,0], [-6, 3], [-2,4]],
@@ -245 +245 @@
                             location = 'centroids')
         
-
-
         quantity.extrapolate_second_order()
         quantity.limit()
-
 
         #Assert that central triangle is limited by neighbours
@@ -276 +273 @@
         assert quantity.vertex_values[4,1] >= 0.0
         assert quantity.vertex_values[4,1] <= 2.0
-        
-
-        
+
         #Assert that quantities are conserved
         from Numeric import sum
@@ -292 +287 @@
 
         #Create a deliberate overshoot (e.g. from gradient computation)
-        quantity.set_values([[3,0,3], [2,2,6], [5,3,8], [8,3,5]])
-
+        quantity.set_values([[3,4], [5,5], [0,0], [-6, 3], [-2,4]],
+                            location = 'vertices')        
 
         #Limit
@@ -299 +294 @@
 
         #Assert that central triangle is limited by neighbours
-        assert quantity.vertex_values[1,0] >= quantity.vertex_values[0,0]
-        assert quantity.vertex_values[1,0] <= quantity.vertex_values[3,1]
-        
-        assert quantity.vertex_values[1,1] <= quantity.vertex_values[2,1]
-        assert quantity.vertex_values[1,1] >= quantity.vertex_values[0,2]
-        
-        assert quantity.vertex_values[1,2] <= quantity.vertex_values[2,0]
-        assert quantity.vertex_values[1,2] <= quantity.vertex_values[3,1]
-
+        assert quantity.vertex_values[0,1] >= quantity.centroid_values[0]
+        assert quantity.vertex_values[1,0] <= quantity.centroid_values[1]
+        
+        assert quantity.vertex_values[1,1] >= quantity.centroid_values[1]
 
         
@@ -314 +304 @@
         for k in range(quantity.centroid_values.shape[0]):
             assert allclose (quantity.centroid_values[k],
-                             sum(quantity.vertex_values[k,:])/3)
+                             sum(quantity.vertex_values[k,:])/2)
         
 
@@ -396 +386 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(TestCase,'test')
-    runner = unittest.TextTestRunner()
+    runner = unittest.TextTestRunner(verbosity=2)
     runner.run(suite)