Changeset 2620

Timestamp:

Mar 28, 2006, 2:21:34 PM (17 years ago)

Author:

ole

Message:

Worked on island.py example and it's gauges.
Renamed mesh_file to mesh_filename

Location:

inundation

Files:

• examples/beach.py (modified) (1 diff)
• examples/island.py (modified) (4 diffs)
• examples/island_timeseries.py (added)
• pyvolution/domain.py (modified) (3 diffs)
• pyvolution/shallow_water.py (modified) (2 diffs)
• pyvolution/test_shallow_water.py (modified) (1 diff)

inundation/examples/beach.py

@@ -29 +29 @@
 print 'Creating domain from %s.tsh' %name
 #domain = pmesh_to_domain_instance(name + '.tsh', Domain)
-domain = Domain(mesh_file= name + '.tsh')
+domain = Domain(mesh_filename = name + '.tsh')
 
 domain.store = True

inundation/examples/island.py

@@ -17 +17 @@
 from pyvolution.mesh_factory import rectangular
 from pyvolution.shallow_water import Domain, Reflective_boundary
+from pmesh.mesh_interface import create_mesh_from_regions
 from utilities.polygon import Polygon_function, read_polygon
 
@@ -28 +29 @@
 points, vertices, boundary = rectangular(N, N, 100, 100)
 
+
+create_mesh_from_regions( [[0,0], [100,0], [100,100], [0,100]],
+                          boundary_tags = {'bottom': [0],
+                                           'right': [1],
+                                           'top': [2],
+                                           'left': [3]},
+                          maximum_triangle_area = 25,
+                          filename = 'island.msh',
+                          interior_regions=[ ([[55,25], [75,25],
+                                               [75,75], [55,75]], 3)]
+                          )
+                          
+                                                    
+                          
+                           
+
 #Create shallow water domain
-domain = Domain(points, vertices, boundary)
+#domain = Domain(points, vertices, boundary)
+domain = Domain(mesh_filename = 'island.msh')
 domain.smooth = False
 domain.set_name('island')
@@ -55 +73 @@
     return z
 
-domain.set_quantity('friction', 0.1)
+domain.set_quantity('friction', 1.0)
 domain.set_quantity('elevation', island)
 domain.set_quantity('stage', 1)
@@ -75 +93 @@
 
 import time
-for t in domain.evolve(yieldstep = 1, finaltime = 100):
+for t in domain.evolve(yieldstep = 0.5, finaltime = 100):
     domain.write_time()
 

inundation/pyvolution/domain.py

@@ -20 +20 @@
 class Domain(Mesh):
 
+
+    #FIXME (Ole): I would like this interface to automatically work out
+    #whether input is mesh data or a filename (as in set_quantity).
+    #That way the user need not remember the keyword arguments.
     def __init__(self, coordinates=None, vertices=None,
                  boundary=None,
@@ -25 +29 @@
                  tagged_elements=None, geo_reference=None,
                  use_inscribed_circle=False,
-                 mesh_file=None):
-
-        if mesh_file is not None:
+                 mesh_filename=None):
+
+        if mesh_filename is not None:
             coordinates, vertices, boundary, vertex_quantity_dict \
                                 ,tagged_elements, geo_reference = \
-                                pmesh_to_domain(file_name=mesh_file)
+                                pmesh_to_domain(file_name=mesh_filename)
             # FIXME(DSG-DSG) have to do something with vertex_quantity_dict
 
@@ -109 +113 @@
         self.already_computed_flux = zeros((N, 3), Int)
 
-        if mesh_file is not None:
+        if mesh_filename is not None:
             # If the mesh file passed any quantity values
             # , initialise with these values. 

inundation/pyvolution/shallow_water.py

@@ -72 +72 @@
                  tagged_elements = None, geo_reference = None,
                  use_inscribed_circle=False,
-                 mesh_file=None):
+                 mesh_filename=None):
 
         conserved_quantities = ['stage', 'xmomentum', 'ymomentum']
@@ -78 +78 @@
         Generic_Domain.__init__(self, coordinates, vertices, boundary,
                                 conserved_quantities, other_quantities,
-                                tagged_elements, geo_reference, use_inscribed_circle, mesh_file)
+                                tagged_elements, geo_reference,
+                                use_inscribed_circle, mesh_filename)
 
         from config import minimum_allowed_height, maximum_allowed_speed, g

inundation/pyvolution/test_shallow_water.py

@@ -3329 +3329 @@
          #domain = pmesh_to_domain_instance(fileName, Domain)
          
-         domain = Domain(mesh_file=fileName)
+         domain = Domain(mesh_filename=fileName)
          
          os.remove(fileName)