Changeset 2456

Timestamp:

Feb 28, 2006, 10:28:16 AM (18 years ago)

Author:

sexton

Message:

Removing the creation of the interior regions from polygons (to come later). Include new mesh interface.

File:

• production/sydney_2006/run_sydney_smf.py (modified) (3 diffs)

production/sydney_2006/run_sydney_smf.py

@@ -63 +63 @@
                                  project.combineddemname + '.pts')
 
+#from pmesh.create_mesh import create_mesh_from_regions
+# new interface
+from pmesh.mesh_interface import create_mesh_from_regions
 
-#-------------------------------------------------------------------------------                                 
-# Create the triangular mesh based on overall clipping polygon with a tagged
-# boundary and interior regions defined in project.py along with
-# resolutions (maximal area of per triangle) for each polygon
-#-------------------------------------------------------------------------------
-
-#def get_polygon_from_file(filename):
-#    fid = open(filename)
-#    lines = fid.readlines()
-#    fid.close()
-    
-#    polygon = []
-#    for line in lines[1:]:
-#       fields = line.split(',')
-#        x = float(fields[3])
-#        y = float(fields[4])
-#        polygon.append([x, y])
-        
-#    return interior_polygon
-
-from pmesh.create_mesh import create_mesh_from_regions
-
-num_polygons = 1
-filelist = []
-fileext = '.csv'
-filename = project.polygonptsfile
-interior_res = 50000
-
-for p in range(1, num_polygons+1):
-    thefilename = filename + str(p) + fileext
-    interior_polygon = get_polygon_from_file(thefilename)
-    interior_regions.append([interior_polygon, interior_res])
-    
-# test
-#interior_regions = [[project.poly1, interior_res],
-#                    [project.poly2, interior_res]]
 # original
-#interior_regions = [[project.harbour_polygon_2, interior_res],
-#                    [project.botanybay_polygon_2, interior_res]]
+interior_res = 5000
+interior_regions = [[project.harbour_polygon_2, interior_res],
+                    [project.botanybay_polygon_2, interior_res]]
 
 #FIXME: Fix caching of this one once the mesh_interface is ready
 from caching import cache
+
 _ = cache(create_mesh_from_regions,
           project.diffpolygonall,
@@ -112 +81 @@
                              'right2': [3], 'top': [4], 'left1': [5],
                              'left2': [6], 'left3': [7]},
-           'resolution': 100000,
+           'maximum_triangle_area': 100000,
            'filename': meshname,           
-           'interior_regions': interior_regions,
-           'UTM': True,
-           'refzone': project.refzone},
+           'interior_regions': interior_regions},
           verbose = True)
 
@@ -157 +124 @@
 
 domain.set_quantity('stage', tsunami_source)
-domain.set_quantity('friction', 0.03) # supplied by Benfield
+domain.set_quantity('friction', 0.0) 
 domain.set_quantity('elevation',
                     filename = project.combineddemname + '.pts',