Changeset 6498

Timestamp:

Mar 12, 2009, 10:57:08 AM (16 years ago)

Author:

jgriffin

Message:

changed event number; added Arc_asc2raster_GDA94z56.py

Location:

anuga_work/production/australia_ph2/sydney

Files:

• Arc_asc2raster_GDA94z56.py (modified) (2 diffs)
• comparisons/export_results_max.py (modified) (2 diffs)
• comparisons/project_250m.py (modified) (2 diffs)
• comparisons/project_250m.pyc (modified) (previous)
• comparisons/run_sydney_250m.py (modified) (1 diff)
• export_results_max.py (modified) (6 diffs)
• project.py (modified) (2 diffs)

anuga_work/production/australia_ph2/sydney/Arc_asc2raster_GDA94z56.py

@@ -31 +31 @@
 ##time_dir1 = '20081031_133353_run_final_0.6_68693_alpha0.1_kvanputt'
 ##time_dir2 = '20081031_133511_run_final_0_68693_alpha0.1_kvanputt'
-time_dir3 = '20090130_160955_run_final_0_7875_250m_vlarge_jgriffin'
+time_dir3 = '20090211_135851_run_final_0_7875_jgriffin'
 #time_dir4 = '20090123_154945_run_final_0_7875_250m_small_jgriffin'
 ##time_dir5 = '20081031_133841_run_final_0_27283_alpha0.1_kvanputt'
@@ -62 +62 @@
 
     generate_filename = []
-    input_ascii = glob.glob(folder + '*stage_max.asc')
+    input_ascii = glob.glob(folder + '*max.asc')
     print time_dir
 

anuga_work/production/australia_ph2/sydney/comparisons/export_results_max.py

@@ -20 +20 @@
 directory = project_250m.output_dir
 
-time_dir1 = '20090206_152643_run_final_0_250m_large_jgriffin'
+time_dir1 = '20090210_162935_run_final_0_250m_vlarge_jgriffin'
 #time_dir2 = '20090123_155045_run_final_0_7875_250m_large_jgriffin'
 #time_dir3 = '20090123_154945_run_final_0_7875_250m_small_jgriffin'
@@ -80 +80 @@
 
             name1 = directory+time_dir+sep+project_250m.scenario_name
-  
-            names = [name1]
+            name2 = directory+time_dir+sep+project_250m.scenario_name+'_time_16680_0'
+            name3 = directory+time_dir+sep+project_250m.scenario_name+'_time_33360_0'
+            name4 = directory+time_dir+sep+project_250m.scenario_name+'_time_50040_0'
+            name5 = directory+time_dir+sep+project_250m.scenario_name+'_time_66720_0' 
+
+            names = [name1, name2 , name3, name4, name5]
       
             asc_name = []   

anuga_work/production/australia_ph2/sydney/comparisons/project_250m.py

@@ -40 +40 @@
 scenario_name = 'sydney'
 scenario = 'sydney'
-area = 'vlarge' #'small_b10'
+area = 'large' #'small_b10'
 
 # Model specific parameters. One or all can be changed each time the
@@ -104 +104 @@
 # Used in run_model.py
 # Format for points easting,northing (no header)                    
-interior_regions_data = [['coast_3km_buffer_' + area + '.csv', 10000]]
+interior_regions_data = [['coast_3km_buffer_' + area + '.csv', 50000]]
 
 #------------------------------------------------------------------------------

anuga_work/production/australia_ph2/sydney/comparisons/run_sydney_250m.py

@@ -221 +221 @@
 
     domain.set_boundary({'back': Br,
-                         'side1': Bt,
-                         'side2':Bt,
+                         'side1': Bd,
+                         'side2':Bd,
                          'ocean':Rb}) 
 

anuga_work/production/australia_ph2/sydney/export_results_max.py

@@ -2 +2 @@
 Generates ascii grids of nominated areas -
 Input: sww file from run_pt_hedland.py
-       boundaries for grids from project_250m.py
+       boundaries for grids from project.py
 Outputs: ascii grids of specified variables
 Stored in the 'outputs_dir' folder for respective .sww file
@@ -11 +11 @@
 """
 
-import project_250m, os
+import project, os
 import sys
 from anuga.lib.maxasc.maxasc import MaxAsc
@@ -17 +17 @@
 from anuga.shallow_water.data_manager import sww2dem
 from os import sep
+from os.path import join
 
-directory = project_250m.output_dir
+directory = project.output_folder
+print directory
 
-time_dir1 = '20090206_150250_run_final_0_250m_large_jgriffin'
-#time_dir2 = '20090123_155045_run_final_0_7875_250m_large_jgriffin'
+time_dir1 = '20090311_145740_run_final_0_58152_2956_Tb_jgriffin'
+time_dir2 = '20090311_145828_run_final_0_58152_2956_Bf_jgriffin'
 #time_dir3 = '20090123_154945_run_final_0_7875_250m_small_jgriffin'
-time_dirs = [time_dir1]#,time_dir2,time_dir3]#, time_dir2, time_dir3, time_dir4, time_dir5, time_dir6]
+time_dirs = [time_dir1,time_dir2]#,time_dir2,time_dir3]#, time_dir2, time_dir3, time_dir4, time_dir5, time_dir6]
 
 #cellsize = 20
@@ -69 +71 @@
         else:
             try:
-                easting_min = eval('project_250m.xmin%s' % which_area)
-                easting_max = eval('project_250m.xmax%s' % which_area)
-                northing_min = eval('project_250m.ymin%s' % which_area)
-                northing_max = eval('project_250m.ymax%s' % which_area)
+                easting_min = eval('project.xmin%s' % which_area)
+                easting_max = eval('project.xmax%s' % which_area)
+                northing_min = eval('project.ymin%s' % which_area)
+                northing_max = eval('project.ymax%s' % which_area)
             except AttributeError:
                 print 'Unrecognized area name: %s' % which_area
@@ -79 +81 @@
         for time_dir in time_dirs:
 
-            name1 = directory+time_dir+sep+project_250m.scenario_name
-            #name2 = directory+time_dir+sep+project_250m.scenario_name+'_time_52620_0'
-           # name3 = directory+time_dir+sep+project_250m.scenario_name+'_time_78360_0'
+            name1 = join(directory, time_dir, project.scenario_name)
+            name2 = join(directory, time_dir, project.scenario_name)+'_time_66360_0'
+            #name3 = join(directory, time_dir, project.scenario_name)+'_time_33360_0'
+            #name4 = join(directory, time_dir, project.scenario_name)+'_time_50040_0'
+            #name5 = join(directory, time_dir, project.scenario_name)+'_time_66720_0'
 
-            names = [name1]#, name2] #, name3]
+            names = [name1, name2]# , name3, name4, name5]
       
             asc_name = []   
@@ -108 +112 @@
                 asc_name.append(outname + '.asc')
     
-            maxasc_outname = directory+time_dir+sep+project_250m.scenario_name+'_'+which_area+'_'+which_var+'_max.asc'
+            maxasc_outname = directory+time_dir+sep+project.scenario_name+'_'+which_area+'_'+which_var+'_max.asc'
 
             print 'max asc outname ', maxasc_outname

anuga_work/production/australia_ph2/sydney/project.py

@@ -29 +29 @@
 tide = 0                # difference between MSL and HAT
 zone = 50               # specify zone of model
-event_number = 6368    # the event number or the mux file name
+event_number = 58326    # the event number or the mux file name
 alpha = 0.1             # smoothing parameter for mesh
 friction=0.01           # manning's friction coefficient
@@ -36 +36 @@
 
 # index is only used when wave = Tb
-index = 2971            # index from the PTHA
-wave = 'Tb'             # Bf (sts wave) Tb (index wave)
+index = 2956            # index from the PTHA
+wave = 'Bf'             # Bf (sts wave) Tb (index wave)
 
 setup = 'final'         # This can be one of three values