Changeset 2772

Timestamp:

Apr 27, 2006, 11:10:38 AM (19 years ago)

Author:

nick

Message:

small changes

Location:

inundation

Files:

• examples/bedslope.py (modified) (5 diffs)
• geospatial_data/geospatial_data.py (modified) (1 diff)

inundation/examples/bedslope.py

@@ -1 +1 @@
 """Simple example of shallow water wave equation using Pyvolution
 
-Water driven by linear slope and Dirichlet boundary
+Water driven up a linear slope with a time varying boundary,
+similar to beach environment
 
 """
@@ -12 +13 @@
 
 #Create basic triangular mesh
-points, vertices, boundary = rectangular(2, 1)
+points, vertices, boundary = rectangular(10, 10)
 
 #Create shallow water domain
@@ -30 +31 @@
 domain.set_quantity('friction', 0.1)
 
-h = 0.05  # Constant depth
-domain.set_quantity('stage', expression = 'elevation + %f' %h)
+h = 0.00               # Constant depth over elevation
+domain.set_quantity('stage', -.4)
 
 
@@ -41 +42 @@
 Bd = Dirichlet_boundary([0.2,0.,0.])
 Bw = Time_boundary(domain=domain,
-                   f=lambda t: [(0.1*sin(t*2*pi)), 0.0, 0.0])
+                   f=lambda t: [(0.1*sin(t*2*pi)-0.3), 0.0, 0.0])
 
 
 print 'Tags are ', domain.get_boundary_tags()
 
-domain.set_boundary({'left': Bd, 'right': Br, 'top': Br, 'bottom': Br})
-#domain.set_boundary({'left': Bw, 'right': Br, 'top': Br, 'bottom': Br})
+domain.set_boundary({'left': Br, 'right': Bw, 'top': Br, 'bottom': Br})
 
 
@@ -54 +54 @@
 domain.check_integrity()
 
-for t in domain.evolve(yieldstep = 0.1, finaltime = 0.2):
+for t in domain.evolve(yieldstep = 0.1, finaltime = 4.0):
     domain.write_time()
 

inundation/geospatial_data/geospatial_data.py

@@ -443 +443 @@
         ofile is the file name, including the extension
         The point_dict is defined at the top of this file.
+        
+        If absolute is True data points at returned added to the xll and yll 
+        and geo_reference as None
+        
+        If absolute is False data points at returned as relative to the xll 
+        and yll and geo_reference remains uneffected
         """
     
-        #this was done for all keys in the mesh file.
-        #if not mesh_dict.has_key('points'):
-        #    mesh_dict['points'] = []
-            
         if (ofile[-4:] == ".xya"):
             if absolute is True: