Changeset 6144

Timestamp:

Jan 13, 2009, 11:21:22 AM (16 years ago)

Author:

ole

Message:

A bit more testing of volumetric checking in culvert.

File:

• anuga_core/source/anuga/culvert_flows/test_culvert_class.py (modified) (11 diffs)

anuga_core/source/anuga/culvert_flows/test_culvert_class.py

@@ -72 +72 @@
                # Sloping Embankment Across Channel
                 if 5.0 < x[i] < 10.1:
-                    # Cut Out Segment for Culvert FACE                
+                    # Cut Out Segment for Culvert face                
                     if  1.0+(x[i]-5.0)/5.0 <  y[i]  < 4.0 - (x[i]-5.0)/5.0: 
                        z[i]=z[i]
@@ -80 +80 @@
                    z[i] +=  2.5                    # Flat Crest of Embankment
                 if 12.0 < x[i] < 14.5:
-                    # Cut Out Segment for Culvert FACE                
+                    # Cut Out Segment for Culvert face                
                     if  2.0-(x[i]-12.0)/2.5 <  y[i]  < 3.0 + (x[i]-12.0)/2.5:
                        z[i]=z[i]
@@ -186 +186 @@
                # Sloping Embankment Across Channel
                 if 5.0 < x[i] < 10.1:
-                    # Cut Out Segment for Culvert FACE                
+                    # Cut Out Segment for Culvert face                
                     if  1.0+(x[i]-5.0)/5.0 <  y[i]  < 4.0 - (x[i]-5.0)/5.0: 
                        z[i]=z[i]
@@ -194 +194 @@
                    z[i] +=  2.5                    # Flat Crest of Embankment
                 if 12.0 < x[i] < 14.5:
-                    # Cut Out Segment for Culvert FACE                
+                    # Cut Out Segment for Culvert face                
                     if  2.0-(x[i]-12.0)/2.5 <  y[i]  < 3.0 + (x[i]-12.0)/2.5:
                        z[i]=z[i]
@@ -287 +287 @@
                # Sloping Embankment Across Channel
                 if 5.0 < x[i] < 10.1:
-                    # Cut Out Segment for Culvert FACE                
+                    # Cut Out Segment for Culvert face                
                     if  1.0+(x[i]-5.0)/5.0 <  y[i]  < 4.0 - (x[i]-5.0)/5.0: 
                        z[i]=z[i]
@@ -295 +295 @@
                    z[i] +=  2.5                    # Flat Crest of Embankment
                 if 12.0 < x[i] < 14.5:
-                    # Cut Out Segment for Culvert FACE                
+                    # Cut Out Segment for Culvert face                
                     if  2.0-(x[i]-12.0)/2.5 <  y[i]  < 3.0 + (x[i]-12.0)/2.5:
                        z[i]=z[i]
@@ -308 +308 @@
         domain.set_quantity('friction', 0.01)         # Constant friction 
         domain.set_quantity('stage',
-                            expression='elevation + 0.2') # Shallow initial condition
+                            expression='elevation + 0.1') # Shallow initial condition
                             
-        # NOTE: Shallow values may cause this test to fail regardless of the
-        # culvert due to initial adjustments. A good value is 0.2
-
 
         filename = os.path.join(path, 'example_rating_curve.csv')
@@ -335 +332 @@
 
 
+        
         #-----------------------------------------------------------------------
         # Evolve system through time
@@ -348 +346 @@
             if not allclose(new_volume, ref_volume):
                 print msg
-            assert allclose(new_volume, ref_volume), msg
+            assert allclose(new_volume, ref_volume), msg        
+        
+        
+        
+        # Now try this for a range of other depths
+        for depth in [1.0, 0.5, 0.2, 0.1, 0.05]:
+            domain.set_time(0.0)
+            
+            domain.set_quantity('stage',
+                                expression='elevation + %f' % depth)
+            
+        
+            ref_volume = domain.get_quantity('stage').get_integral()
+            for t in domain.evolve(yieldstep = 0.1, finaltime = 25):
+                #print domain.timestepping_statistics()
+                new_volume = domain.get_quantity('stage').get_integral()
+            
+                #print new_volume, ref_volume, new_volume-ref_volume
+                msg = 'Total volume has changed: Is %.2f m^3 should have been %.2f m^3'\
+                    % (new_volume, ref_volume)
+
+                assert allclose(new_volume, ref_volume), msg
     
     
@@ -394 +413 @@
                # Sloping Embankment Across Channel
                 if 5.0 < x[i] < 10.1:
-                    # Cut Out Segment for Culvert FACE                
+                    # Cut Out Segment for Culvert face                
                     if  1.0+(x[i]-5.0)/5.0 <  y[i]  < 4.0 - (x[i]-5.0)/5.0: 
                        z[i]=z[i]
@@ -402 +421 @@
                    z[i] +=  2.5                    # Flat Crest of Embankment
                 if 12.0 < x[i] < 14.5:
-                    # Cut Out Segment for Culvert FACE                
+                    # Cut Out Segment for Culvert face                
                     if  2.0-(x[i]-12.0)/2.5 <  y[i]  < 3.0 + (x[i]-12.0)/2.5:
                        z[i]=z[i]