Changeset 6659

Timestamp:

Mar 31, 2009, 4:52:19 AM (16 years ago)

Author:

ole

Message:

Extended simulation time in flowtests. Computed flows are now within the 1% relative error but the calculated Manning depths are still not in good agreement with actual depth - especially for large values of Manning's n.

File:

• anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py (modified) (10 diffs)

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -6895 +6895 @@
         """
 
+        # FIXME(Ole): Move this and the following test to validate_all.py as they are
+        # rather time consuming
+        
         verbose = True
         
@@ -6914 +6917 @@
         #------------------------------------------------------------------------------
         number_of_inflows = 2 # Number of inflows on top of each other
-        finaltime = 300.0
+        finaltime = 1000.0 #6000.0
 
         length = 300.
         width  = 20.
-        dx = dy = 2          # Resolution: of grid on both axes
+        dx = dy = 5          # Resolution: of grid on both axes
 
         points, vertices, boundary = rectangular_cross(int(length/dx), int(width/dy),
                                                        len1=length, len2=width)
 
-        for mannings_n in [0.0, 0.012, 0.035, 0.070, 0.150]:
+        for mannings_n in [0.150, 0.07, 0.035]: #[0.012, 0.035, 0.070, 0.150]:
             for slope in [1.0/300, 1.0/150, 1.0/75]:
                 # Loop over a range of bedslopes representing sub to super critical flows 
@@ -6979 +6982 @@
 
                 for t in domain.evolve(yieldstep=100.0, finaltime=finaltime):
-                    if verbose :
-                        print domain.timestepping_statistics()
+                    pass
+                    #if verbose :
+                    #    print domain.timestepping_statistics()
+
+                if verbose:
+                    print domain.volumetric_balance_statistics()                                                            
+
 
 
@@ -6992 +7000 @@
                 if verbose:
                     print '90 degree flowline: ANUGA = %f, Ref = %f' % (q, ref_flow)
-                #assert num.allclose(q, ref_flow, rtol=1.0e-2), msg         
+                assert num.allclose(q, ref_flow, rtol=1.0e-2), msg         
 
                            
@@ -7001 +7009 @@
                     print '45 degree flowline: ANUGA = %f, Ref = %f' % (q, ref_flow)
                     
-                #assert num.allclose(q, ref_flow, rtol=1.0e-2), msg         
+                assert num.allclose(q, ref_flow, rtol=1.0e-2), msg         
 
                 # Stage recorder (gauge) in middle of plane at 200m
@@ -7016 +7024 @@
                 msg = 'Predicted depth of flow was %f, should have been %f' % (domain_depth, normal_depth)                
                 if verbose:
-                    print 'Depth: ANUGA = %f, Mannings = %f' % (domain_depth, normal_depth)
-
+                    diff = abs(domain_depth-normal_depth)
+                    print 'Depth: ANUGA = %f, Mannings = %f, E=%f' % (domain_depth, 
+                                                                      normal_depth,
+                                                                      diff/domain_depth)
+                    
+                    assert diff < 0.1
+                    
                 if slope >= 1.0/100:
                     # Really super critical flow is not as stable.
@@ -7054 +7067 @@
         # Setup computational domain
         #------------------------------------------------------------------------------
-        finaltime = 300.0
+        finaltime = 1000.0
 
         length = 300.
@@ -7070 +7083 @@
                                                        len1=length, len2=width)
 
-        for mannings_n in [0.0, 0.012, 0.035]:
-            for slope in [0.0, 1.0/300, 1.0/150]:
+        for mannings_n in [0.035]: #[0.0, 0.012, 0.035]:
+            for slope in [1.0/300]: #[0.0, 1.0/300, 1.0/150]:
                 # Loop over a range of bedslopes representing sub to super critical flows 
 
@@ -7130 +7143 @@
                         print domain.volumetric_balance_statistics()                        
                                     
+                                    
+                    
                 # 90 degree flowline at 200m                                    
                 q=domain.get_flow_through_cross_section([[200.0,0.0],[200.0,20.0]])
@@ -7168 +7183 @@
                                 
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Shallow_Water, 'test_friction_dependent_flow_using_flowline')
-    #suite = unittest.makeSuite(Test_Shallow_Water, 'test_volumetric_balance_computation') 
+    #suite = unittest.makeSuite(Test_Shallow_Water, 'test_friction_dependent_flow_using_flowline')
+    suite = unittest.makeSuite(Test_Shallow_Water, 'test_inflow') 
     #suite = unittest.makeSuite(Test_Shallow_Water, 'test_total_volume')            
     #suite = unittest.makeSuite(Test_Shallow_Water, 'test')