Changeset 2635

Timestamp:

Mar 30, 2006, 12:53:55 PM (19 years ago)

Author:

ole

Message:

Benfield meeting

Location:

inundation

Files:

• examples/island.py (modified) (5 diffs)
• examples/island_timeseries.py (modified) (2 diffs)
• pyvolution/shallow_water_ext.c (modified) (2 diffs)

inundation/examples/island.py

@@ -16 +16 @@
 # Application specific imports
 from pyvolution.mesh_factory import rectangular
-from pyvolution.shallow_water import Domain, Reflective_boundary
+from pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
 from pmesh.mesh_interface import create_mesh_from_regions
 from utilities.polygon import Polygon_function, read_polygon
 
+from pyvolution.quantity import Quantity
+from Numeric import allclose
 
 #------------------------------------------------------------------------------
@@ -36 +38 @@
                                            'left': [3]},
                           maximum_triangle_area = 25,
-                          filename = 'island.msh',
-                          interior_regions=[ ([[50,25], [70,25],
-                                               [70,75], [50,75]], 3)]
+                          filename = 'island.msh'
+                          , interior_regions=[ ([[50,25], [70,25], [70,75], [50,75]], 1)]
                           )
                           
@@ -71 +72 @@
     for i in range(len(x)):
         z[i] = 8*exp( -((x[i]-50)**2 + (y[i]-50)**2)/100 )
+
+        #z[i] += 0.5*exp( -((x[i]-10)**2 + (y[i]-10)**2)/50 ) 
+    
     return z
 
-domain.set_quantity('friction', 2.0)
+def slump(x, y):
+    z = 0*x
+    for i in range(len(x)):
+        z[i] -= 0.7*exp( -((x[i]-10)**2 + (y[i]-10)**2)/200 ) 
+    
+    return z
+
+domain.set_quantity('friction', 0.0)
 domain.set_quantity('elevation', island)
 domain.set_quantity('stage', 1)
@@ -83 +94 @@
 
 Br = Reflective_boundary(domain)
+Bd = Dirichlet_boundary([1, 0, 0])
 
-domain.set_boundary({'left': Br, 'right': Br, 'top': Br, 'bottom': Br})
+#domain.set_boundary({'left': Br, 'right': Br, 'top': Br, 'bottom': Br})
+domain.set_boundary({'left': Bd, 'right': Bd, 'top': Bd, 'bottom': Bd})
 domain.check_integrity()
 
@@ -93 +106 @@
 
 import time
-for t in domain.evolve(yieldstep = 1, finaltime = 100):
+for t in domain.evolve(yieldstep = 1, finaltime = 500):
     domain.write_time()
-#for t in domain.evolve(yieldstep = 0.05, finaltime = 5):
-#    domain.write_time()
-#    #print '    Volume: ', domain.get_quantity('stage').get_integral()
+    if allclose(t, 100):
+        Q = domain.get_quantity('stage')
+        Q_s = Quantity(domain)
+        Q_s.set_values(slump)
+        domain.set_quantity('stage', Q + Q_s)
+    #print '    Volume: ', domain.get_quantity('stage').get_integral()
 
 print 'Done'

inundation/examples/island_timeseries.py

@@ -11 +11 @@
 swwfile = 'island.sww' 
 #gauges = [[56, 48], [58, 48], [60, 48], [62, 48], [64, 48]]
-gauges = [[60, 48], [62, 48], [64, 48]]    
+#gauges = [[10, 10], [60, 48], [62, 48], [64, 48]]    
+gauges = [[10, 10], [40, 10], [70, 10]]    
 
 
-store = False
+store = True
 
 #Read model output
@@ -104 +105 @@
     hold(False)
 
-    if elevations[0] < 0:
+    if elevations[0] <= 0:
         plot(model_time, stages, '-b')
     else:    

inundation/pyvolution/shallow_water_ext.c

@@ -374 +374 @@
     
       //Old code: Set momentum to zero and ensure h is non negative
-      /*
-      xmomc[k] = 0.0;
-      ymomc[k] = 0.0;      
-      //wc[k] = zc[k]; 
-      if (hc <= 0.0) wc[k] = zc[k]; 
-      */
+      //xmomc[k] = 0.0;
+      //ymomc[k] = 0.0;      
+      //if (hc <= 0.0) wc[k] = zc[k]; 
+      
 
       //New code: Adjust momentum to guarantee speeds are physical
       //          ensure h is non negative      
-   
+      
+      
       if (hc <= 0.0) {
         wc[k] = zc[k]; 
@@ -390 +389 @@
       } else {
         //Reduce excessive speeds derived from division by small hc 
-        //FIXME (Ole): This has not been written in Python
         u = xmomc[k]/hc;
         if (fabs(u) > maximum_allowed_speed) {