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

Timestamp:

Nov 9, 2004, 10:41:43 PM (20 years ago)

Author:

ole

Message:

Identified potential optimisation in Manning friction using Taylor expansion

File:

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

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -819 +819 @@
     
     for k in range(N):
-        if h[k] >= eps:
-            S = -g * eta[k]**2 * sqrt((uh[k]**2 + vh[k]**2))
-            S /= h[k]**(7.0/3)
-
-            #Update momentum
-            xmom_update[k] += S*uh[k]
-            ymom_update[k] += S*vh[k]
+        if eta[k] >= eps:
+            if h[k] >= eps:
+                S = -g * eta[k]**2 * sqrt((uh[k]**2 + vh[k]**2))
+                S /= h[k]**(7.0/3)
+
+                #Update momentum
+                xmom_update[k] += S*uh[k]
+                ymom_update[k] += S*vh[k]
             
         
@@ -838 +839 @@
     w = domain.quantities['level'].centroid_values
     z = domain.quantities['elevation'].centroid_values
-    h = w-z
+    
     uh = xmom.centroid_values
     vh = ymom.centroid_values
@@ -851 +852 @@
 
     from shallow_water_ext import manning_friction
-    manning_friction(g, eps, h, uh, vh, eta, xmom_update, ymom_update)
+    manning_friction(g, eps, w, z, uh, vh, eta, xmom_update, ymom_update)