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

Timestamp:

Sep 1, 2004, 6:31:42 PM (20 years ago)

Author:

ole

Message:

 

File:

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

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -474 +474 @@
 
 def balance_deep_and_shallow(domain):
-    """Compute linear combination between stage as computed by gradient-limiters and
-    stage computed as constant height above bed.
-    The former takes precedence when heights are large compared to the bed slope while the latter
-    takes precedence when heights are relatively small.
-    Anything in between is computed as a balanced linear combination in order to avoid numerical
-    disturbances which would otherwise appear as a result of hard switching between modes.
+    """Compute linear combination between stage as computed by
+    gradient-limiters and stage computed as constant height above bed.
+    The former takes precedence when heights are large compared to the
+    bed slope while the latter takes precedence when heights are
+    relatively small.  Anything in between is computed as a balanced
+    linear combination in order to avoid numerical disturbances which
+    would otherwise appear as a result of hard switching between
+    modes.
     """
     
@@ -553 +555 @@
             ymomv[k,:] = (1-alpha)*ymomc[k] + alpha*ymomv[k,:];                     
             
+
+def balance_deep_and_shallow_c(domain):
+    """Wrapper for C implementation
+    """
+    
+    #Shortcuts
+    wc = domain.quantities['level'].centroid_values
+    zc = domain.quantities['elevation'].centroid_values
+    hc = wc - zc
+    
+    wv = domain.quantities['level'].vertex_values
+    zv = domain.quantities['elevation'].vertex_values
+    hv = wv-zv
+
+    #Momentums at centroids
+    xmomc = domain.quantities['xmomentum'].centroid_values
+    ymomc = domain.quantities['ymomentum'].centroid_values        
+
+    #Momentums at vertices
+    xmomv = domain.quantities['xmomentum'].vertex_values
+    ymomv = domain.quantities['ymomentum'].vertex_values         
+
+    
+
+    from shallow_water_ext import balance_deep_and_shallow
+    balance_deep_and_shallow(domain.number_of_elements,
+                             wc, zc, wv, zv, hv,
+                             xmomc, ymomc, xmomv, ymomv)
+
     
 
@@ -954 +985 @@
     gravity = gravity_c
     manning_friction = manning_friction_c
-    
+    #balance_deep_and_shallow = balance_deep_and_shallow_c 
     
     #distribute_to_vertices_and_edges = distribute_to_vertices_and_edges_c