Changeset 3678 for anuga_core/source/anuga/shallow_water/shallow_water_domain.py

Timestamp:

Oct 1, 2006, 6:55:46 PM (18 years ago)

Author:

steve

Message:

Added more limiting to cells near dry cells, use beta_*_dry

File:

• anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (7 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -127 +127 @@
 
 
-        from anuga.config import minimum_allowed_height, maximum_allowed_speed, g
+        from anuga.config import *
         self.minimum_allowed_height = minimum_allowed_height
         self.maximum_allowed_speed = maximum_allowed_speed
         self.g = g
+        self.beta_w      = beta_w
+        self.beta_w_dry  = beta_w_dry
+        self.beta_uh     = beta_uh
+        self.beta_uh_dry = beta_uh_dry
+        self.beta_vh     = beta_vh
+        self.beta_vh_dry = beta_vh_dry
+        self.beta_h      = beta_h
 
 
@@ -150 +157 @@
         self.minimum_storable_height = minimum_storable_height
         self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
+                
 
 
@@ -301 +309 @@
 
         msg = 'Parameter beta_h must be in the interval [0, 1['
-        assert 0 <= self.beta_h < 1.0, msg
+        assert 0 <= self.beta_h <= 1.0, msg
         msg = 'Parameter beta_w must be in the interval [0, 1['
-        assert 0 <= self.beta_w < 1.0, msg
+        assert 0 <= self.beta_w <= 1.0, msg
 
 
@@ -612 +620 @@
     Xmom = domain.quantities['xmomentum']
     Ymom = domain.quantities['ymomentum']
+    Elevation = domain.quantities['elevation']
     from shallow_water_ext import extrapolate_second_order_sw
-    extrapolate_second_order_sw(domain,domain.surrogate_neighbours,
+    extrapolate_second_order_sw(domain,
+                                domain.surrogate_neighbours,
                                 domain.number_of_boundaries,
                                 domain.centroid_coordinates,
@@ -619 +629 @@
                                 Xmom.centroid_values,
                                 Ymom.centroid_values,
+                                Elevation.centroid_values,
                                 domain.vertex_coordinates,
                                 Stage.vertex_values,
                                 Xmom.vertex_values,
-                                Ymom.vertex_values)
+                                Ymom.vertex_values,
+                                Elevation.vertex_values)
 
 def compute_fluxes_c(domain):
@@ -699 +711 @@
         #all of the conserved quantitie
 
-        if (domain.order == 1):
+        if (domain._order_ == 1):
             for name in domain.conserved_quantities:
                 Q = domain.quantities[name]
                 Q.extrapolate_first_order()
-        elif domain.order == 2:
+        elif domain._order_ == 2:
             domain.extrapolate_second_order_sw()
         else:
@@ -711 +723 @@
         for name in domain.conserved_quantities:
             Q = domain.quantities[name]
-            if domain.order == 1:
+            if domain._order_ == 1:
                 Q.extrapolate_first_order()
-            elif domain.order == 2:
+            elif domain._order_ == 2:
                 Q.extrapolate_second_order()
                 Q.limit()