Changeset 1989

Timestamp:

Nov 1, 2005, 5:18:08 PM (17 years ago)

Author:

ole

Message:

Renaming of mesh generation and new refinements

Location:

production/karratha_2005

Files:

• create_mesh.py (modified) (2 diffs)
• project.py (modified) (1 diff)
• run_karratha.py (modified) (3 diffs)

production/karratha_2005/create_mesh.py

@@ -14 +14 @@
     points = []
     for point in polygon:
-        zone, easting, northing  = redfearn(point[0], point[1]) #FIXME: Use point.latitude etc
+        zone, easting, northing  = redfearn(point[0], point[1])
+        #FIXME: Use point.latitude etc once we have a proper point set
         assert zone == refzone
         points.append([easting, northing])
@@ -64 +65 @@
 
 
-def create_mesh(bounding_polygon, boundary_tags, resolution,
-                filename = None, interior_regions = None):
+def create_mesh_from_regions(bounding_polygon,
+                             boundary_tags,
+                             resolution,
+                             filename = None,
+                             interior_regions = None):
     """Create mesh from bounding polygon, tags for all segments and resolution.
 

production/karratha_2005/project.py

@@ -106 +106 @@
 
 refinery_polygon = [d0, d1, d2, d3]
+
+
+#Interior region around 468899, 7715177:
+#lat (-20, 39, 44.93753), lon (116, 42, 5.09106)
+
+point_south = degminsec2decimal_degrees(-20,39,46)
+point_north = degminsec2decimal_degrees(-20,39,42)
+point_west = degminsec2decimal_degrees(116,42,0)
+point_east = degminsec2decimal_degrees(116,42,10)
+
+d0 = [point_south, point_west]
+d1 = [point_south, point_east]
+d2 = [point_north, point_east]
+d3 = [point_north, point_west]    
+
+point_polygon = [d0, d1, d2, d3]
+
+
+#Neils areas around interesting points
+neil1_point1 = [degminsec2decimal_degrees(-20,35,34),
+                degminsec2decimal_degrees(116,45,18)]
+neil1_point2 = [degminsec2decimal_degrees(-20,36,15),
+                degminsec2decimal_degrees(116,46,18)]
+neil1_point3 = [degminsec2decimal_degrees(-20,35,9),
+                degminsec2decimal_degrees(116,47,17)]
+neil1_point4 = [degminsec2decimal_degrees(-20,34,26),
+                degminsec2decimal_degrees(116,46,17)]
+
+neil1_polygon = [neil1_point1, neil1_point2, neil1_point3, neil1_point4]
+
+
+
+neil2_point1 = [degminsec2decimal_degrees(-20,39,36),
+                degminsec2decimal_degrees(116,41,33)]
+neil2_point2 = [degminsec2decimal_degrees(-20,40,10),
+                degminsec2decimal_degrees(116,42,13)]
+neil2_point3 = [degminsec2decimal_degrees(-20,38,39),
+                degminsec2decimal_degrees(116,43,49)]
+neil2_point4 = [degminsec2decimal_degrees(-20,38,5),
+                degminsec2decimal_degrees(116,43,9)]
+
+neil2_polygon = [neil2_point1, neil2_point2, neil2_point3, neil2_point4]

production/karratha_2005/run_karratha.py

@@ -83 +83 @@
 
 #Create Triangular Mesh
-from create_mesh import create_mesh
+from create_mesh import create_mesh_from_regions
 
-interior_regions = [[project.karratha_polygon, 25000],
-                    [project.dampier_polygon, 8000],
-                    [project.refinery_polygon, 8000]]
+interior_regions = [#[project.karratha_polygon, 25000],
+                    #[project.dampier_polygon, 2000],
+                    #[project.refinery_polygon, 2000],
+                    #[project.point_polygon, 2000]]
+                    [project.neil1_polygon, 1000],
+                    [project.neil2_polygon, 1000]]
+                    
 
-m = cache(create_mesh,
+m = cache(create_mesh_from_regions,
           project.polygon,
-          {'boundary_tags': {'back': [7, 8], 'side': [0, 6], 'ocean': [1, 2, 3, 4, 5]},
+          {'boundary_tags': {'back': [7, 8], 'side': [0, 6],
+                             'ocean': [1, 2, 3, 4, 5]},
           'resolution': 100000,
           'filename': project.meshname + '.msh',
@@ -107 +112 @@
 
 
+#domain.set_name(project.basename + '_notsunami')
 domain.set_name(project.basename)
 domain.set_datadir(project.outputdir)
 domain.store = True
+#domain.smooth = False
+
 
 domain.quantities_to_be_stored = ['stage', 'xmomentum', 'ymomentum']
@@ -145 +153 @@
 domain.set_boundary( {'back': Br,'side': Bd, 'ocean': Bf} ) #MOST tsunami
 
-#domain.set_boundary( {'back': Br,'side': Bd, 'ocean': Bd} )  #Nothing
+#domain.set_boundary( {'back': Bd,'side': Bd, 'ocean': Bd} )  #Nothing