Changeset 7677

Timestamp:

Apr 9, 2010, 3:16:13 PM (15 years ago)

Author:

Leharne Fountain

Message:

updates to mandurah storm surge model

Location:

branches/anuga_1_1/anuga_work/production/mandurah_storm_surge_2009

Files:

• Arc_asc2raster_GDA94z50.py (modified) (4 diffs)
• build_elevation.py (modified) (2 diffs)
• build_gems_boundary.py (added)
• export_results_max.py (modified) (4 diffs)
• gems_comparison/build_elevation_GEMS.py (modified) (2 diffs)
• gems_comparison/project_GEMS.py (modified) (1 diff)
• gems_comparison/run_model_GEMS.py (modified) (2 diffs)
• process_gems_grids.py (added)
• project.py (modified) (1 diff)
• run_model.py (modified) (2 diffs)

branches/anuga_1_1/anuga_work/production/mandurah_storm_surge_2009/Arc_asc2raster_GDA94z50.py

@@ -25 +25 @@
 output_dir = "anuga\\outputs\\"
 
-time_dir1 = '20091229_100831_run_storm_surge_final_0_alby_waves_lfountai'
+time_dir1 = '20100219_094651_run_storm_surge_final_0_alby_waves_lfountai'
+# time_dir2 = '20100223_153032_run_storm_surge_final_0_alby_waves_GEMS_compare_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] #, time_dir2] 
 
 for time_dir in time_dirs:
@@ -36 +35 @@
     folder =  scenario_dir + output_dir + time_dir + '\\'
     raster_gbd = folder + 'raster.gdb'
-    elevation_gdb = folder + 'elevation.gdb'
-    #contour = raster_gbd + '\\contour_dep'
-    land = scenario_dir + "ArcGIS\\data.gdb\\initial_conditions_10m"
-##    ocean = scenario_dir + "map_work\\Perth.gdb\\Outlines\\initial_condition_ocean"
+    land = scenario_dir + "ArcGIS\\data.gdb\\initial_conditions_10m_clip"
+    ocean = scenario_dir + "ArcGIS\\data.gdb\\initial_conditions_ocean"
     
     print 'Process: Create File GDB'
-##    gp.createFileGDB_management(folder, "elevation")
-##    gp.CreateFileGDB_management(folder, "raster")
-
+    # gp.CreateFileGDB_management(folder, "raster")
     gp.Workspace = raster_gbd
-##    gp.Workspace = elevation_gdb
 
     print gp.Workspace
     
     #replication dictionary
-    replicate = (('gold_coast', ''), ('_time_29220_0', 'b'), ('_time_58440_0', 'c'),
+    replicate = (('alby_waves', 'man'), ('_time_29220_0', 'b'), ('_time_58440_0', 'c'),
                  ('_time_28860_0', 'b'), ('_time_57720_0', 'c'),
                  ('_', ''), ('max','M_'), ('depth','_dep_'),
@@ -57 +51 @@
 
     generate_filename = []
- ##   input_ascii = glob.glob(folder + '*elevation*.asc')
-    input_ascii = glob.glob(folder + '*depth*.asc')
+    input_ascii = glob.glob(folder + '*elevation*.asc')
+    # input_ascii = glob.glob(folder + '*stage.asc')
     print time_dir
 
@@ -86 +80 @@
     
         print 'Process: Extract by Mask'
-        gp.ExtractByMask_sa(output_DEM, land, output_extract)
+        # gp.ExtractByMask_sa(output_DEM, land, output_extract) # use for depth to get onshore inundation depths
+        # gp.ExtractByMask_sa(output_DEM, ocean, output_extract) # use for stage to get offshore wave heights
 
        

branches/anuga_1_1/anuga_work/production/mandurah_storm_surge_2009/build_elevation.py

@@ -85 +85 @@
 # G2 = geospatial_data['ph10m_ss'].clip_outside(project.elevation_clip_box)
 
-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['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']
+G1 = geospatial_data[keylist[0]].clip(project.elevation_clip_box)
+G2 = geospatial_data[keylist[1]].clip_outside(project.elevation_clip_box)
+G3 = geospatial_data[keylist[2]]
+G4 = geospatial_data[keylist[3]]
+G5 = geospatial_data[keylist[4]]
+G6 = geospatial_data[keylist[5]]
+G7 = geospatial_data[keylist[6]]
+G8 = geospatial_data[keylist[7]]
 
 G = G1 + G2 + G3 + G4 + G5 + G6 + G7 + G8
@@ -102 +102 @@
 # Use for comparision in ARC
 G.export_points_file(project.combined_elevation + '.txt')
-G1.export_points_file(join(project.topographies_folder, (str(project.ascii_grid_filenames[0]) +'_export.txt')))
-G2.export_points_file(join(project.topographies_folder, (str(project.ascii_grid_filenames[1]) + '_export.txt')))
+G1.export_points_file(join(project.topographies_folder, keylist[0] +'_export.txt'))
+G2.export_points_file(join(project.topographies_folder, keylist[1] +'_export.txt'))

branches/anuga_1_1/anuga_work/production/mandurah_storm_surge_2009/export_results_max.py

@@ -21 +21 @@
 
 directory = project.output_folder
-time_dir1 = '20091229_100831_run_storm_surge_final_0_alby_waves_lfountai'
+#time_dir1 = '20100219_094651_run_storm_surge_final_0_alby_waves_lfountai'
+time_dir1 = '20100223_153032_run_storm_surge_final_0_alby_waves_GEMS_compare_lfountai'
 
-time_dirs = [time_dir1]  
+time_dirs = [time_dir1] #, time_dir2]  
 
 # sww filename extensions ie. hobart_time_17640_0.sww, input into list 17640
@@ -45 +46 @@
 
 # one or more key strings from var_equations below
-var = ['stage']
+var = ['elevation', 'speed'] #'stage','depth','speed','elevation']
 
 ######
@@ -100 +101 @@
                 sww2dem(name, basename_out = outname,
                             quantity = quantityname,
-                            timestep = timestep,
+                            reduction = timestep,
                             cellsize = cellsize,      
                             easting_min = easting_min,
@@ -106 +107 @@
                             northing_min = northing_min,
                             northing_max = northing_max,        
-                            reduction = max, 
                             verbose = True,
                             format = 'asc')

branches/anuga_1_1/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_prj'].clip(project_GEMS.elevation_clip_box)
-G2 = geospatial_data['man10m_ss'].clip_outside(project_GEMS.elevation_clip_box)
+G1 = geospatial_data[keylist[0]].clip(project.elevation_clip_box)
+G2 = geospatial_data[keylist[1]].clip_outside(project.elevation_clip_box)
 
 G = G1 + G2
@@ -93 +93 @@
 # Use for comparision in ARC
 G.export_points_file(project_GEMS.combined_elevation + '.txt')
-G1.export_points_file(join(project_GEMS.topographies_folder, (str(project_GEMS.ascii_grid_filenames[0]) +'_export.txt')))
-G2.export_points_file(join(project_GEMS.topographies_folder, (str(project_GEMS.ascii_grid_filenames[1]) + '_export.txt')))
+# G1.export_points_file(join(project.topographies_folder, keylist[0] +'_export.txt'))
+# G2.export_points_file(join(project.topographies_folder, keylist[1] +'_export.txt'))

branches/anuga_1_1/anuga_work/production/mandurah_storm_surge_2009/gems_comparison/project_GEMS.py

@@ -180 +180 @@
 # Output filename for elevation
 # this is a combination of all the data generated in build_elevation.py
-combined_elevation_basename = scenario_name + 'GEMS_combined_elevation'
+combined_elevation_basename = scenario_name + '_GEMS_combined_elevation'
 
 #-------------------------------------------------------------------------------

branches/anuga_1_1/anuga_work/production/mandurah_storm_surge_2009/gems_comparison/run_model_GEMS.py

@@ -45 +45 @@
 ##from anuga.shallow_water.data_manager import urs2sts
 from anuga.utilities.polygon import read_polygon, Polygon_function
+from anuga.utilities.system_tools import get_revision_number
 
 # Application specific imports
@@ -60 +61 @@
                              project_GEMS.__name__+'.py'))
 start_screen_catcher(project_GEMS.output_run, 0, 1)
+
+print 'SVN revision number: ', get_revision_number()
 
 #-------------------------------------------------------------------------------

branches/anuga_1_1/anuga_work/production/mandurah_storm_surge_2009/project.py

@@ -128 +128 @@
 
 # GEMS order filename
-# Format is index,northing, easting, elevation (without header)
+# Format is index, longitude, latitude, elevation (without header)
 gems_order_filename = 'gems_boundary_order_thinned.csv'
 

branches/anuga_1_1/anuga_work/production/mandurah_storm_surge_2009/run_model.py

@@ -45 +45 @@
 ##from anuga.shallow_water.data_manager import urs2sts
 from anuga.utilities.polygon import read_polygon, Polygon_function
+from anuga.utilities.system_tools import get_revision_number
 
 # Application specific imports
@@ -60 +61 @@
                              project.__name__+'.py'))
 start_screen_catcher(project.output_run, 0, 1)
+
+print 'SVN revision number: ', get_revision_number()
 
 #-------------------------------------------------------------------------------