Changeset 3789

Timestamp:

Oct 16, 2006, 2:25:22 PM (18 years ago)

Author:

ole

Message:

Added set_maxmum_allowed_speed to zero to simulate behaviour of ANUGA as it was in August 2005. This provides the exact same look and feel as was the case when we first did the Okushiri validation.

Files:

• anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (1 diff)
• anuga_core/source/anuga/shallow_water/shallow_water_ext.c (modified) (1 diff)
• anuga_validation/okushiri_2005/run_okushiri.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -189 +189 @@
         """
         self.minimum_storable_height = minimum_storable_height
-
+        
+
+    def set_maximum_allowed_speed(self, maximum_allowed_speed):
+        """
+        Set the maximum particle speed that is allowed in water
+        shallower than minimum_allowed_height. This is useful for
+        controlling speeds in very thin layers of water and at the same time
+        allow some movement avoiding pooling of water.
+
+        """
+        self.maximum_allowed_speed = maximum_allowed_speed
 
 

anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -535 +535 @@
       //FIXME (Ole): This is only implemented in this C extension and
       //             has no Python equivalent
+            
       if (hc <= 0.0) {
         wc[k] = zc[k];
-                xmomc[k] = 0.0;
-                ymomc[k] = 0.0;
+        xmomc[k] = 0.0;
+        ymomc[k] = 0.0;
       } else {
         //Reduce excessive speeds derived from division by small hc
         
         u = xmomc[k]/hc;
-                if (fabs(u) > maximum_allowed_speed) {
-                        reduced_speed = maximum_allowed_speed * u/fabs(u);
-                        //printf("Speed (u) has been reduced from %.3f to %.3f\n",
-                        //       u, reduced_speed);
-                        xmomc[k] = reduced_speed * hc;
-                }
+        if (fabs(u) > maximum_allowed_speed) {
+          reduced_speed = maximum_allowed_speed * u/fabs(u);
+          //printf("Speed (u) has been reduced from %.3f to %.3f\n",
+          //     u, reduced_speed);
+          xmomc[k] = reduced_speed * hc;
+        }
 
         v = ymomc[k]/hc;
-                if (fabs(v) > maximum_allowed_speed) {
-                        reduced_speed = maximum_allowed_speed * v/fabs(v);
-                        //printf("Speed (v) has been reduced from %.3f to %.3f\n",
-                        //       v, reduced_speed);
-                        ymomc[k] = reduced_speed * hc;
-                }
+        if (fabs(v) > maximum_allowed_speed) {
+          reduced_speed = maximum_allowed_speed * v/fabs(v);
+          //printf("Speed (v) has been reduced from %.3f to %.3f\n",
+          //     v, reduced_speed);
+          ymomc[k] = reduced_speed * hc;
+        }
       }
     }

anuga_validation/okushiri_2005/run_okushiri.py

@@ -39 +39 @@
     domain = Domain(points, vertices, boundary)
 
-domain.set_name('okushiri_as2005')
+domain.set_name('okushiri_as2005_with_mxspd=0')
 domain.set_default_order(2)
 domain.set_minimum_storable_height(0.001)
+domain.set_maximum_allowed_speed(0) # The default in August 2005