Changeset 4504

Timestamp:

May 28, 2007, 6:08:39 PM (16 years ago)

Author:

sexton

Message:

minor change to inundation_damage + updates to damage scripts for all scenarios

Files:

• anuga_core/source/anuga/damage_modelling/inundation_damage.py (modified) (1 diff)
• anuga_core/source/anuga/shallow_water/smf.py (modified) (1 diff)
• anuga_work/production/broome_2006/export_results.py (modified) (3 diffs)
• anuga_work/production/broome_2006/run_building_inundation.py (modified) (1 diff)
• anuga_work/production/dampier_2006/project.py (modified) (1 diff)
• anuga_work/production/dampier_2006/run_building_inundation.py (modified) (1 diff)
• anuga_work/production/exmouth_2006/run_building_inundation.py (modified) (1 diff)
• anuga_work/production/onslow_2006/export_results.py (modified) (3 diffs)
• anuga_work/production/onslow_2006/project.py (modified) (1 diff)
• anuga_work/production/onslow_2006/run_building_inundation.py (modified) (1 diff)
• anuga_work/production/pt_hedland_2006/export_results.py (modified) (4 diffs)
• anuga_work/production/pt_hedland_2006/run_building_inundation.py (modified) (1 diff)
• anuga_work/production/wollongong_2006/get_timeseries.py (added)
• anuga_work/production/wollongong_2006/project_slide.py (modified) (1 diff)

anuga_core/source/anuga/damage_modelling/inundation_damage.py

@@ -141 +141 @@
     interate_over = [x for x in dir_ls if base in x and x[-4:] == '.sww']
     #print "interate_over", interate_over
-
+    from os import sep
     for this_sww_file in interate_over:
-        callable_sww = file_function(this_sww_file,
+        callable_sww = file_function(dir+sep+this_sww_file,
                                      quantities=quantities,
                                      interpolation_points=points,

anuga_core/source/anuga/shallow_water/smf.py

@@ -366 +366 @@
         for i in range(N):
             try:
+                if i == 10: print 'hello', x[i], x0, xr[i]
                 z[i] =  -(am/am2) / (amin*(cosh(kappa*(yr[i]-y0)/(wi+wa)))**2) \
                             * (exp(-((xr[i]-x0)/wa)**2) - \

anuga_work/production/broome_2006/export_results.py

@@ -1 @@
-import project, os
+import project_urs, os
 import sys
 
@@ -5 +5 @@
 from os import sep
 
-time_dir = '20070423_040235_run' #
+#time_dir = '20070423_040235_run' #
+#time_dir = '20070509_015227_run_final_4.9_nbartzis' # HAT 1 in 10000 yr wave height for Dampier
+time_dir = '20070518_060438_run_final_0_nbartzis' # MSL 1 in 10000 yr wave height for Dampier
 cellsize = 25
 timestep = None
-directory = project.output_dir
+directory = project_urs.output_dir
 #name = directory + time_dir + sep + project.scenario_name
-name = directory+time_dir+sep+project.scenario_name
+name = directory+time_dir+sep+project_urs.scenario_name
 
 is_parallel = True
@@ -16 +18 @@
 print 'output dir:', name
 
-which_var = 2
-if which_var == 0:  # Stage
-    outname = name + '_stage'
-    quantityname = 'stage'
+var = [2,3,4]
 
-if which_var == 1:  # Absolute Momentum
-    outname = name + '_momentum_i1'
-    quantityname = '(xmomentum**2 + ymomentum**2)**0.5'  
+for which_var in var:
+    if which_var == 0:  # Stage
+        outname = name + '_stage'
+        quantityname = 'stage'
 
-if which_var == 2:  # Depth
-    outname = name + '_depth'
-    quantityname = 'stage-elevation'  
+    if which_var == 1:  # Absolute Momentum
+        outname = name + '_momentum_i1'
+        quantityname = '(xmomentum**2 + ymomentum**2)**0.5'  
 
-if which_var == 3:  # Speed
-    outname = name + '_speed_i0'
-    quantityname = '(xmomentum**2 + ymomentum**2)**0.5/(stage-elevation+1.e-6/(stage-elevation))'  #Speed
+    if which_var == 2:  # Depth
+        outname = name + '_depth'
+        quantityname = 'stage-elevation'  
 
-if which_var == 4:  # Elevation
-    outname = name + '_elevation'
-    quantityname = 'elevation'  #Elevation
+    if which_var == 3:  # Speed
+        outname = name + '_speed'
+        quantityname = '(xmomentum**2 + ymomentum**2)**0.5/(stage-elevation+1.e-6/(stage-elevation))'  #Speed
 
+    if which_var == 4:  # Elevation
+        outname = name + '_elevation'
+        quantityname = 'elevation'  #Elevation
 
-
-if is_parallel == True:
-#    print 'is_parallel',is_parallel
-    for i in range(0,nodes):
-        namei = name + '_P%d_%d' %(i,nodes)
-        outnamei = outname + '_P%d_%d' %(i,nodes)
-        print 'start sww2dem for sww file %d' %(i)
-        sww2dem(namei, basename_out = outnamei,
+    if is_parallel == True:
+    #    print 'is_parallel',is_parallel
+        for i in range(0,nodes):
+            namei = name + '_P%d_%d' %(i,nodes)
+            outnamei = outname + '_P%d_%d' %(i,nodes)
+            print 'start sww2dem for sww file %d' %(i)
+            sww2dem(namei, basename_out = outnamei,
+                        quantity = quantityname,
+                        timestep = timestep,
+                        cellsize = cellsize,      
+                        easting_min = project_urs.e_min_area,
+                        easting_max = project_urs.e_max_area,
+                        northing_min = project_urs.n_min_area,
+                        northing_max = project_urs.n_max_area,        
+                        reduction = max, 
+                        verbose = True,
+                        format = 'asc')
+    else:
+        print 'start sww2dem'
+        sww2dem(name, basename_out = outname,
                     quantity = quantityname,
                     timestep = timestep,
                     cellsize = cellsize,      
-                    easting_min = project.e_min_area,
-                    easting_max = project.e_max_area,
-                    northing_min = project.n_min_area,
-                    northing_max = project.n_max_area,        
+                    #easting_min = project.e_min_area,
+                    #easting_max = project.e_max_area,
+                    #northing_min = project.n_min_area,
+                    #northing_max = project.n_max_area,        
                     reduction = max, 
                     verbose = True,
                     format = 'asc')
-else:
-    print 'start sww2dem'
-    sww2dem(name, basename_out = outname,
-                quantity = quantityname,
-                timestep = timestep,
-                cellsize = cellsize,      
-                easting_min = project.e_min_area,
-                easting_max = project.e_max_area,
-                northing_min = project.n_min_area,
-                northing_max = project.n_max_area,        
-                reduction = max, 
-                verbose = True,
-                format = 'asc')
+

anuga_work/production/broome_2006/run_building_inundation.py

@@ -20 +20 @@
 
 from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
-import project
+import project_urs
 
 # Inputs
-#timestampdir = '20060704_063005' # HAT
-#timestampdir = '20060704_063112' # LAT
-#timestampdir = '20060704_063234' # MSL
-timestampdir = '20060515_001733' # DTED MSL
-file_loc = project.outputdir + timestampdir + sep 
-swwfile = file_loc + project.basename + '.sww'
-buildings_filename = project.buildings_filename
-buildings_filename_out = file_loc + project.buildings_filename_out
+#timestampdir = '20070509_015227_run_final_4.9_nbartzis' # HAT
+timestampdir = '20070518_060438_run_final_0_nbartzis' # MSL
+file_loc = project_urs.output_dir + timestampdir + sep 
+swwfile = file_loc + project_urs.scenario_name #+ '.sww'
+buildings_filename = project_urs.buildings_filename
+buildings_filename_out = file_loc + project_urs.buildings_filename_out
 
 #add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)

anuga_work/production/dampier_2006/project.py

@@ -127 +127 @@
 community_KD = gauges_dir + 'community_KD.csv'
 
-#buildings_filename = gauges_dir + 'dampier_res_nexis.csv'
-buildings_filename_damage_out = 'dampier_res_nexis_modified.csv'
+buildings_filename = gauges_dir + 'Dampier_res_Project.csv'
+buildings_filename_out = 'Dampier_res_Project_modified.csv'
 ###############################
 # Domain definitions

anuga_work/production/dampier_2006/run_building_inundation.py

@@ -23 +23 @@
 
 # Inputs
-#timestampdir = '20060704_063005' # HAT
-#timestampdir = '20060704_063112' # LAT
-#timestampdir = '20060704_063234' # MSL
-timestampdir = '20060515_001733' # DTED MSL
-file_loc = project.outputdir + timestampdir + sep 
-swwfile = file_loc + project.basename + '.sww'
+#timestampdir = '20070419_065050_run' # HAT 1 in 10000 yr Dampier event
+timestampdir = '20070419_065018_run' # MSL 1 in 10000 yr Dampier event
+file_loc = project.output_dir + timestampdir + sep 
+swwfilebasename = file_loc + project.scenario_name #+ '.sww'
 buildings_filename = project.buildings_filename
 buildings_filename_out = file_loc + project.buildings_filename_out
-
-#add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
-inundation_damage(swwfile, buildings_filename, buildings_filename_out)
+print 'hello', swwfilebasename
+add_depth_and_momentum2csv(swwfilebasename, buildings_filename, buildings_filename_out)
+inundation_damage(swwfilebasename, buildings_filename, buildings_filename_out)
 
 print '\n Augmented building file written to %s \n' \

anuga_work/production/exmouth_2006/run_building_inundation.py

@@ -23 +23 @@
 
 # Inputs
-#timestampdir = '20060704_063005' # HAT
-#timestampdir = '20060704_063112' # LAT
-#timestampdir = '20060704_063234' # MSL
-timestampdir = '20060515_001733' # DTED MSL
-file_loc = project.outputdir + timestampdir + sep 
-swwfile = file_loc + project.basename + '.sww'
+#timestampdir = '' # HAT
+#timestampdir = '' # MSL
+file_loc = project.output_dir + timestampdir + sep 
+swwfile = file_loc + project.scenario_name + '.sww'
 buildings_filename = project.buildings_filename
 buildings_filename_out = file_loc + project.buildings_filename_out

anuga_work/production/onslow_2006/export_results.py

@@ -5 +5 @@
 from os import sep
 
-time_dir = '20070507_215717_run_final_1.5_nbartzis' # HAT 1 in Dampier 10000 yr
+#time_dir = '20070507_215717_run_final_1.5_nbartzis' # HAT 1 in Dampier 10000 yr
 #time_dir = '20070517_061654_run_final_0.0_nbartzis' # MSL 1 in Dampier 10000 yr
 #time_dir = '' # HAT 1 in Broome 10000 yr
@@ -15 +15 @@
 #time_dir = '' # HAT 1 in Exmouth 10000 yr
 #time_dir = '' # MSL 1 in Exmouth 10000 yr
-cellsize = 25
+time_dir = '20060704_063005' # 2006 simulation HAT Mw9
+#cellsize = 30 
+cellsize = 250
 timestep = None
 directory = project.outputdir
 #name = directory + time_dir + sep + project.scenario_name
-name = directory+time_dir+sep+project.scenario_name
+#name = directory+time_dir+sep+project.scenario_name
+name = directory+time_dir+sep+'source'
 
-is_parallel = True
+is_parallel = False
+#is_parallel = True
 if is_parallel == True: nodes = 4
 print 'output dir:', name
 
-var = [2,3,4] # depth and speed
+#var = [2,3,4] # depth and speed
+var = [3] # depth and speed
 
 for which_var in var:
@@ -71 +76 @@
                     timestep = timestep,
                     cellsize = cellsize,      
-                    easting_min = project.e_min_area,
-                    easting_max = project.e_max_area,
-                    northing_min = project.n_min_area,
-                    northing_max = project.n_max_area,        
+                    #easting_min = project.e_min_area,
+                    #easting_max = project.e_max_area,
+                    #northing_min = project.n_min_area,
+                    #northing_max = project.n_max_area,        
                     reduction = max, 
                     verbose = True,

anuga_work/production/onslow_2006/project.py

@@ -133 +133 @@
 # region to export
 
-e_min_area = 300000
-e_max_area = 310000
-n_min_area = 7600000
-n_max_area = 7610000
+e_min_area = 290500
+e_max_area = 321500
+n_min_area = 7601550
+n_max_area = 7620000
 
 # region to export to make elevation map: JS 22/9/06 - NOTE, this won't

anuga_work/production/onslow_2006/run_building_inundation.py

@@ -20 +20 @@
 
 from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
-import project
+import project_urs
 
 # Inputs
-#timestampdir = '20060704_063005' # HAT
-#timestampdir = '20060704_063112' # LAT
-#timestampdir = '20060704_063234' # MSL
-timestampdir = '20060515_001733' # DTED MSL
-file_loc = project.outputdir + timestampdir + sep 
-swwfile = file_loc + project.basename + '.sww'
-buildings_filename = project.buildings_filename
-buildings_filename_out = file_loc + project.buildings_filename_out
+#timestampdir = '20070507_215717_run_final_1.5_nbartzis' # HAT
+timestampdir = '20070518_021050_run_final_0.0_nbartzis' # MSL
+file_loc = project_urs.output_dir + timestampdir + sep 
+swwfile = file_loc + project_urs.scenario_name #+ '.sww'
+buildings_filename = project_urs.buildings_filename
+buildings_filename_out = file_loc + project_urs.buildings_filename_out
 
 #add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)

anuga_work/production/pt_hedland_2006/export_results.py

@@ -1 @@
-import project, os
+import project_urs, os
 import sys
 
@@ -5 +5 @@
 from os import sep
 
-time_dir = '' # HAT 1 in Dampier 10000 yr
-#time_dir = '' # MSL 1 in Dampier 10000 yr
+#time_dir = '20070518_020117_run_final_3.6_nbartzis' # HAT 1 in Dampier 10000 yr
+time_dir = '20070520_225029_run_final_0.0_nbartzis' # MSL 1 in Dampier 10000 yr
 #time_dir = '' # HAT 1 in Broome 10000 yr
 #time_dir = '' # MSL 1 in Broome 10000 yr
@@ -18 +18 @@
 cellsize = 25
 timestep = None
-directory = project.output_dir
+directory = project_urs.output_dir
 
-name = directory+time_dir+sep+project.scenario_name
+name = directory+time_dir+sep+project_urs.scenario_name
 
-is_parallel = False
+is_parallel = True
 if is_parallel == True: nodes = 4
 print 'output dir:', name
 
-var = [2,3] # depth and speed
+var = [2,3,4] # depth and speed
 
 for which_var in var:
@@ -59 +59 @@
                         timestep = timestep,
                         cellsize = cellsize,      
-                        easting_min = project.e_min_area,
-                        easting_max = project.e_max_area,
-                        northing_min = project.n_min_area,
-                        northing_max = project.n_max_area,        
+                        easting_min = project_urs.e_min_area,
+                        easting_max = project_urs.e_max_area,
+                        northing_min = project_urs.n_min_area,
+                        northing_max = project_urs.n_max_area,        
                         reduction = max, 
                         verbose = True,

anuga_work/production/pt_hedland_2006/run_building_inundation.py

@@ -20 +20 @@
 
 from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
-import project
+import project_urs
 
 # Inputs
-#timestampdir = '20060704_063005' # HAT
-#timestampdir = '20060704_063112' # LAT
-#timestampdir = '20060704_063234' # MSL
-timestampdir = '20060515_001733' # DTED MSL
-file_loc = project.outputdir + timestampdir + sep 
-swwfile = file_loc + project.basename + '.sww'
-buildings_filename = project.buildings_filename
-buildings_filename_out = file_loc + project.buildings_filename_out
+#timestampdir = '20070518_020117_run_final_3.6_nbartzis' # HAT
+timestampdir = '20070520_225029_run_final_0.0_nbartzis' # MSL
+file_loc = project_urs.output_dir + timestampdir + sep 
+swwfile = file_loc + project_urs.scenario_name #+ '.sww'
+buildings_filename = project_urs.buildings_filename
+buildings_filename_out = file_loc + project_urs.buildings_filename_out
 
 #add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
 inundation_damage(swwfile, buildings_filename, buildings_filename_out)
-#inundation_damage(swwfile, buildings_filename, buildings_filename_out)
 
 print '\n Augmented building file written to %s \n' \

anuga_work/production/wollongong_2006/project_slide.py

@@ -56 +56 @@
 polygondir = home+sep+state+sep+scenario_dir_name+sep+'anuga'+sep+'polygons'+sep
 
-gauge_filename = gaugedir + 'gong_gauges.csv'
+#gauge_filename = gaugedir + 'gong_gauges.csv'
+gauge_filename = gaugedir + 'gauges.csv'
 codedir = getcwd()+sep                            
 codedirname = codedir + 'project_slide.py'