Changeset 5360

Timestamp:

May 23, 2008, 6:57:13 PM (16 years ago)

Author:

sexton

Message:

updates to Perth polygons and scripts by Kristy

Location:

anuga_work/production/perth

Files:

• build_perth.py (modified) (5 diffs)
• project.py (modified) (4 diffs)
• run_perth.py (modified) (3 diffs)

anuga_work/production/perth/build_perth.py

@@ -31 +31 @@
 #from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from anuga.geospatial_data.geospatial_data import *
-from anuga.abstract_2d_finite_volumes.util import start_screen_catcher, copy_code_files
+from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files
 
 # Application specific imports
@@ -55 +55 @@
 # Fine pts file to be clipped to area of interest
 #-------------------------------------------------------------------------------
-print"project.bounding_polygon",project.bounding_polygon
+print"project.poly_all",project.poly_all
 print"project.combined_dir_name",project.combined_dir_name
 
@@ -66 +66 @@
 island_in_dir_name3 = project.island_in_dir_name3
 offshore_in_dir_name = project.offshore_in_dir_name
-offshore1_in_dir_name = project.offshore1_in_dir_name
+
 
 onshore_dir_name = project.onshore_dir_name
@@ -103 +103 @@
 G1 = Geospatial_data(file_name = onshore_dir_name + '.pts')
 print'create Geospatial data2 objects from topographies'
-G2 = Geospatial_data(file_name = coast_in_dir_name + '.xya')
+G2 = Geospatial_data(file_name = coast_in_dir_name + '.txt')
 print'create Geospatial data3 objects from topographies'
 G3 = Geospatial_data(file_name = island_dir_name + '.pts')
@@ -113 +113 @@
 G6 = Geospatial_data(file_name = island_dir_name3 + '.pts')
 print'create Geospatial data7 objects from topographies'
-G_off = Geospatial_data(file_name = offshore_in_dir_name + '.xya')
-print'create Geospatial data8 objects from topographies'
-G_off1 = Geospatial_data(file_name = offshore1_in_dir_name + '.xya')
+G_off = Geospatial_data(file_name = offshore_in_dir_name + '.txt')
+
 
 print'add all geospatial objects'

anuga_work/production/perth/project.py

@@ -81 +81 @@
 anuga_dir = home+state+sep+scenario+sep+'anuga'+sep
 
-topographies_in_dir = home+sep+state+sep+scenario+sep+'elevation_final'+sep+'points'+sep
+topographies_in_dir = home+state+sep+scenario+sep+'elevation_final'+sep+'points'+sep
 topographies_dir = anuga_dir+'topographies'+sep
 #topographies_time_dir = topographies_dir+build_time+sep
@@ -173 +173 @@
 
 #Polygon designed by 20m contours, or 3km from the coastline
-poly_internal_20_3 = read_polygon(polygons_dir+'internalh20mORd3km.csv')
+poly_internal_20_3 = read_polygon(polygons_dir+'internal_h20mORd3km.csv')
 res_internal_20_3 = 20000*res_factor
 
@@ -181 +181 @@
 
 #Polygon designed to incorporate coastline of rottnest
-poly_rottnest = read_polygon(polygons_dir+'rottnest.csv')
-res_rottnest = 1000*res_factor
+poly_rottnest_ex = read_polygon(polygons_dir+'rottnest_external.csv')
+res_rottnest_ex = 1000*res_factor
+
+#Polygon designed to cut out the rottnest island land.
+poly_rottnest_in = read_polygon(polygons_dir+'rottnest_internal.csv')
+res_rottnest_in = 20000*res_factor
 
 #Polygon designed to incorporate perth and Fremantle CBD
@@ -202 +206 @@
                      ,[poly_garden_rockingham,res_garden_rockingham]
                      ,[poly_penguin,res_penguin],[poly_geordie_bay,res_geordie_bay]
-                     ,[poly_sorrento_gauge,res_sorrento_gauge],[poly_rottnest, res_rottnest]]
-
-boundary_tags={'back': [4], 'side': [0,3],'ocean': [1, 2]}
+                     ,[poly_sorrento_gauge,res_sorrento_gauge],[poly_rottnest_in, res_rottnest_in]
+                     ,[poly_rottnest_ex, res_rottnest_ex]]
+
+boundary_tags={'back': [0,1,2], 'side': [3,6],'ocean': [4, 5]}
 
 trigs_min = number_mesh_triangles(interior_regions, poly_all, res_poly_all)

anuga_work/production/perth/run_perth.py

@@ -93 +93 @@
                              interior_regions=project.interior_regions,
                              filename=project.meshes_dir_name+'.msh',
-                             use_cache=False,
+                             use_cache=True,
                              verbose=True)
     barrier()
@@ -134 +134 @@
         domain.set_quantity('elevation', 
                             filename = kwargs['bathy_file'],
-                            use_cache = True,
+                            use_cache = False,
                             verbose = True,
                             alpha = kwargs['alpha'])
@@ -179 +179 @@
         Bf = Field_boundary(kwargs['boundary_file'],
                     domain, time_thinning=kwargs['time_thinning'], mean_stage=kwargs['tide'], 
-                    use_cache=True, verbose=True)
+                    use_cache=False, verbose=True)
         domain.set_boundary({'back': Br,
                              'side': Bd,