Changeset 4711

Timestamp:

Sep 6, 2007, 4:23:42 PM (17 years ago)

Author:

ole

Message:

Added tolerance for extremum computations

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py (modified) (4 diffs)
• anuga_validation/automated_validation_tests/okushiri_tank_validation/run_okushiri.py (modified) (2 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -860 +860 @@
         """
 
+        # Define a tolerance for extremum computations
+        epsilon = 1.0e-6 # Import 'single_precision' from config
+        
         if self.quantities_to_be_monitored is None:
             return
@@ -868 +871 @@
                self.time > self.monitor_time_interval[1]):
             return
-            
-        
+
         # Update extrema for each specified quantity subject to
         # polygon restriction (via monitor_indices).
@@ -881 +883 @@
             info_block = self.quantities_to_be_monitored[quantity_name]
 
-            # Update maximum (n > None is always True)
+            # Update maximum
+            # (n > None is always True, but we check explicitly because of the epsilon)
             maxval = Q.get_maximum_value(self.monitor_indices)
-            if maxval > info_block['max']:
+            if info_block['max'] is None or\
+                   maxval > info_block['max'] + epsilon:
                 info_block['max'] = maxval
                 maxloc = Q.get_maximum_location()
@@ -890 +894 @@
 
 
-            # Update minimum (n < None is always False)
+            # Update minimum
             minval = Q.get_minimum_value(self.monitor_indices)
             if info_block['min'] is None or\
-                   minval < info_block['min']:
+                   minval < info_block['min'] - epsilon:
                 info_block['min'] = minval                
                 minloc = Q.get_minimum_location()

anuga_validation/automated_validation_tests/okushiri_tank_validation/run_okushiri.py

@@ -56 +56 @@
 domain.set_all_limiters(0.9)              # Max second order scheme (old lim)
 domain.set_minimum_storable_height(0.001) # Don't store w < 0.001m
-domain.set_maximum_allowed_speed(0.1)     # Allow a little runoff (0.1 is OK)
+# domain.set_maximum_allowed_speed(0.1)     # Allow a little runoff (0.1 is OK)
+domain.set_quantities_to_be_monitored('stage')
 
 # New slope limiter and first order h-limiter
@@ -85 +86 @@
 for t in domain.evolve(yieldstep = 0.05, finaltime = 22.5):
     domain.write_time()
+    print domain.quantity_statistics(precision='%.12f')
 
 print 'That took %.2f seconds' %(time.time()-t0)