Changeset 7492 for anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

Timestamp:

Sep 7, 2009, 4:19:23 PM (15 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/shallow_water/test_shallow_water_domain.py (modified) (8 diffs)

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -4097 +4097 @@
 
         # Data from earlier version of abstract_2d_finite_volumes
-        assert num.allclose(domain.min_timestep, 0.0396825396825)
-        assert num.allclose(domain.max_timestep, 0.0396825396825)
+        assert num.allclose(domain.recorded_min_timestep, 0.0396825396825)
+        assert num.allclose(domain.recorded_max_timestep, 0.0396825396825)
 
         msg = ("domain.quantities['stage'].centroid_values[:12]=%s"
@@ -4163 +4163 @@
 
         # Data from earlier version of abstract_2d_finite_volumes
-        #assert allclose(domain.min_timestep, 0.0396825396825)
-        #assert allclose(domain.max_timestep, 0.0396825396825)
+        #assert allclose(domain.recorded_min_timestep, 0.0396825396825)
+        #assert allclose(domain.recorded_max_timestep, 0.0396825396825)
         #print domain.quantities['stage'].centroid_values
 
@@ -4194 +4194 @@
 
         # FIXME: These numbers were from version before 25/10
-        #assert allclose(domain.min_timestep, 0.0140413643926)
-        #assert allclose(domain.max_timestep, 0.0140947355753)
+        #assert allclose(domain.recorded_min_timestep, 0.0140413643926)
+        #assert allclose(domain.recorded_max_timestep, 0.0140947355753)
 
         for i in range(3):
@@ -4241 +4241 @@
             pass
 
-        msg = 'min step was %f instead of %f' % (domain.min_timestep,
+        msg = 'min step was %f instead of %f' % (domain.recorded_min_timestep,
                                                  0.0210448446782)
 
-        assert num.allclose(domain.min_timestep, 0.0210448446782), msg
-        assert num.allclose(domain.max_timestep, 0.0210448446782)
+        assert num.allclose(domain.recorded_min_timestep, 0.0210448446782), msg
+        assert num.allclose(domain.recorded_max_timestep, 0.0210448446782)
 
         #FIXME: These numbers were from version before 25/10
@@ -4295 +4295 @@
             pass
 
-        assert num.allclose(domain.min_timestep, 0.0210448446782)
-        assert num.allclose(domain.max_timestep, 0.0210448446782)
+        assert num.allclose(domain.recorded_min_timestep, 0.0210448446782)
+        assert num.allclose(domain.recorded_max_timestep, 0.0210448446782)
 
         #FIXME: These numbers were from version before 21/3/6 -
@@ -4390 +4390 @@
                 for t in domain.evolve(yieldstep=0.01, finaltime=0.03):
                     pass
-                assert num.allclose(domain.min_timestep, 0.0210448446782)
-                assert num.allclose(domain.max_timestep, 0.0210448446782)
+                assert num.allclose(domain.recorded_min_timestep, 0.0210448446782)
+                assert num.allclose(domain.recorded_max_timestep, 0.0210448446782)
 
             #print domain.quantities['stage'].centroid_values[:4]
@@ -4470 +4470 @@
         # FIXME (Ole): Need some other assertion here!
         #print domain.min_timestep, domain.max_timestep
-        #assert allclose(domain.min_timestep, 0.050010003001)
-        #assert allclose(domain.max_timestep, 0.050010003001)
+        #assert allclose(domain.recorded_min_timestep, 0.050010003001)
+        #assert allclose(domain.recorded_max_timestep, 0.050010003001)
 
         os.remove(domain.get_name() + '.sww')
@@ -4693 +4693 @@
 
         # Data from earlier version of abstract_2d_finite_volumes ft=0.1
-        assert num.allclose(domain.min_timestep, 0.0376895634803)
-        assert num.allclose(domain.max_timestep, 0.0415635655309)
+        assert num.allclose(domain.recorded_min_timestep, 0.0376895634803)
+        assert num.allclose(domain.recorded_max_timestep, 0.0415635655309)
 
         assert num.allclose(domain.quantities['stage'].centroid_values,