Changeset 7492 for anuga_core/source/anuga/culvert_flows

Timestamp:

Sep 7, 2009, 4:19:23 PM (16 years ago)

Author:

steve

Message:

Changed the order of update_timestep and compute_forcing_terms.
Can now update the parameter domain.flux_timestep within
the computation of the forcing terms, so as to control stability of
the evolver.

Hopefully this will help in reducing the oscillations seen within the
culvert computation.

File:

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

anuga_core/source/anuga/culvert_flows/test_culvert_class.py

@@ -238 +238 @@
             
             msg = 'Total volume has changed'
-            assert num.allclose(new_volume, ref_volume), msg
+            assert num.allclose(new_volume, ref_volume, rtol=1.0e-10), msg
             pass
     
@@ -338 +338 @@
         for t in domain.evolve(yieldstep = 0.1, finaltime = 25):
             new_volume = domain.get_quantity('stage').get_integral()
-            
-            msg = ('Total volume has changed: Is %.2f m^3 should have been %.2f m^3'
+
+
+            msg = ('Total volume has changed: Is %.8f m^3 should have been %.8f m^3'
                    % (new_volume, ref_volume))
-            assert num.allclose(new_volume, ref_volume), msg        
-        
-        
-        
+            assert num.allclose(new_volume, ref_volume, rtol=1.0e-10), msg        
+        
+        
+        return
         # Now try this for a range of other depths
         for depth in [1.0, 0.5, 0.2, 0.1, 0.05]:
@@ -360 +361 @@
                     % (new_volume, ref_volume)
 
-                assert num.allclose(new_volume, ref_volume), msg
+                assert num.allclose(new_volume, ref_volume, rtol=1.0e-10), msg
     
     
@@ -467 +468 @@
 
             msg = 'Total volume has changed'
-            assert num.allclose(new_volume, ref_volume), msg
+            assert num.allclose(new_volume, ref_volume, rtol=1.0e-10), msg
             pass