Changeset 5626

Timestamp:

Aug 7, 2008, 3:49:36 PM (15 years ago)

Author:

kristy

Message:

Updated

Location:

anuga_work/production

Files:

• busselton/build_boundary.py (modified) (1 diff)
• busselton/project.py (modified) (1 diff)
• busselton/run_busselton.py (modified) (3 diffs)
• perth/export_results.py (modified) (1 diff)
• perth/project.py (modified) (3 diffs)
• perth/run_perth.py (modified) (1 diff)

anuga_work/production/busselton/build_boundary.py

@@ -74 +74 @@
 
 scenario_name=project.scenario_name
-order_filename=os.path.join(project.boundaries_dir, 'thinned_bound_order.txt')
+order_filename=os.path.join(project.boundaries_dir, 'thinned_bounding_order.txt')
 
 print 'reading', order_filename

anuga_work/production/busselton/project.py

@@ -160 +160 @@
 #gauges
 gauge_name = 'busselton.csv'
+gauge_name2 = 'thinned_MGA50+1.csv'
+
 gauges_dir = home+state+sep+scenario+sep+'anuga'+sep+'gauges'+sep
 gauges_dir_name = gauges_dir + gauge_name
+gauges_dir_name2 = gauges_dir + gauge_name2
 
 buildings_filename = gauges_dir + 'Busselton_res_Project.csv'

anuga_work/production/busselton/run_busselton.py

@@ -115 +115 @@
     #barrier()
     
-         covariance_value,alpha = find_optimal_smoothing_parameter (data_file= kwargs['elevation_file'],
-                                alpha_list=[0.001, 0.01, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4, 0.5],
-                                mesh_file = project.meshes_dir_name+'.msh')
-        print 'optimal alpha', covariance_value,alpha       
+##        covariance_value,alpha = find_optimal_smoothing_parameter (data_file = kwargs['bathy_file'],
+##                                    alpha_list=[0.001, 0.01, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4, 0.5],
+##                                    mesh_file = project.meshes_dir_name+'.msh')
+##        print 'optimal alpha', covariance_value,alpha       
 
     #-------------------------------------------------------------------------
@@ -189 +189 @@
     
     print 'Available boundary tags', domain.get_boundary_tags()
-    Bf = File_boundary(boundary_urs_out+'.sts', # Change from file_boundary
-                   domain, mean_stage= project.tide,
+    Bf = Field_boundary(boundary_urs_out+'.sts', # Change from file_boundary
+                   domain, mean_stage=project.tide,
                    time_thinning=1,
                    use_cache=True,
-                   verbose = True)
-                   #boundary_polygon=bounding_polygon)
+                   verbose = True,
+                   boundary_polygon=bounding_polygon)
     
     Br = Reflective_boundary(domain)
@@ -251 +251 @@
     kwargs['output_dir']=project.output_run_time_dir
     kwargs['bathy_file']=project.combined_dir_name+'.txt'
-  kwargs['file_name']=project.home+'detail.csv'
+    kwargs['file_name']=project.home+'detail.csv'
     kwargs['aa_scenario_name']=project.scenario_name
     kwargs['ab_time']=project.time

anuga_work/production/perth/export_results.py

@@ -13 +13 @@
 #time_dir = '20080725_173911_run_final_0.6_polyline_alpha0.1_kvanputt'
 #time_dir = '20080728_112519_run_final_0.6_polyline_alpha0.2_kvanputt'
-time_dir = '20080728_154123_run_final_0.6_polyline_alpha0.15_kvanputt'
+time_dir = '20080807_134943_run_final_0.0_polyline_alpha0.1_kvanputt'
 
 cellsize = 25

anuga_work/production/perth/project.py

@@ -157 +157 @@
 #gauges
 gauge_name = 'perth.csv'
-gauge_name2 = 'thinned_MGA50+50.csv'
+gauge_name2 = 'thinned_MGA50+1.csv'
 
 gauges_dir = home+sep+state+sep+scenario+sep+'anuga'+sep+'gauges'+sep
@@ -211 +211 @@
 res_sorrento_gauge = 500*res_factor
 
+#Polygon designed to incorporate Dredge Area from Fremantle to
+#Rockingham the steep incline was making the mesh go to 0
+poly_dredge = read_polygon(polygons_dir+'DredgeArea.csv')
+res_dredge = 1000*res_factor
 
 #assert zone == refzone
@@ -218 +222 @@
                      ,[poly_rockingham,res_rockingham],[poly_geordie_bay,res_geordie_bay]
                      ,[poly_sorrento_gauge,res_sorrento_gauge],[poly_rottnest_in, res_rottnest_in]
-                     ,[poly_rottnest_ex, res_rottnest_ex], [poly_garden, res_garden]]
+                     ,[poly_rottnest_ex, res_rottnest_ex], [poly_garden, res_garden]
+                     ,[poly_dredge, res_dredge]]
 
     

anuga_work/production/perth/run_perth.py

@@ -210 +210 @@
                    time_thinning=1,
                    use_cache=True,
-                   verbose = True)
-                  # boundary_polygon=bounding_polygon)
+                   verbose = True,
+                   boundary_polygon=bounding_polygon)
 
     Br = Reflective_boundary(domain)