Changeset 212 for inundation/ga/storm_surge/pyvolution/shallow_water.py

Timestamp:

Aug 24, 2004, 4:11:25 PM (21 years ago)

Author:

ole

Message:

Testing

File:

• inundation/ga/storm_surge/pyvolution/shallow_water.py (modified) (9 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -33 +33 @@
         self.minimum_allowed_height = minimum_allowed_height
 
-        
+        self.forcing_terms.append(gravity)
+        self.forcing_terms.append(manning_friction)
 
 
@@ -280 +281 @@
         raise 'Unknown order'
 
+    #Compute edge values
+    for name in domain.conserved_quantities:
+        Q = domain.quantities[name]
+        Q.interpolate_from_vertices_to_edges()            
+
+
 def protect_against_infinitesimal_heights_centroid(domain):
     """Adjust height and momentum at centroid if height is less than
@@ -333 +340 @@
         Q = domain.quantities[name]
         Q.extrapolate_first_order()
-        Q.interpolate_from_vertices_to_edges()        
+
      
   
@@ -419 +426 @@
     """
     
-    #FIXME: first and second order migh merge
-
-    from Numeric import minimum, maximum
-    
+    #FIXME: first and second order might merge
+
     #Update conserved quantities using straight second order
     for name in domain.conserved_quantities:
         Q = domain.quantities[name]
-
         Q.extrapolate_second_order()
-        Q.limiter()
-        Q.interpolate_from_vertices_to_edges()                
+        Q.limit()
 
   
@@ -469 +472 @@
 
 
-        hmin = minimum( hv[k, :] )
+        hmin = min( hv[k, :] )
 
         #Create alpha in [0,1], where alpha==0 means using shallow 
@@ -500 +503 @@
         # from extrapolator xmomv and ymomv (deep).
         
-
-        ##f##or i in range(3):
-        #####    xmomv[k,i] = (1-alpha)*xmomc[k] + alpha*xmomv[k,i];
-            
         xmomv[k,:] = (1-alpha)*xmomc[k] + alpha*xmomv[k,:];            
             
@@ -512 +511 @@
     hc = wc-zc    
     for k in range(domain.number_of_elements):
-        hmax = maximum(hv[k,:])
-        
-        if hmax < minimum_allowed_height:        
+        hmax = max(hv[k,:])
+        
+        if hmax < domain.minimum_allowed_height:        
             #Reset negative heights to bed elevation        
             if hc[k] < 0.0:
                 wc[k] = zc[k]
-                ###hc[k] = 0.0
             for i in range(3):    
                 if hv[k,i] < 0.0:
                     wv[k,i] = zv[k,i]
-                    ##hv0 = 0.0;}         
 
     
@@ -569 +566 @@
 #########################
 #Standard forcing terms:
-
+#
 def gravity(domain):
     """Implement forcing function for bed slope working with
@@ -629 +626 @@
             
 
+###########################
+class Constant_height:
+    """Set an initial condition with constant water height, e.g
+    stage s = z+h
+    """
+
+    #FIXME: Rethink this way of creating values.
+
+    def __init__(self, W, h):
+        self.W = W
+        self.h = h
+
+    def __call__(self, x, y):
+        if self.W is None:
+            from Numeric import ones, Float
+            return self.h*ones(len(x), Float)
+        else:
+            return self.W(x,y) + self.h
+
+
+
 ##############################################
 #Initialise module