Changeset 4829

Timestamp:

Nov 19, 2007, 5:05:50 PM (17 years ago)

Author:

ole

Message:

Now tracking max_speed between yieldsteps for use with timestepping_statistics

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/domain.py (modified) (6 diffs)
• shallow_water/shallow_water_ext.c (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -8 +8 @@
 """
 
-from Numeric import allclose, argmax
+from Numeric import allclose, argmax, zeros, Float
 from anuga.config import epsilon
 
@@ -230 +230 @@
         # Storage for maximal speeds computed for each triangle by
         # compute_fluxes
-        # This is used for diagnostics only
+        # This is used for diagnostics only (reset at every yieldstep)
         self.max_speed = zeros(N, Float)
 
@@ -726 +726 @@
             msg += 'area = %.4f and radius = %.4f ' %(area, radius)
             msg += 'had the largest computed speed: %.6f m/s ' %(max_speed)
+            msg += 'during last time interval. Quantities below '
+            msg += 'are reported at their present value, and not what '
+            msg += 'they were at the time the maximal speed was attained.'
+            msg += 'To see this, rerun the model with yieldsteps smaller '
+            msg += 'than the smallest internal timestep reported.'
             if max_speed > 0.0:
                 msg += '(timestep=%.6f)\n' %(radius/max_speed)
@@ -1055 +1060 @@
 
 
-
+        N = len(self) # Number of triangles
         self.yieldtime = 0.0 # Track time between 'yields'
 
@@ -1063 +1068 @@
         self.number_of_steps = 0
         self.number_of_first_order_steps = 0
+
 
         # Update ghosts
@@ -1138 +1144 @@
                 self.number_of_steps = 0
                 self.number_of_first_order_steps = 0
-
+                self.max_speed = zeros(N, Float)
 
     def evolve_one_euler_step(self, yieldstep, finaltime):

anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -1886 +1886 @@
     
    
-    // Keep track of maximal speeds
-    max_speed_array[k] = max_speed;    
+    // Keep track of maximal speeds so far
+    if (max_speed > max_speed_array[k]) {
+      max_speed_array[k] = max_speed;
+    }    
     
   } // End triangle k