Changeset 5381

Timestamp:

May 30, 2008, 10:52:58 AM (16 years ago)

Author:

kristy

Message:

update scripts

Location:

anuga_work/production

Files:

• busselton/build_busselton.py (modified) (2 diffs)
• busselton/project.py (modified) (4 diffs)
• busselton/run_busselton.py (modified) (6 diffs)
• carnarvon/project.py (modified) (4 diffs)
• geraldton/project.py (modified) (3 diffs)
• onslow_2006/export_results.py (modified) (2 diffs)
• onslow_2006/run_onslow_grad.py (modified) (5 diffs)
• perth/project.py (modified) (1 diff)

anuga_work/production/busselton/build_busselton.py

@@ -72 +72 @@
 print "creates DEMs from ascii data"
 convert_dem_from_ascii2netcdf(onshore_in_dir_name, basename_out=onshore_dir_name, use_cache=True, verbose=True)
-#convert_dem_from_ascii2netcdf(island_in_dir_name, basename_out=island_dir_name, use_cache=True, verbose=True)
 
 #creates pts file for onshore DEM
@@ -111 +110 @@
 #G_all=Geospatial_data(file_name = project.combined_dir_name + '.txt')
 print'split'
-G_all_1, = G.split(.10)
+G_all_1 = G.split(.10)
 print'export 1'
 G_all_1.export_points_file(project.combined_dir_name+'_small' + '.txt')

anuga_work/production/busselton/project.py

@@ -72 +72 @@
 # AHO + DPI data
 coast_name = 'coastline_excluding_beach_survey'
-coast_name1 = 'beach_survey_final'
-offshore_name = 'busselton'
+coast_name1 = 'bussleton_beach_data'
+offshore_name = 'Busselton_bathymetry'
 
 #final topo name
@@ -84 +84 @@
 topographies_dir = home+state+sep+scenario+sep+'anuga'+sep+'topographies'+sep
 
-#input topo file location
-onshore_in_dir_name = topographies_in_dir + onshore_name
-#island_in_dir_name = topographies_in_dir + island_name
+# input topo file location
+onshore_in_dir_name = topographies_in_dir + onshore_name #topo
 
-coast_in_dir_name = topographies_in_dir + coast_name
-coast_in_dir_name1 = topographies_in_dir + coast_name1
-offshore_in_dir_name = topographies_in_dir + offshore_name
+coast_in_dir_name = topographies_in_dir + coast_name #coastline
+coast_in_dir_name1 = topographies_in_dir + coast_name1 #beach survey
+offshore_in_dir_name = topographies_in_dir + offshore_name #bathymetry
 
+#output to anuga from build file
 onshore_dir_name = topographies_dir + onshore_name
-#island_dir_name = topographies_dir + island_name
+
 coast_dir_name = topographies_dir + coast_name
 coast_dir_name1 = topographies_dir + coast_name1
@@ -177 +177 @@
 res_busselton1 = 10000*res_factor
 
-poly_busselton2 = read_polygon(polygons_dir+'neg5_pos5_poly_.csv')
+poly_busselton2 = read_polygon(polygons_dir+'neg5_pos5_poly.csv')
 res_busselton2 = 500*res_factor
 
@@ -183 +183 @@
 
 interior_regions = [[poly_busselton1,res_busselton1],[poly_busselton2,res_busselton2]]
+print 'Hello',interior_regions
 
-boundary_tags={'back': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15],
-               'side': [10, 14], 'ocean': [11, 12, 13]}
+boundary_tags={'back': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 14],
+               'side': [10], 'ocean': [11, 12, 13]}
 
 trigs_min = number_mesh_triangles(interior_regions, poly_all, res_poly_all)
 
-poly_mainland=read_polygon(polygons_dir+'initial_condition_south.csv')
+poly_mainland=read_polygon(topographies_in_dir+'initial_condition_south.csv')
 
 print 'min number triangles', trigs_min

anuga_work/production/busselton/run_busselton.py

@@ -87 +87 @@
     
         print 'start create mesh from regions'
-
+        
         create_mesh_from_regions(project.poly_all,
                              boundary_tags=project.boundary_tags,
@@ -94 +94 @@
                              filename=project.meshes_dir_name+'.msh',
                              use_cache=False,
-                             verbose=True)
+                             verbose=False)
     barrier()
     
@@ -175 +175 @@
     Bo = Dirichlet_boundary([kwargs['tide']+10.0,0,0])
 
-    if project.source != 'other':
+    if project.source != 'test':
+        print 'start reading boundary file'
+        
         Bf = Field_boundary(kwargs['boundary_file'],
                     domain, time_thinning=kwargs['time_thinning'], mean_stage=kwargs['tide'], 
@@ -189 +191 @@
                              'ocean': Bd}) 
 
-#    kwargs['input_start_time']=domain.starttime
+    kwargs['input_start_time']=domain.starttime
 
     print'finish set boundary'
@@ -198 +200 @@
     t0 = time.time()
 
-    for t in domain.evolve(yieldstep = 240, finaltime = kwargs['finaltime']): 
+    for t in domain.evolve(yieldstep = 240, finaltime = kwargs['starttime']): 
         domain.write_time()
         domain.write_boundary_statistics(tags = 'ocean')     
@@ -298 +300 @@
         export_model(**kwargs)
     barrier
+    

anuga_work/production/carnarvon/project.py

@@ -31 +31 @@
 #Making assumptions about the location of scenario data
 state = 'western_australia'
-scenario_name = 'busselton'
-scenario = 'busselton_tsunami_scenario_2006'
+scenario_name = 'carnarvon'
+scenario = 'carnarvon_tsunami_scenario'
 
 #Maybe will try to make project a class to allow these parameters to be passed in.
@@ -73 +73 @@
 
 #final topo name
-combined_name ='busselton_combined_elevation.pts'
-combined_smaller_name = 'busselton_combined_elevation_smaller'
+combined_name ='carnarvon_combined_elevation.pts'
+combined_smaller_name = 'carnarvon_combined_elevation_smaller'
 
 anuga_dir = home+state+sep+scenario+sep+'anuga'+sep
@@ -137 +137 @@
 gauges_dir_name = gauges_dir + gauge_name
 
-buildings_filename = gauges_dir + 'Busselton_res_Project.csv'
-buildings_filename_out = 'Busselton_res_Project_modified.csv'
+buildings_filename = gauges_dir + 'carnarvon_res_Project.csv'
+buildings_filename_out = 'carnarvon_res_Project_modified.csv'
 
 community_filename = gauges_dir +''
@@ -169 +169 @@
 
 #digitized polygons
-poly_busselton1 = read_polygon(polygons_dir+'neg20_pos10_polygon.csv')
-res_busselton1 = 10000*res_factor
-poly_busselton2 = read_polygon(polygons_dir+'neg5_pos5_poly_.csv')
-res_busselton2 = 500*res_factor
+poly_carnarvon1 = read_polygon(polygons_dir+'neg20_pos10_polygon.csv')
+res_carnarvon1 = 10000*res_factor
+poly_carnarvon2 = read_polygon(polygons_dir+'neg5_pos5_poly_.csv')
+res_carnarvon2 = 500*res_factor
 
 #plot_polygons([polyAll,poly_broome1,poly_broome2,poly_broome3],figname='boundingpoly2',verbose=False)
 
-interior_regions = [[poly_busselton1,res_busselton1],[poly_busselton2,res_busselton2]]
+interior_regions = [[poly_carnarvon1,res_carnarvon1],[poly_carnarvon2,res_carnarvon2]]
 
 boundary_tags={'back': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 14],

anuga_work/production/geraldton/project.py

@@ -104 +104 @@
 tide_dir = anuga_dir+'tide_data'+sep
 
-if source =='dampier':
-    boundaries_name = 'broome_3854_17042007' #Dampier gun
-    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'dampier'+sep+'1_10000'+sep
-
-if source=='onslow':
-    boundaries_name = 'broome_3859_16052007' #onslow_hedland_broome gun
-    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'onslow_hedland_broome'+sep+'1_10000'+sep
-    
-if source=='exmouth':
-    boundaries_name = 'broome_3103_18052007' #exmouth gun
-    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'exmouth'+sep+'1_10000'+sep
-
-if source=='other':
-    boundaries_name = 'other' #exmouth gun
-    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'exmouth'+sep+'1_10000'+sep
-
-
-#boundaries locations
-boundaries_in_dir_name = boundaries_in_dir + boundaries_name
+##if source =='dampier':
+##    boundaries_name = 'broome_3854_17042007' #Dampier gun
+##    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'dampier'+sep+'1_10000'+sep
+##
+##if source=='onslow':
+##    boundaries_name = 'broome_3859_16052007' #onslow_hedland_broome gun
+##    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'onslow_hedland_broome'+sep+'1_10000'+sep
+##    
+##if source=='exmouth':
+##    boundaries_name = 'broome_3103_18052007' #exmouth gun
+##    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'exmouth'+sep+'1_10000'+sep
+##
+##if source=='other':
+##    boundaries_name = 'other' #exmouth gun
+##    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'exmouth'+sep+'1_10000'+sep
+##
+##
+###boundaries locations
+##boundaries_in_dir_name = boundaries_in_dir + boundaries_name
+boundaries_in_dir_name = anuga_dir + sep + 'boundaries' + sep + scenario_name + '49'
 boundaries_dir = anuga_dir+'boundaries'+sep
 boundaries_dir_name = boundaries_dir + scenario_name
@@ -168 +169 @@
 #digitized polygons
 # bounding polygon for study area
-poly_all = read_polygon(polygons_dir+'extent_new_points.csv')
+poly_all = read_polygon(polygons_dir+'poly_all_z50.csv')
 res_poly_all = 100000*res_factor
 
@@ -177 +178 @@
 res_neg10_pos10 = 2000*res_factor
 
-poly_cbd = read_polygon(polygons_dir+'cbd_points.csv')
+poly_cbd = read_polygon(polygons_dir+'cbd_500m.csv')
 res_cbd = 500*res_factor
 

anuga_work/production/onslow_2006/export_results.py

@@ -19 +19 @@
 #time_dir = '20070904_235118_run_final_1.5_jsexton_exmouth_original' # revised model original data
 #time_dir = '20070905_052311_run_final_1.5_jsexton_exmouth_revised' # revised model original + survey data
-time_dir = '20070906_061418_run_final_1.5_jsexton_exmouth_original' # refined again
+#time_dir = '20070906_061418_run_final_1.5_jsexton_exmouth_original' # refined again
 #time_dir = '20070907_055936_run_final_1.5_jsexton_exmouth_revised' # refined again
-cellsize = 50
+time_dir = '20080526_043334_run_final_1.5_kvanputt_exmouth_revised' # New
+cellsize = 25
 #cellsize = 150
 timestep = None
@@ -43 +44 @@
 print 'output dir:', name
 
-#var = [2,3,4] # depth and speed
+var = [2,3,4] # depth and speed
 #var = [2] # depth
 #var = [4]
-var = [0]
+#var = [0]
 
 for which_var in var:

anuga_work/production/onslow_2006/run_onslow_grad.py

@@ -106 +106 @@
                                  interior_regions=project_grad.interior_regions,
                                  filename=project_grad.mesh_name+'.msh',
-                                 use_cache=False,
+                                 use_cache=True,
                                  verbose=True)
 
@@ -117 +117 @@
     #above don't work
     domain = Domain(project_grad.mesh_name+'.msh',
-                    use_cache=False, verbose=True)
+                    use_cache=True, verbose=True)
      
     print domain.statistics()
@@ -150 +150 @@
                             use_cache = True,
                             verbose = True,
-                            alpha = alpha)
+                            alpha = project_grad.alpha)
         
 
@@ -173 +173 @@
     print 'domain id', id(domain)
     domain.beta_h = 0
-    #domain.tight_slope_limiters = 1
+    domain.tight_slope_limiters = 0
     
 
@@ -187 +187 @@
                         time_thinning=time_thinning,
                         mean_stage=tide,
-                        use_cache=False,
+                        use_cache=True,
                         verbose=True)
                     

anuga_work/production/perth/project.py

@@ -155 +155 @@
 gauges_dir_name = gauges_dir + gauge_name
 
-buildings_filename = gauges_dir + 'Perth_res_Project.csv'
+buildings_filename = gauges_dir + 'Perth_resA.csv'
 buildings_filename_out = 'Perth_res_Project_modified.csv'