Changeset 2636

Timestamp:

Mar 30, 2006, 5:45:12 PM (18 years ago)

Author:

ole

Message:

Work on friction creep example

Location:

inundation

Files:

• examples/island.py (modified) (5 diffs)
• pyvolution/shallow_water_ext.c (modified) (1 diff)

inundation/examples/island.py

@@ -28 +28 @@
 
 #Create basic mesh
-N = 40
-points, vertices, boundary = rectangular(N, N, 100, 100)
-
-
 create_mesh_from_regions( [[0,0], [100,0], [100,100], [0,100]],
                           boundary_tags = {'bottom': [0],
@@ -37 +33 @@
                                            'top': [2],
                                            'left': [3]},
-                          maximum_triangle_area = 25,
+                          maximum_triangle_area = 20,
                           filename = 'island.msh'
-                          , interior_regions=[ ([[50,25], [70,25], [70,75], [50,75]], 1)]
+                          , interior_regions=[ ([[50,25], [70,25], [70,75], [50,75]], 3)]
                           )
                           
                                                     
                           
-                           
-
 #Create shallow water domain
-#domain = Domain(points, vertices, boundary)
 domain = Domain(mesh_filename = 'island.msh')
 domain.smooth = False
@@ -84 +77 @@
     return z
 
-domain.set_quantity('friction', 0.0)
+#domain.set_quantity('friction', 0.1)  #Honky dory 
+domain.set_quantity('friction', 2)     #Creep
 domain.set_quantity('elevation', island)
 domain.set_quantity('stage', 1)
@@ -96 +90 @@
 Bd = Dirichlet_boundary([1, 0, 0])
 
-#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()
@@ -106 +99 @@
 
 import time
-for t in domain.evolve(yieldstep = 1, finaltime = 500):
+for t in domain.evolve(yieldstep = 1, finaltime = 100):
     domain.write_time()
-    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)
+    #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()
 

inundation/pyvolution/shallow_water_ext.c

@@ -381 +381 @@
       //New code: Adjust momentum to guarantee speeds are physical
       //          ensure h is non negative      
-      
-      
+      //FIXME (Ole): This is only implemented in this C extension and 
+      //             has no Python equivalent      
       if (hc <= 0.0) {
         wc[k] = zc[k];