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

Timestamp:

Sep 6, 2004, 11:43:36 AM (20 years ago)

Author:

ole

Message:

Implemented protect in c and noted improvement.
Pyvolution is now faster than the previous version.

File:

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

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -426 +426 @@
             #Control momentum
             xmomc[k] = ymomc[k] = 0.0
+            
+
+
+def protect_against_infintesimal_and_negative_heights_c(domain):
+    """Protect against infinitesimal heights and associated high velocities
+    """
+    
+    #Shortcuts
+    wc = domain.quantities['level'].centroid_values
+    zc = domain.quantities['elevation'].centroid_values
+    xmomc = domain.quantities['xmomentum'].centroid_values
+    ymomc = domain.quantities['ymomentum'].centroid_values            
+
+    from shallow_water_ext import protect
+
+    protect(domain.minimum_allowed_height, wc, zc, xmomc, ymomc)
+    
+
 
 def extrapolate_first_order(domain):
@@ -954 +972 @@
     gravity = gravity_c
     manning_friction = manning_friction_c
-    balance_deep_and_shallow = balance_deep_and_shallow_c 
+    balance_deep_and_shallow = balance_deep_and_shallow_c
+    protect_against_infintesimal_and_negative_heights = protect_against_infintesimal_and_negative_heights_c
     
     #distribute_to_vertices_and_edges = distribute_to_vertices_and_edges_c