Changeset 5647

Timestamp:

Aug 13, 2008, 8:22:53 AM (16 years ago)

Author:

kristy

Message:

updated

Location:

anuga_work/production

Files:

• busselton/export_results.py (modified) (3 diffs)
• busselton/export_results_all.py (modified) (3 diffs)
• busselton/get_timeseries.py (modified) (1 diff)
• busselton/project.py (modified) (7 diffs)
• onslow_2008/build_onslow.py (modified) (2 diffs)
• perth/export_results_all.py (modified) (3 diffs)
• perth/get_timeseries.py (modified) (1 diff)
• perth/project.py (modified) (2 diffs)

anuga_work/production/busselton/export_results.py

@@ -21 +21 @@
 #time_dir = '20080708_101731_run_trial_0.6_exmouth_4777_jsexton'
 #time_dir = '20080710_095410_run_trial_0.6_exmouth_4695_jsexton'
-time_dir = '20080717_092900_run_final_0_exmouth_newExtent_kvanputt'
+time_dir = '20080807_102253_run_final_0.0_polyline_newExtent_kvanputt'
 
 
@@ -28 +28 @@
 timestep = 0
 directory = project.output_dir
-name = directory+sep+'test'+sep+time_dir+sep+project.scenario_name
+name = directory+sep+time_dir+sep+project.scenario_name
 
 from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts
@@ -87 +87 @@
                     quantity = quantityname,
                     timestep = timestep,
-                    cellsize = cellsize,      
+                    cellsize = cellsize,
+                    number_of_decimal_places = 4,
                     #easting_min = project_grad.e_min_area,
                     #easting_max = project_grad.e_max_area,

anuga_work/production/busselton/export_results_all.py

@@ -6 +6 @@
 
 
-time_dir = '20080619_092128_run_trial_0.6_exmouth_current_kvanputt'
+time_dir = '20080807_102253_run_final_0.0_polyline_newExtent_kvanputt'
 
 
 
-cellsize = 10
-#cellsize = 150
-timestep = 0
+cellsize = 5
+#timestep = 0
 directory = project.output_dir
-name = directory+'test'+sep+time_dir+sep+project.scenario_name # test folder take out!!
+name = directory+time_dir+sep+project.scenario_name # test folder take out!!
 
 from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts
@@ -46 +45 @@
         northing_max = project.ymaxDunsborough
 
-   # var = [2,3,4] # depth and speed
-#var = [2] # depth
-    var = [0,4]
+    var = [2,3] # depth and speed
+    #var = [2] # depth
+    #var = [0,4]
 
     for which_var in var:
@@ -92 +91 @@
             sww2dem(name, basename_out = outname,
                         quantity = quantityname,
-                        timestep = timestep,
+                        #timestep = timestep,
                         cellsize = cellsize,      
                         easting_min = easting_min,

anuga_work/production/busselton/get_timeseries.py

@@ -18 +18 @@
 #timestamp='20080724_121200_run_trial_0.6_polyline_alpha0.1_kvanputt'
 #timestamp='20080724_161830_run_final_0.6_polyline_alpha0.1_kvanputt'
-timestamp='20080804_044523_run_final_0.0_polyline_alpha0.1_kvanputt'
+timestamp='20080807_102253_run_final_0.0_polyline_newExtent_kvanputt'
 
 filename=project.output_dir+timestamp+sep+project.scenario_name+'.sww'

anuga_work/production/busselton/project.py

@@ -35 +35 @@
 scenario = 'busselton_tsunami_scenario'
 
-tide = 0.0 #0.6
+tide = 0.6
 
 alpha = 0.1 
@@ -92 +92 @@
 offshore_name2 = 'Busselton_Digitised'
 offshore_name3 = 'Busselton_250m' # for areas that were heading to zero - 2005 Bathymetry grid
+offshore_name4 = 'Bunbury_TIN' # for area within Bunbury 500 mesh less than zero generated from TIN
+offshore_name5 = 'Busselton_TIN' # for area within Busselton 500 mesh less than zero generated from TIN
 
 
@@ -113 +115 @@
 offshore_in_dir_name2 = topographies_in_dir + offshore_name2 #Digitised Fairsheet
 offshore_in_dir_name3 = topographies_in_dir + offshore_name3 #250m
+offshore_in_dir_name4 = topographies_in_dir + offshore_name4 #Bunbury TIN
+offshore_in_dir_name5 = topographies_in_dir + offshore_name5 #Busselton TIN
 
 #output to anuga from build file
@@ -124 +128 @@
 offshore_dir_name2 = topographies_dir + offshore_name2
 offshore_dir_name3 = topographies_dir + offshore_name3
+offshore_dir_name4 = topographies_dir + offshore_name4
+offshore_dir_name5 = topographies_dir + offshore_name5
 
 #final topo files
@@ -160 +166 @@
 #gauges
 gauge_name = 'busselton.csv'
-gauge_name2 = 'thinned_MGA50+1.csv'
+gauge_name2 = 'thinned_MGA50+1-1.csv'
 
 gauges_dir = home+state+sep+scenario+sep+'anuga'+sep+'gauges'+sep
@@ -191 +197 @@
 res_bunbury = 500*res_factor
 
-poly_dunsborough = read_polygon(polygons_dir+'dunsborough_1km.csv')
-res_dunsborough = 500*res_factor
-
 poly_busselton2 = read_polygon(polygons_dir+'busselton_2km.csv')
 res_busselton2 = 10000*res_factor
@@ -200 +203 @@
 res_bunbury2 = 10000*res_factor
 
+poly_island1 = read_polygon(polygons_dir+'island1.csv')
+res_island1 = 10000*res_factor
+
+poly_island2 = read_polygon(polygons_dir+'island2.csv')
+res_island2 = 10000*res_factor
+
 
 interior_regions = [[poly_large,res_large],[poly_busselton,res_busselton],[poly_bunbury,res_bunbury]
-                    ,[poly_dunsborough,res_dunsborough],[poly_busselton2,res_busselton2]
-                    ,[poly_bunbury2,res_bunbury2]]
+                    ,[poly_busselton2,res_busselton2],[poly_bunbury2,res_bunbury2]
+                    ,[poly_island1, res_island1],[poly_island2, res_island2]]
 
 

anuga_work/production/onslow_2008/build_onslow.py

@@ -65 +65 @@
 offshore_in_dir_name1 = project.offshore_in_dir_name1
 offshore_in_dir_name2 = project.offshore_in_dir_name2
-ffshore_in_dir_name3 = project.offshore_in_dir_name3
+offshore_in_dir_name3 = project.offshore_in_dir_name3
 offshore_in_dir_name4 = project.offshore_in_dir_name4
 
@@ -94 +94 @@
 
 #creates pts file for island DEM
+dem2pts(onshore_dir_name, use_cache=True, verbose=True)
 dem2pts(island_dir_name, use_cache=True, verbose=True)
-dem2pts(island_dir_name1, use_cache=True, verbose=True)
+
 
 print'create Geospatial data1 objects from topographies'

anuga_work/production/perth/export_results_all.py

@@ -7 +7 @@
 #time_dir = '20080526_104946_run_final_0.6_test_kvanputt'
 #time_dir = '20080530_170833_run_final_0.6_exmouth_kvanputt'
-time_dir = '20080619_115643_run_trial_0.6_exmouth_kvanputt'
+time_dir = '20080807_134943_run_final_0.0_polyline_alpha0.1_kvanputt'
 
 
 
-cellsize = 10
+cellsize = 5
 #cellsize = 150
-timestep = 0
+#timestep = 0
 directory = project.output_dir
 name = directory+time_dir+sep+project.scenario_name
@@ -53 +53 @@
         northing_max = project.ymaxRockingham
 
-   # var = [2,3,4] # depth and speed
-#var = [2] # depth
-    var = [0,4]
+    var = [2,3] # depth and speed
+    #var = [2] # depth
+    #var = [0,4]
 
     for which_var in var:
@@ -99 +99 @@
             sww2dem(name, basename_out = outname,
                         quantity = quantityname,
-                        timestep = timestep,
+                        #timestep = timestep,
                         cellsize = cellsize,      
                         easting_min = easting_min,

anuga_work/production/perth/get_timeseries.py

@@ -18 +18 @@
 #timestamp='20080724_121200_run_trial_0.6_polyline_alpha0.1_kvanputt'
 #timestamp='20080724_161830_run_final_0.6_polyline_alpha0.1_kvanputt'
-timestamp='20080804_044523_run_final_0.0_polyline_alpha0.1_kvanputt'
+timestamp='20080807_134943_run_final_0.0_polyline_alpha0.1_kvanputt'
 
 filename=project.output_dir+timestamp+sep+project.scenario_name+'.sww'

anuga_work/production/perth/project.py

@@ -38 +38 @@
 
 
-tide = 0.0 #0.6
+tide = 0.6
 
 alpha = 0.1
@@ -157 +157 @@
 #gauges
 gauge_name = 'perth.csv'
-gauge_name2 = 'thinned_MGA50+1.csv'
+gauge_name2 = 'thinned_MGA50.csv'
+
 
 gauges_dir = home+sep+state+sep+scenario+sep+'anuga'+sep+'gauges'+sep