Changeset 7647 for anuga_work/production/mandurah_storm_surge_2009

Timestamp:

Mar 2, 2010, 2:31:30 PM (15 years ago)

Author:

Leharne Fountain

Message:

updates to mandurah and bunbury storm surge models

Location:

anuga_work/production/mandurah_storm_surge_2009

Files:

• anuga.log (deleted)
• build_elevation.py (modified) (1 diff)
• gems_comparison/build_elevation_GEMS.py (modified) (1 diff)
• gems_comparison/project_GEMS.py (modified) (2 diffs)
• gems_comparison/run_model_GEMS.py (modified) (1 diff)
• get_timeseries.py (modified) (1 diff)
• project.py (modified) (1 diff)
• run_model.py (modified) (1 diff)
• run_model_parallel.py (added)

anuga_work/production/mandurah_storm_surge_2009/build_elevation.py

@@ -87 +87 @@
 G1 = geospatial_data['m_peel_aoi'].clip(project.elevation_clip_box)
 G2 = geospatial_data['ph10m_ss'].clip_outside(project.elevation_clip_box)
-G3 = geospatial_data['MA-46893-SNDS_AHD.csv']
-G4 = geospatial_data['MS0205HY_AHD.csv']
-G5 = geospatial_data['MS0404_AHD.csv']
-G6 = geospatial_data['YU0403HY_AHD.csv']
-G7 = geospatial_data['original_data_ss.csv']
+G3 = geospatial_data['DpiU1A03_ss.csv']
+G4 = geospatial_data['MA-46893-SNDS_AHD.csv']
+G5 = geospatial_data['MS0205HY_AHD.csv']
+G6 = geospatial_data['MS0404_AHD.csv']
+G7 = geospatial_data['YU0403HY_AHD.csv']
+G8 = geospatial_data['original_data_ss.csv']
 
-G = G1 + G2 + G3 + G4 + G5 + G6 + G7
+G = G1 + G2 + G3 + G4 + G5 + G6 + G7 + G8
         
 print 'Export combined DEM file'

anuga_work/production/mandurah_storm_surge_2009/gems_comparison/build_elevation_GEMS.py

@@ -82 +82 @@
 print 'project_GEMS.elevation_clip_box', project_GEMS.elevation_clip_box
 
-G1 = geospatial_data['Man_25m'].clip(project_GEMS.elevation_clip_box)
+G1 = geospatial_data['man_25m_prj'].clip(project_GEMS.elevation_clip_box)
 G2 = geospatial_data['man10m_ss'].clip_outside(project_GEMS.elevation_clip_box)
 

anuga_work/production/mandurah_storm_surge_2009/gems_comparison/project_GEMS.py

@@ -62 +62 @@
 #-------------------------------------------------------------------------------
 
-output_comment = [setup, tide, event, '_GEMS_compare']    # event_number will have to
+output_comment = [setup, tide, event, 'GEMS_compare']    # event_number will have to
                                                                                                 # change to something relevent
                                                                                                 # for storm surge
@@ -77 +77 @@
 ##                        'm_peel_10m.asc'
 ##                        'm_harvey_10m.asc']
-ascii_grid_filenames = ['Man_25m',              # this is the latest 25m DEM from GEMS
+ascii_grid_filenames = ['man_25m_prj',          # this is the latest 25m DEM from GEMS
                                                 'man10m_ss']    # this is to fill in areas not covered by the 
                                         # GEMS grid and is derived from the 10m resampled LiDAR from DoT,

anuga_work/production/mandurah_storm_surge_2009/gems_comparison/run_model_GEMS.py

@@ -110 +110 @@
 print domain.statistics()
 
-domain.starttime(project_GEMS.starttime)
+domain.set_starttime(project_GEMS.starttime)
 domain.set_name(project_GEMS.scenario_name)
 domain.set_datadir(project_GEMS.output_run) 

anuga_work/production/mandurah_storm_surge_2009/get_timeseries.py

@@ -19 +19 @@
 directory = project.output_folder
 
-time_dir1 = '20090508_150215_run_final_0_51469_lfountai'
-time_dir2 = '20090511_161526_run_final_1.1_51469_kvanputt'
-time_dir3 = '20090511_165539_run_final_0_50863_lfountai'
-time_dir4 = '20090521_220101_run_final_1.1_50863_kvanputt'
-time_dir5 = '20090522_164526_run_final_0_51392_lfountai'
-time_dir6 = '20090522_164640_run_final_1.1_51392_lfountai'
-time_dir7 = '20090518_154710_run_final_0_50994_lfountai'
-time_dir8 = '20090519_160510_run_final_1.1_50994_lfountai'
-time_dir9 = '20090522_164948_run_final_0_51423_lfountai'
-time_dir10 = '20090522_165600_run_final_1.1_51423_lfountai'
+time_dir1 = '20091229_100831_run_storm_surge_final_0_alby_waves_lfountai'
 
-time_dirs = [time_dir1, time_dir2, time_dir3, time_dir4, time_dir5,
-             time_dir6, time_dir7, time_dir8, time_dir9, time_dir10]
+time_dirs = [time_dir1]
 
 for time_dir in time_dirs:

anuga_work/production/mandurah_storm_surge_2009/project.py

@@ -86 +86 @@
 # Format for point is x,y,elevation (with header)
 # Don't use these for comparison with GEMS inundation
-point_filenames = ['MA-46893-SNDS_AHD.csv',     # These files contain inf-fill bathymetry for 
+point_filenames = ['DpiU1A03_ss.csv',           # Bathymetric LiDAR data from DPI, clipped to bounding polygon
+                  'MA-46893-SNDS_AHD.csv',      # These files contain inf-fill bathymetry for 
                   'MS0205HY_AHD.csv',           # the Peel & Harvey estuaries, as well as around
                   'MS0404_AHD.csv',             # the canals

anuga_work/production/mandurah_storm_surge_2009/run_model.py

@@ -110 +110 @@
 print domain.statistics()
 
+domain.set_starttime(project.starttime)
 domain.set_name(project.scenario_name)
 domain.set_datadir(project.output_run)