Changeset 6276

Timestamp:

Feb 4, 2009, 5:11:17 PM (16 years ago)

Author:

kristy

Message:

Standardised naming convention

Location:

anuga_work/production/busselton/standardised_version

Files:

• build_busselton.py (modified) (2 diffs)
• project.py (modified) (13 diffs)

anuga_work/production/busselton/standardised_version/build_busselton.py

@@ -50 +50 @@
 geospatial_data = {}
 for filename in project.ascii_grid_filenames:
-    absolute_filename = project.topographies_in_dir + filename
+    absolute_filename = project.topographies_dir + filename
     convert_dem_from_ascii2netcdf(absolute_filename,
                                   basename_out=absolute_filename,
@@ -62 +62 @@
 # Create Geospatial data from TXT files
 for filename in project.point_filenames:
-    absolute_filename = project.topographies_in_dir + filename
+    absolute_filename = project.topographies_dir + filename
     geospatial_data[filename] = Geospatial_data(file_name=absolute_filename,
                                                 verbose=True)

anuga_work/production/busselton/standardised_version/project.py

@@ -7 +7 @@
 
 import os
+from os.path import join
 from os import sep, getenv
 from time import localtime, strftime, gmtime
@@ -36 +37 @@
 state = 'western_australia'
 scenario_name = 'busselton'
-scenario = 'busselton_tsunami_scenario'
+scenario_folder = 'busselton_tsunami_scenario'
 
 # Model specific parameters. One or all can be changed each time the
@@ -69 +70 @@
     yieldstep=60
 
-#------------------------------------------------------------------------------
-# Revision numbers - for comparisons study
-#------------------------------------------------------------------------------
-rev_num = 'newExtent'
-#rev_num = '5449'
-#rev_num = '4695' # 2nd Sept 2007
-#rev_num = '4743' # 3nd Oct 2007
-#rev_num = '4777' # 1st Nov 2007
-#rev_num = '4874' # 3rd Dec 2007
-#rev_num = '4901' # 3rd Jan 2007
-#rev_num = '4990' # 5th Feb 2007
-#rev_num = '5103' # 3rd March 2007
-#rev_num = '5120' # 5th March 2007
-#rev_num = '5140' # 7th March 2007
-#rev_num = '5160' # 11th March 2007
-#rev_num = '5185' # 1st April 2007
-#rev_num = '5273' # 2nd May 2007
-
 
 #------------------------------------------------------------------------------
@@ -93 +76 @@
 # Important to distinguish each run - ensure str(user) is included!
 # Note, the user is free to include as many parameters as desired
-dir_comment='_'+setup+'_'+str(tide)+'_'+str(event_number)+'_'+ 'alpha' +str(alpha)+'_'+str(user)
+output_comment='_'+setup+'_'+str(tide)+'_'+str(event_number)+'_'+ 'alpha' +str(alpha)+'_'+str(user)
 
 #------------------------------------------------------------------------------
@@ -101 +84 @@
 
 # elevation data used in build_busselton.py
+ascii_grid_filenames = [onshore_name,   # Topo
+                        offshore_name5] # Busselton Topo
+
+point_filenames = [coast_name,     # Coastline
+                   coast_name1,    # Beach survey
+                   offshore_name,  # Bathymetry
+                   offshore_name1, # Bathymetry Charts
+                   offshore_name2, # Digitised Fairsheet
+                   offshore_name3, # 250m
+                   offshore_name4] # Bunbury DPI
 # onshore data: format ascii grid with accompanying projection file
 onshore_name = 'busselton_v2_gda94_mga50' 
@@ -116 +109 @@
 # gauges - used in get_timeseries.py
 #gauge_name = scenario_name+'.txt'
-gauge_name = 'Gauges.csv'
+gauges_filename = 'gauges.csv'
 # buildings - used in run_building_inundation.py
-building = 'busselton_res_clip'
+building_exposure_filename = 'busselton_res_clip.csv' #from NEXIS
 
 
@@ -125 +118 @@
 # Check the run_busselton.py for boundary_tags
 # thinned ordering file from Hazard Map: format is index,latitude,longitude (with title)
-order_filename = 'thinned_boundary_ordering.csv'
+urs_order_filename = 'thinned_boundary_ordering.csv'
 #landward bounding points
-landward = 'landward_bounding_polygon.csv'
+landward_boundary_filename = 'landward_boundary.csv'
 
 
@@ -135 +128 @@
 # Output filename for elevation
 # this is a combination of all the data (utilisied in build_boundary)
-combined_name ='busselton_combined_elevation'
-combined_smaller_name = 'busselton_combined_elevation_smaller'
+combined_elevation_basename = scenario_name + '_combined_elevation'
 
 #------------------------------------------------------------------------------
 # Directory Structure
 #------------------------------------------------------------------------------
-anuga_dir = home+state+sep+scenario+sep+'anuga'+sep
-topographies_in_dir = home+state+sep+scenario+sep+'elevation_final'+sep+'points'+sep
-topographies_dir = anuga_dir+'topographies'+sep
-polygons_dir = anuga_dir+'polygons'+sep
-tide_dir = anuga_dir+'tide_data'+sep
-boundaries_dir = anuga_dir+'boundaries'+ sep 
+anuga_dir = home+state+sep+scenario+sep+'anuga'
+topographies_dir = anuga_dir+'topographies'
+polygons_dir = anuga_dir+'polygons'
+tide_dir = anuga_dir+'tide_data'
+boundaries_dir = anuga_dir+'boundaries'
 output_dir = anuga_dir+'outputs'+sep
 gauges_dir = anuga_dir+'gauges'+sep
@@ -155 +146 @@
 #------------------------------------------------------------------------------
 
-ascii_grid_filenames = [onshore_name,   # Topo
-                        offshore_name5] # Busselton Topo
-
-point_filenames = [coast_name,     # Coastline
-                   coast_name1,    # Beach survey
-                   offshore_name,  # Bathymetry
-                   offshore_name1, # Bathymetry Charts
-                   offshore_name2, # Digitised Fairsheet
-                   offshore_name3, # 250m
-                   offshore_name4] # Bunbury DPI
-
-
 # Where the combined elevation file sits
-combined_dir_name = topographies_dir + combined_name
-combined_smaller_name_dir = topographies_dir + combined_smaller_name
+combined_elevation = topographies_folder + combined_elevation_basename
 
 # Where the mesh sits (this is created during the run_busselton.py)
-meshes_dir_name = meshes_dir + scenario_name+'.msh'
+meshes = meshes_dir + scenario_name+'.msh'
 
 # Where the boundary ordering files sit (this is used within build_boundary.py)
-order_filename_dir = boundaries_dir + order_filename
+urs_order = boundaries_folder+ order_filename
 
 # Where the landward points of boundary extent sit (this is used within run_busselton.py)
-landward_dir = boundaries_dir + landward
+landward_boundary_dir = join(boundaries_dir, landward)
 
 # Where the event sts files sits (this is created during the build_boundary.py)
 boundaries_dir_event = boundaries_dir + str(event_number) + sep
-boundaries_dir_mux = muxhome
-urs_boundary_name = os.path.join(boundaries_dir_event,
+urs_boundary_name = join(boundaries_dir_event,
                                  scenario_name)
 
@@ -193 +170 @@
 
 # Where the directory of the gauges sit
-gauges_dir_name = gauges_dir + gauge_name       #used for get_timeseries.py
-building_in_dir_name = gauges_dir + building + '.csv'    #used for run_building_inundation.py
+gauges = gauges_folder + gauges_filename       #used for get_timeseries.py
+building_in_dir_name = gauges_dir + building '    #used for run_building_inundation.py
 
 #------------------------------------------------------------------------------
@@ -201 +178 @@
 
 # Land, to set the initial stage/water to be offcoast only
-poly_mainland = read_polygon(polygons_dir+'initial_condition.csv')
+mainland_polygon = read_polygon(polygons_dir+'initial_condition.csv')
 
 # Land, to set the initial stage/water to be offcoast only
@@ -207 +184 @@
 
 # Initial bounding polygon for data clipping 
-poly_all = read_polygon(polygons_dir+'poly_all_extend.csv')
-res_poly_all = 100000*res_factor
+bounding_polygon = read_polygon(polygons_dir+'poly_all_extend.csv')
+bounding_maxarea = 100000*scale_factor
 
 # Area of Interest 1 (Busselton)
-poly_aoi1 = read_polygon(polygons_dir+'busselton_1km.csv')
-res_aoi1 = 500*res_factor
+aoi1_polygon = read_polygon(polygons_dir+'busselton_1km.csv')
+aoi1_maxarea = 500*res_factor
 
 # Area of Interest 2 (Bunbury)
@@ -238 +215 @@
 
 # Combined all regions, must check that all are included!
-interior_regions = [[poly_aoi1,res_aoi1],[poly_aoi2,res_aoi2],
-                    [poly_aos1,res_aos1],[poly_aos2,res_aos2],
-                    [poly_aos3,res_aos3],[poly_aos4,res_aos4],
+interior_regions = [[aoi1_polygon, aoi1_maxarea],
+                    [poly_aoi2,res_aoi2],
+                    [poly_aos1,res_aos1],
+                    [poly_aos2,res_aos2],
+                    [poly_aos3,res_aos3],
+                    [poly_aos4,res_aos4],
                     [poly_sw1,res_sw1]]
 
     
-trigs_min = number_mesh_triangles(interior_regions, poly_all,
-                                  res_poly_all)
+trigs_min = number_mesh_triangles(interior_regions,
+                                  poly_all, res_poly_all)
 print 'min estimated number of triangles', trigs_min