Changeset 326

Timestamp:

Sep 20, 2004, 6:13:57 PM (20 years ago)

Author:

ole

Message:

 

Location:

inundation/ga/storm_surge/pyvolution

Files:

• bed_w_eden_boundary.py (modified) (4 diffs)
• generic_boundary_conditions.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/bed_w_eden_boundary.py

@@ -14 +14 @@
 
 #Create basic mesh  (1km x 1km)
-points, vertices, boundary = rectangular(10, 10, 100, 100)
+points, vertices, boundary = rectangular(50, 50, 100, 100)
 
 #Create shallow water domain
 domain = Domain(points, vertices, boundary)
 domain.smooth = False
-domain.visualise = True
+domain.visualise = False
 domain.default_order=2
 domain.store = True    #Store for visualisation purposes
@@ -28 +28 @@
 #######################
 #Bed-slope and friction
-#domain.set_quantity('elevation', lambda x,y: -20*ones(x.shape))
+domain.set_quantity('elevation', lambda x,y: 0.*ones(x.shape))
 
-domain.set_quantity('elevation', lambda x,y: -(x+y)/3)
+#domain.set_quantity('elevation', lambda x,y: -(x+y)/3)
 domain.set_quantity('friction', 0.1)
 
@@ -46 +46 @@
 
 Br = Reflective_boundary(domain)
-Bd = Dirichlet_boundary([0. ,0.,0.])
+Bd = Dirichlet_boundary([1. ,0.,0.])
 Bw = Time_boundary(domain=domain,
-                   f=lambda t: [(1*sin(t*pi)), 0.0, 0.0])
+                   f=lambda t: [(1*sin(t*pi/20)), 0.0, 0.0])
 
 Bf = File_boundary(domain, filename)
 
-domain.set_boundary({'left': Bd, 'right': Br, 'top': Br, 'bottom': Br})
-#domain.set_boundary({'left': Bf, 'right': Br, 'top': Br, 'bottom': Br})
+#domain.set_boundary({'left': Bw, 'right': Br, 'top': Br, 'bottom': Br})
+domain.set_boundary({'left': Bf, 'right': Br, 'top': Br, 'bottom': Br})
 
 
@@ -65 +65 @@
 ######################
 #Evolution
-for t in domain.evolve(yieldstep = 6, finaltime = 385*15*60):
+for t in domain.evolve(yieldstep = 60, finaltime = 385*15*60):
     domain.write_time()
 

inundation/ga/storm_surge/pyvolution/generic_boundary_conditions.py

@@ -222 +222 @@
         if t > self.T[-1]: raise msg        
 
+        oldindex = self.index
+
         #Find slot
         while t > self.T[self.index]: self.index += 1
         while t < self.T[self.index]: self.index -= 1
 
-
+        if oldindex != self.index:
+            print 'Changing from %d to %d' %(oldindex, self.index)
+        
+        
         #t is now between index and index+1
         ratio = (t - self.T[self.index])/(self.T[self.index+1] - self.T[self.index])