Changeset 5587 for anuga_work/development/anuga_1d/shallow_water_domain.py

Timestamp:

Jul 30, 2008, 5:03:47 PM (15 years ago)

Author:

steve

Message:

Added in minimum height

File:

• anuga_work/development/anuga_1d/shallow_water_domain.py (modified) (5 diffs)

anuga_work/development/anuga_1d/shallow_water_domain.py

@@ -59 +59 @@
                                 tagged_elements)
         
-        from config import minimum_allowed_height, g
+        from config import minimum_allowed_height, g, h0
         self.minimum_allowed_height = minimum_allowed_height
         self.g = g
+        self.h0 = h0
 
         #forcing terms not included in 1d domain ?WHy?
@@ -308 +309 @@
     """
 
-    from config import g, epsilon
+    from config import g, epsilon, h0
     from math import sqrt
     from Numeric import array
@@ -333 +334 @@
         h_left = 0.0
     else:
-        u_left  = uh_left/h_left
+        u_left  = uh_left/(h_left +  h0/h_left)
+
+
+    uh_left = u_left*h_left
 
 
@@ -339 +343 @@
     h_right  = w_right-z
     uh_right = q_right[1]
-
 
     if h_right < epsilon:
@@ -345 +348 @@
         h_right = 0.0
     else:
-        u_right  = uh_right/h_right
+        u_right  = uh_right/(h_right + h0/h_right)
+
+    uh_right = u_right*h_right
 
     #vh_left  = q_left[2]