Changeset 6284

Timestamp:

Feb 5, 2009, 4:28:52 PM (16 years ago)

Author:

kristy

Message:

Updated scripts for working standards

Location:

anuga_work/production/busselton/standardised_version

Files:

• build_boundary_27255.py (added)
• build_elevation.py (moved) (moved from anuga_work/production/busselton/standardised_version/build_busselton.py) (5 diffs)
• export_results_max.py (added)
• project.py (modified) (10 diffs)
• run_model.py (moved) (moved from anuga_work/production/busselton/standardised_version/run_busselton.py) (3 diffs)

anuga_work/production/busselton/standardised_version/build_elevation.py

@@ -4 +4 @@
 Input: elevation data from project.py
 Output: pts file stored in project.topographies_dir 
-The run_busselton.py is reliant on the output of this script.
+The run_model.py is reliant on the output of this script.
 
 """
@@ -14 +14 @@
 # Standard modules
 import os
+from os.path import join
 
 # Related major packages
@@ -50 +51 @@
 geospatial_data = {}
 for filename in project.ascii_grid_filenames:
-    absolute_filename = project.topographies_folder + os.sep + filename
+    absolute_filename = join(project.topographies_folder, filename)
     convert_dem_from_ascii2netcdf(absolute_filename,
                                   basename_out=absolute_filename,
@@ -62 +63 @@
 # Create Geospatial data from TXT files
 for filename in project.point_filenames:
-    absolute_filename = project.topographies_folder  + os.sep + filename
+    absolute_filename = join(project.topographies_folder, filename)
     geospatial_data[filename] = Geospatial_data(file_name=absolute_filename,
                                                 verbose=True)
@@ -88 +89 @@
 
 print 'Export combined DEM file'
-G_clip.export_points_file(project.combined_dir_name + '.pts')
+G_clip.export_points_file(project.combined_elevation + '.pts')
 print 'Do txt version too'
 # Use for comparision in ARC
-G_clip.export_points_file(project.combined_dir_name + '.txt')
+G_clip.export_points_file(project.combined_elevation + '.txt')
 

anuga_work/production/busselton/standardised_version/project.py

@@ -40 +40 @@
 # Model specific parameters. One or all can be changed each time the
 # run_scenario script is executed
+tide = 0              #0.6
+event_number = 27255 # Java 9.3 worst case for Perth
+#event_number = 68693 # Sumatra 9.2
+#event_number = 27283  # Java 9.3 original
 tide = 0                #0.6
 #event_number = 27255   # Java 9.3 worst case for Perth
@@ -82 +86 @@
 #------------------------------------------------------------------------------
 # ELEVATION DATA
-# Used in build_busselton.py
+# Used in build_elevation.py
 # Format for ascii grids, as produced in ArcGIS + a projection file
 ascii_grid_filenames = ['busselton_v2',   # Topo
@@ -100 +104 @@
 
 # LAND - used to set the initial stage/water to be offcoast only
-# Used in run_busselton,py
+# Used in run_model,py
 # Format for points easting,northing (no header)
 land_initial_conditions_filename = [['initial_condition_extend.csv', 0],
@@ -106 +110 @@
 
 # BOUNDING POLYGON - for data clipping and estimate of triangles in mesh
-# Used in build_busselton.py
+# Used in build_elevation.py
 # Format for points easting,northing (no header)
 bounding_polygon_filename = 'bounding_polygon.csv'
 
 # INTERIOR REGIONS -  for designing the mesh
-# Used in run_busselton.py
+# Used in run_model.py
 # Format for points easting,northing (no header)                    
 interior_regions_data = [['busselton_1km.csv', 500],
@@ -132 +136 @@
 
 # BOUNDING POLYGON
-# used in build_boundary.py and run_busselton.py respectively
+# used in build_boundary.py and run_model.py respectively
 # NOTE: when files are put together the points must be in sequence
 # For ease go clockwise!
-# Check the run_busselton.py for boundary_tags
+# Check the run_model.py for boundary_tags
 
 # Thinned ordering file from Hazard Map (geographic)
@@ -167 +171 @@
 #------------------------------------------------------------------------------
 # Output filename for elevation
-# this is a combination of all the data generated in build_busselton.py
+# this is a combination of all the data generated in build_elevation.py
 combined_elevation_basename = scenario_name + '_combined_elevation'
 
@@ -185 +189 @@
 #------------------------------------------------------------------------------
 
-# The absolute pathname of the all elevation, generated in build_busselton.py
+# The absolute pathname of the all elevation, generated in build_elevation.py
 combined_elevation = join(topographies_folder, combined_elevation_basename)
 
-# The absolute pathname of the mesh, generated in run_busselton.py
-meshes = join(meshes_folder, scenario_name, '.msh')
+
+# The absolute pathname of the mesh, generated in run_model.py
+meshes = join(meshes_folder, scenario_name) + '.msh'
 
 # The absolute pathname for the urs order points, used within build_boundary.py
@@ -195 +200 @@
 
 # The absolute pathname for the landward points of the bounding polygon,
-# Used within run_busselton.py)
+# Used within run_model.py)
 landward_boundary = join(boundaries_folder, landward_boundary_filename)
 
@@ -202 +207 @@
 
 # The absolute pathname for the output folder names
-# Used for build_busselton.py
-output_build = output_folder + sep + build_time + '_' + str(user) 
-# Used for run_busselton.py
-output_run = output_folder + sep + run_time + output_comment 
+# Used for build_elevation.py
+output_build = join(output_folder, build_time) + '_' + str(user) 
+# Used for run_model.py
+output_run = join(output_folder, run_time) + output_comment 
 # Used by post processing
 output_run_time = join(output_run, scenario_name) 
@@ -225 +230 @@
 for filename, MSL in land_initial_conditions_filename:
     polygon = read_polygon(join(polygons_folder, filename))
-    land_initial_conditions.append([filename, MSL])
+    land_initial_conditions.append([polygon, MSL])
 
 # Create list of interior polygons with scaling factor

anuga_work/production/busselton/standardised_version/run_model.py

@@ -2 +2 @@
 
 The scenario is defined by a triangular mesh created from project.polygon, the
-elevation data is compiled into a pts file through build_busselton.py and a
+elevation data is compiled into a pts file through build_elevation.py and a
 simulated tsunami is generated through an sts file from build_boundary.py.
 
 Input: sts file (build_boundary.py for respective event)
-       pts file (build_busselton.py)
+       pts file (build_elevation.py)
        information from project file
 Outputs: sww file stored in project.output_run_time_dir 
@@ -73 +73 @@
 # Boundary tags refer to project.landward_boundary
 # 4 points equals 5 segments start at N
-boundary_tags={'back': [N+1,N+2,N+3,N+4, N+5],
-               'side': [N,N+6],
+boundary_tags={'back': [N+1, N+2, N+3, N+4, N+5, N+6, N+7],
+               'side': [N, N+8],
                'ocean': range(N)}
 
@@ -80 +80 @@
 domain = create_domain_from_regions(bounding_polygon_sts,
                                     boundary_tags=boundary_tags,
-                                    maximum_triangle_area=project.res_poly_all,
+                                    maximum_triangle_area=project.bounding_maxarea,
                                     interior_regions=project.interior_regions,
                                     mesh_filename=project.meshes,