Changeset 9305

Timestamp:

Aug 15, 2014, 12:52:46 PM (11 years ago)

Author:

davies

Message:

Adjustment to collect_max_quantities operator

File:

• trunk/anuga_core/source/anuga/operators/collect_max_quantities_operator.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/operators/collect_max_quantities_operator.py

@@ -24 +24 @@
     Maxima are updated every update_frequency timesteps [any integer >=1 is
     ok], after t exceeds collection_start_time.
+   
+    In theory this might save time (??), since computing e.g. velocity/momentum etc in python might be expensive
     
-
-    This can save time, since computing e.g. velocity/momentum etc in python might be expensive
+    Optionally velocities can be zeroed below velocity_zero_height (defaults to minimum_allowed_height if not required) 
     """
 
@@ -33 +34 @@
                  update_frequency=1,
                  collection_start_time=0.,
+                 velocity_zero_height=None,
                  description = None,
                  label = None,
@@ -68 +70 @@
         self.collection_start_time = collection_start_time
 
+        #------------------------------------------
+        # Can (rarely) get high velocities being recorded
+        # (e.g. in 3 cells out of 170000 for a 48 hour simulation,
+        #  which are not persistent -- probably just spikes from nearly dry cells)
+        # Try to remove this by zeroing velocity in very shallow cells
+        #------------------------------------------
+        if velocity_zero_height is not None:
+            self.velocity_zero_height=velocity_zero_height
+        else:
+            self.velocity_zero_height=domain.minimum_allowed_height
+
+
     def __call__(self):
         """
@@ -87 +101 @@
 
                 #velMax=(momNorm/(localDepth+velocity_protection/localDepth))*(localDepth>self.domain.minimum_allowed_height)
-                velMax=(momNorm/localDepth)*(localDepth>self.domain.minimum_allowed_height)
+                velMax=(momNorm/localDepth)*(localDepth>self.velocity_zero_height)
                 self.max_speed = num.maximum(self.max_speed, velMax)