Changeset 558

Timestamp:

Nov 16, 2004, 3:04:04 PM (20 years ago)

Author:

ole

Message:

Added linear friction to Sampson examples

Location:

inundation/ga/storm_surge

Files:

• analytical solutions/Analytical_solution_Samnpson_import_mesh.py (deleted)
• analytical solutions/Analytical_solution_Sampson_import_mesh.py (modified) (3 diffs)
• pyvolution/shallow_water.py (modified) (2 diffs)

inundation/ga/storm_surge/analytical solutions/Analytical_solution_Sampson_import_mesh.py

@@ -26 +26 @@
 from math import sqrt, cos, sin, pi, exp
 from mesh_factory import strang_mesh
+from quantity import Quantity
 
 
@@ -39 +40 @@
 domain.default_order = 2
 domain.smooth = True
+
+domain.quantities['linear_friction'] = Quantity(domain)
+domain.set_quantity('friction', 0.0)
+#del domain.quantities['friction']
+
 
 # Provide file name for storing output
@@ -79 +85 @@
 
 domain.set_quantity('elevation', x_slope)
+domain.set_quantity('linear_friction', tau)
+
 
 #Set the water level

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -877 +877 @@
     uh = domain.quantities['xmomentum'].centroid_values
     vh = domain.quantities['ymomentum'].centroid_values
-    eta = domain.quantities['linear_friction'].centroid_values    
+    tau = domain.quantities['linear_friction'].centroid_values    
     
     xmom_update = domain.quantities['xmomentum'].semi_implicit_update
@@ -886 +886 @@
     
     for k in range(N):
-        if eta[k] >= eps:
+        if tau[k] >= eps:
             if h[k] >= eps:
-                S = -eta[k]/h[k]
+                S = -tau[k]/h[k]
 
                 #Update momentum