Changeset 4559

Timestamp:

Jun 25, 2007, 4:13:16 PM (17 years ago)

Author:

nick

Message:

update Broome

Location:

anuga_work/production/broome_2006

Files:

• build_broome.py (modified) (5 diffs)
• project_urs.py (modified) (5 diffs)
• project_urs.pyc (modified) (previous)
• run_broome_urs.py (modified) (3 diffs)

anuga_work/production/broome_2006/build_broome.py

@@ -68 +68 @@
 offshore_dir_name1 = project_urs.offshore_dir_name1
 offshore_dir_name2 = project_urs.offshore_dir_name2
-'''
+
 # creates DEM from asc data
 print "creates DEMs from asc data"
@@ -109 +109 @@
 if access(project_urs.topographies_dir,F_OK) == 0:
     mkdir (project_urs.topographies_dir)
-print'export',project_urs.combined_dir_name+'_unclipped' + '.txt'
-G.export_points_file(project_urs.combined_dir_name+'_unclipped' + '.txt')
+print'export',project_urs.combined_dir_name+ '.txt'
+G.export_points_file(project_urs.combined_dir_name+ '.txt')
 
 print'split'
@@ -123 +123 @@
 
 
-
+'''
 print'project_urs.combined_dir_name + 1.xya',project_urs.combined_dir_name + '1.xya'
 G_all=Geospatial_data(file_name = project_urs.combined_dir_name + '1.xya')
@@ -133 +133 @@
 G_all_2.export_points_file(project_urs.combined_dir_name+'_other1' + '.xya')
 
-'''
+
 #-------------------------------------------------------------------------
 # Convert URS to SWW file for boundary conditions 
@@ -146 +146 @@
 
 
+'''
 
 
 
-

anuga_work/production/broome_2006/project_urs.py

@@ -32 +32 @@
 
 #tide = -5.3
-#tide = 0
-tide = 4.9
+tide = 0
+#tide = 4.9
 
 #Maybe will try to make project a class to allow these parameters to be passed in.
@@ -70 +70 @@
 
 #final topo name
-combined_name ='broome_combined_elevation'
+combined_name ='broome_combined_elevation_z51'
 combined_name1 ='broome_combined_elevation1'
 combined_name_unclipped1 ='broome_combined_elevation_unclipped1'
@@ -124 +124 @@
 output_dir = anuga_dir+'outputs'+sep
 output_build_time_dir = output_dir+build_time+'_'+source+sep
-output_run_time_dir = output_dir +run_time+dir_comment+sep
-#output_run_time_dir = output_dir +'20070605_234438_run_final_0_exmouth_nbartzis'+sep
+#output_run_time_dir = output_dir +run_time+dir_comment+sep
+output_run_time_dir = output_dir +'20070622_004008_run_final_0_onslow_nbartzis'+sep
 output_run_time_dir_name = output_run_time_dir + scenario_name  #Used by post processing
 
@@ -163 +163 @@
 
 #poly_3 = read_polygon(polygons_dir+'Broome_town_pts.csv')
-poly_3 = read_polygon(polygons_dir+'broome_town_new_pts.csv')
+poly_3 = read_polygon(polygons_dir+'broome_town_new_ptsa.csv')
 res_3 = 2000*res_factor
 
 #poly_4 = read_polygon(polygons_dir+'Broome_inner_town_pts.csv')
-poly_4 = read_polygon(polygons_dir+'broome_inner_town_pts.csv')
+poly_4 = read_polygon(polygons_dir+'broome_inner_town_new_ptsa.csv')
 res_4 = 500*res_factor
 
@@ -188 +188 @@
 northingmin = 8007000.0
 northingmax = 8022000.0
+
+# exporting asc grid for speed
+#eastingmin = 412900.0
+#eastingmax = 422700.0
+#northingmin = 8008555.0
+#northingmax = 8021350.0

anuga_work/production/broome_2006/run_broome_urs.py

@@ -50 +50 @@
     # output to file
     #------------------------------------------------------------------------------
+    print "Processor Name:",get_processor_name()
 
     #copy script must be before screen_catcher
@@ -66 +67 @@
     kwargs['boundary_file']=project_urs.boundaries_in_dir_name + '.sww'
     
+    start_screen_catcher(kwargs['output_dir'], myid, numprocs,extra_info='export',print_to_screen=True)
+    '''
     print 'output_dir',kwargs['output_dir']
     if myid == 0:
@@ -226 +229 @@
     #kwargs 'completed' must be added to write the final parameters to file
     kwargs['completed']=str(time.time()-t0)
-    if myid == 0:
-        store_parameters(**kwargs)
+    
+    '''
+    if myid == 0:
+#        store_parameters(**kwargs)
         
         print 'memory usage before del domain',mem_usage()
-        del domain
+        #del domain
         print 'memory usage after del domain',mem_usage()
     
         swwfile = kwargs['output_dir']+kwargs['aa_scenario_name']
+        print'swwfile',swwfile
+        
         export_grid(swwfile, extra_name_out = 'town',
-                quantities = ['elevation','stage','speed'], # '(xmomentum**2 + ymomentum**2)**0.5' defaults to elevation
+                quantities = ['speed','depth','elevation','stage'], # '(xmomentum**2 + ymomentum**2)**0.5' defaults to elevation
+#                quantities = ['speed','depth'], # '(xmomentum**2 + ymomentum**2)**0.5' defaults to elevation
                 timestep = None,
                 reduction = max,