Changeset 4314


Ignore:
Timestamp:
Mar 22, 2007, 5:25:44 PM (18 years ago)
Author:
sexton
Message:

update slide modelling parameters

Location:
anuga_work/production
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • anuga_work/production/broome_2006/run_building_inundation.py

    r4310 r4314  
    1919from os import sep
    2020
    21 from damage.inundation_damage import add_depth_and_momentum2csv
     21from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
    2222import project
    2323
     
    3232buildings_filename_out = file_loc + project.buildings_filename_out
    3333
    34 add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
     34#add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
    3535inundation_damage(swwfile, buildings_filename, buildings_filename_out)
    3636
  • anuga_work/production/busselton_2006/run_building_inundation.py

    r4310 r4314  
    1919from os import sep
    2020
    21 from damage.inundation_damage import add_depth_and_momentum2csv
     21from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
    2222import project
    2323
     
    3232buildings_filename_out = file_loc + project.buildings_filename_out
    3333
    34 add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
     34#add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
    3535inundation_damage(swwfile, buildings_filename, buildings_filename_out)
    3636
  • anuga_work/production/dampier_2006/run_building_inundation.py

    r4310 r4314  
    1919from os import sep
    2020
    21 from damage.inundation_damage import add_depth_and_momentum2csv
     21from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
    2222import project
    2323
     
    3232buildings_filename_out = file_loc + project.buildings_filename_out
    3333
    34 add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
     34#add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
    3535inundation_damage(swwfile, buildings_filename, buildings_filename_out)
    3636
  • anuga_work/production/exmouth_2006/run_building_inundation.py

    r4310 r4314  
    1919from os import sep
    2020
    21 from damage.inundation_damage import add_depth_and_momentum2csv
     21from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
    2222import project
    2323
     
    3232buildings_filename_out = file_loc + project.buildings_filename_out
    3333
    34 add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
     34#add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
    3535inundation_damage(swwfile, buildings_filename, buildings_filename_out)
    3636
  • anuga_work/production/newcastle_2006/export_results.py

    r4276 r4314  
    2020#time_dir = '20070219_060722' #bulli
    2121#time_dir = '20070219_060808' #shovel
    22 time_dir = '20070219_060854' #yacaaba
     22#time_dir = '20070219_060854' #yacaaba
     23
     24#corrected yacaaba and birubi
     25time_dir = '20070322_004007' # yacaaba_c1 - potential
     26#time_dir = '20070322_003255' # yacaaba_c2 - historical
     27#time_dir = '20070322_032705' # birubi_c1 - historical
     28#time_dir = '20070322_032618' # birubi_c2 - potential
     29
     30# new region
     31#time_dir = '20070322_033350' # birubi
     32#time_dir = '20070322_033545' # yacaaba
     33#time_dir = '20070322_033716' # shovel
     34#time_dir = '20070322_033608' # bulli
    2335
    2436directory = project_slide.outputdir
     
    3951
    4052if which_var == 2:  # Depth
    41     outname = name + '_depth-yacaaba-michelle'
     53    outname = name + '_depth-yacaaba'
    4254    quantityname = 'stage-elevation' 
    4355
  • anuga_work/production/newcastle_2006/project_slide.py

    r4276 r4314  
    7979# bounding polygon for study area
    8080polyAll = read_polygon(polygondir+'extentC3.csv')
     81polyAll_c0 = read_polygon(polygondir+'extent_c0.csv')
    8182
    8283print 'Area of bounding polygon', polygon_area(polyAll)/1000000.0
     
    9394print 'Area of CBD polygon', polygon_area(poly_newcastle)/1000000.0
    9495
     96# region c0
     97poly_local_c0 = read_polygon(polygondir+'local_c0.csv')
     98poly_entrance_c0 = read_polygon(polygondir+'entrance.csv')
     99
    95100#plot_polygons([polyAll,poly_local,poly_newcastle],'fig',verbose=True)
    96101###################################################################
     
    103108northingmin_nsw = 6253970
    104109northingmax_nsw = 6424600
     110
     111# clipping for nsw grid for conversion
     112eastingminc0_nsw = 322440
     113eastingmaxc0_nsw = 436250
     114northingminc0_nsw = 6280000
     115northingmaxc0_nsw = 6410000
    105116
    106117poly_surveyclip = read_polygon(polygondir+'surveyclip.csv')
     
    125136slide_origin_bulli = [370110,6189489]
    126137slide_origin_shovel = [354753,6187397]
    127 slide_origin_yacaaba = [463012,6334735]
     138#slide_origin_yacaaba = [463012,6334735] original work was actually Birubi
     139slide_origin_yacaaba = [476465, 6362424]
     140slide_origin_birubi = [462267,6335100]
    128141
    129142# potential slides: these correspond approximately to modelled depths
    130143slide_origin_bulli_b = [405617,6249852]
    131 slide_origin_bulli_c = [465283,6335210]
     144slide_origin_bulli_c0 = [438583,6308510]
     145slide_origin_bulli_c1 = [465283,6335210]
     146slide_origin_bulli_c2 = [483783,6358810]
    132147slide_origin_shovel_b = [396262,6252144]
    133 slide_origin_shovel_c = [458694,6340352]
    134 slide_origin_yacaaba_a = [361753,6188786]
    135 slide_origin_yacaaba_b = [401897,6250643]
     148slide_origin_shovel_c0 = [431683,6311110]
     149slide_origin_shovel_c1 = [458694,6340352]
     150slide_origin_shovel_c2 = [475589,6363030]
     151slide_origin_yacaaba_a = [359796,6190943]
     152slide_origin_yacaaba_b = [397330,6251857]
     153slide_origin_yacaaba_c0 = [431283,6312110]
     154slide_origin_yacaaba_c1 = [459983,6339110]
     155slide_origin_birubi_a = [362811,6191183]
     156slide_origin_birubi_b = [403573,6250268]
     157slide_origin_birubi_c0 = [437183,6309410]
     158slide_origin_birubi_c2 = [483392,6359044]
    136159
    137160#bulli_depth = 2087.0
     
    154177
    155178#yacaaba_depth = 1119.0
    156 yacaaba_depth = 1222.5
    157 yacaaba_length = 7050.0
    158 yacaaba_thickness = 144.0
    159 yacaaba_width = 3080.0
     179yacaaba_depth = 938
     180yacaaba_length = 4189
     181yacaaba_thickness = 53
     182yacaaba_width = 2898
    160183yacaaba_density = 1.48
    161 yacaaba_slope = 3.0
     184yacaaba_slope = 2.3
    162185yacaaba_alpha = 133.0 - 90.0
     186 
     187birubi_depth = 1320.
     188birubi_length = 9903.0
     189birubi_width = 4150.
     190birubi_density = 1.48
     191birubi_slope = 3.7
     192birubi_alpha = 133.0 - 90.0
     193birubi_thickness = 140.0
  • anuga_work/production/newcastle_2006/run_newcastle_slide.py

    r4276 r4314  
    143143from smf import slide_tsunami
    144144
    145 tsunami_source = slide_tsunami(length=project_slide.yacaaba_length,
    146                                width=project_slide.yacaaba_width,
    147                                depth=project_slide.yacaaba_depth,
    148                                slope=project_slide.yacaaba_slope,
    149                                thickness=project_slide.yacaaba_thickness,
    150                                x0=project_slide.slide_origin_yacaaba[0],
    151                                y0=project_slide.slide_origin_yacaaba[1],
    152                                alpha=project_slide.yacaaba_alpha,
     145tsunami_source = slide_tsunami(length=project_slide.shovel_length,
     146                               width=project_slide.shovel_width,
     147                               depth=project_slide.shovel_depth,
     148                               slope=project_slide.shovel_slope,
     149                               thickness=project_slide.shovel_thickness,
     150                               x0=project_slide.slide_origin_shovel_c2[0],
     151                               y0=project_slide.slide_origin_shovel_c2[1],
     152                               alpha=project_slide.shovel_alpha,
    153153                               domain=domain)
    154154
  • anuga_work/production/onslow_2006/run_building_inundation.py

    r4310 r4314  
    1919from os import sep
    2020
    21 from damage.inundation_damage import add_depth_and_momentum2csv
     21from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
    2222import project
    2323
     
    3232buildings_filename_out = file_loc + project.buildings_filename_out
    3333
    34 add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
     34#add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
    3535inundation_damage(swwfile, buildings_filename, buildings_filename_out)
    3636
  • anuga_work/production/perth_2006/run_building_inundation.py

    r4310 r4314  
    1919from os import sep
    2020
    21 from damage.inundation_damage import add_depth_and_momentum2csv
     21from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
    2222import project
    2323
     
    3232buildings_filename_out = file_loc + project.buildings_filename_out
    3333
    34 add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
     34#add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
    3535inundation_damage(swwfile, buildings_filename, buildings_filename_out)
    3636
  • anuga_work/production/pt_hedland_2006/run_building_inundation.py

    r4310 r4314  
    1919from os import sep
    2020
    21 from damage.inundation_damage import add_depth_and_momentum2csv
     21from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
    2222import project
    2323
     
    3232buildings_filename_out = file_loc + project.buildings_filename_out
    3333
    34 add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
     34#add_depth_and_momentum2csv(swwfile, buildings_filename, buildings_filename_out)
    3535inundation_damage(swwfile, buildings_filename, buildings_filename_out)
    3636
  • anuga_work/production/sydney_2006/export_results.py

    r4294 r4314  
    88#time_dir = '20061212_012705' #shovel
    99#time_dir = '20061212_064807' #yacaaba
    10 
     10# correct depths
    1111#time_dir = '20070121_213509' #shovel
    1212#time_dir = '20070119_055222' #yacaaba
    1313#time_dir = '20070121_213444' #bulli
     14#corrected yacaaba and birubi
     15time_dir = '20070322_035214' # yacaaba
     16#time_dir = '20070322_035135' # birubi
    1417
    15 #directory = project_slide.outputdir
    16 #name = directory + time_dir + sep + project_slide.basename
    17 name = 'test500000.035000'
     18directory = project_slide.outputdir
     19name = directory + time_dir + sep + project_slide.basename
     20#name = 'test500000.035000'
    1821#name = 'test'
    1922
     
    3235
    3336if which_var == 2:  # Depth
    34     outname = name + '_depth-eq'
     37    outname = name + '_depth-yacaaba'
    3538    quantityname = 'stage-elevation' 
    3639
  • anuga_work/production/sydney_2006/project_slide.py

    r4294 r4314  
    8282# Domain definitions
    8383###############################
    84 """
     84
    8585# bounding polygon for study area
    8686polyAll = read_polygon(polygondir+'extent3.csv')
     
    133133northingmin = 6244800
    134134northingmax = 6274550
    135 """
     135
    136136# exporting asc grid
    137137eastingmin = 318922+10000
     
    152152slide_origin_bulli = [370110,6189489]
    153153slide_origin_shovel = [354753,6187397]
    154 slide_origin_yacaaba = [463012,6334735]
     154#slide_origin_yacaaba = [463012,6334735] original work was actually Birubi
     155slide_origin_yacaaba = [476465, 6362424]
     156slide_origin_birubi = [462267,6335100]
    155157
    156158# potential slides: these correspond approximately to modelled depths
    157159slide_origin_bulli_b = [405617,6249852]
    158 slide_origin_bulli_c = [465283,6335210]
     160slide_origin_bulli_c0 = [438583,6308510]
     161slide_origin_bulli_c1 = [465283,6335210]
     162slide_origin_bulli_c2 = [483783,6358810]
    159163slide_origin_shovel_b = [396262,6252144]
    160 slide_origin_shovel_c = [458694,6340352]
    161 slide_origin_yacaaba_a = [361753,6188786]
    162 slide_origin_yacaaba_b = [401897,6250643]
     164slide_origin_shovel_c0 = [431683,6311110]
     165slide_origin_shovel_c1 = [458694,6340352]
     166slide_origin_shovel_c2 = [475589,6363030]
     167slide_origin_yacaaba_a = [359796,6190943]
     168slide_origin_yacaaba_b = [397330,6251857]
     169slide_origin_yacaaba_c0 = [431283,6312110]
     170slide_origin_yacaaba_c1 = [459983,6339110]
     171slide_origin_birubi_a = [362811,6191183]
     172slide_origin_birubi_b = [403573,6250268]
     173slide_origin_birubi_c0 = [437183,6309410]
     174slide_origin_birubi_c2 = [483392,6359044]
    163175
    164176#bulli_depth = 2087.0
     
    181193
    182194#yacaaba_depth = 1119.0
    183 yacaaba_depth = 1222.5
    184 yacaaba_length = 7050.0
    185 yacaaba_thickness = 144.0
    186 yacaaba_width = 3080.0
     195yacaaba_depth = 938.
     196yacaaba_length = 4189.
     197yacaaba_thickness = 53.
     198yacaaba_width = 2898.
    187199yacaaba_density = 1.48
    188 yacaaba_slope = 3.0
     200yacaaba_slope = 2.3
    189201yacaaba_alpha = 133.0 - 90.0
     202 
     203birubi_depth = 1320.
     204birubi_length = 9903.0
     205birubi_width = 4150.
     206birubi_density = 1.48
     207birubi_slope = 3.7
     208birubi_alpha = 133.0 - 90.0
     209birubi_thickness = 140.
  • anuga_work/production/wollongong_2006/export_results.py

    r4276 r4314  
    2121#time_dir = '20070213_035110'   #bulli
    2222#time_dir = '20070213_035146'   #shovel
    23 time_dir = '20070213_035302'    #yacaaba
     23#time_dir = '20070213_035302'   #yacaaba
     24
     25#corrected yacaaba and birubi
     26time_dir = '20070322_035513' # yacaaba
     27#time_dir = '20070322_035640' # birubi
    2428
    2529directory = project_slide.outputdir
     
    4044
    4145if which_var == 2:  # Depth
    42     outname = name + '_depth-yacaaba-amy'
     46    outname = name + '_depth-yacaaba'
    4347    quantityname = 'stage-elevation' 
    4448
  • anuga_work/production/wollongong_2006/project_slide.py

    r4276 r4314  
    130130slide_origin_bulli = [370110,6189489]
    131131slide_origin_shovel = [354753,6187397]
    132 slide_origin_yacaaba = [463012,6334735]
     132#slide_origin_yacaaba = [463012,6334735] original work was actually Birubi
     133slide_origin_yacaaba = [476465, 6362424]
     134slide_origin_birubi = [462267,6335100]
    133135
    134136# potential slides: these correspond approximately to modelled depths
    135137slide_origin_bulli_b = [405617,6249852]
    136 slide_origin_bulli_c = [465283,6335210]
     138slide_origin_bulli_c0 = [438583,6308510]
     139slide_origin_bulli_c1 = [465283,6335210]
     140slide_origin_bulli_c2 = [483783,6358810]
    137141slide_origin_shovel_b = [396262,6252144]
    138 slide_origin_shovel_c = [458694,6340352]
    139 slide_origin_yacaaba_a = [361753,6188786]
    140 slide_origin_yacaaba_b = [401897,6250643]
     142slide_origin_shovel_c0 = [431683,6311110]
     143slide_origin_shovel_c1 = [458694,6340352]
     144slide_origin_shovel_c2 = [475589,6363030]
     145slide_origin_yacaaba_a = [359796,6190943]
     146slide_origin_yacaaba_b = [397330,6251857]
     147slide_origin_yacaaba_c0 = [431283,6312110]
     148slide_origin_yacaaba_c1 = [459983,6339110]
     149slide_origin_birubi_a = [362811,6191183]
     150slide_origin_birubi_b = [403573,6250268]
     151slide_origin_birubi_c0 = [437183,6309410]
     152slide_origin_birubi_c2 = [483392,6359044]
    141153
    142154#bulli_depth = 2087.0
     
    159171
    160172#yacaaba_depth = 1119.0
    161 yacaaba_depth = 1222.5
    162 yacaaba_length = 7050.0
    163 yacaaba_thickness = 144.0
    164 yacaaba_width = 3080.0
     173yacaaba_depth = 938.
     174yacaaba_length = 4189.
     175yacaaba_thickness = 53.
     176yacaaba_width = 2898.
    165177yacaaba_density = 1.48
    166 yacaaba_slope = 3.0
     178yacaaba_slope = 2.3
    167179yacaaba_alpha = 133.0 - 90.0
    168 
     180 
     181birubi_depth = 1320.
     182birubi_length = 9903.0
     183birubi_width = 4150.
     184birubi_density = 1.48
     185birubi_slope = 3.7
     186birubi_alpha = 133.0 - 90.0
     187birubi_thickness = 140.
  • anuga_work/production/wollongong_2006/run_gong_slide.py

    r4276 r4314  
    147147from smf import slide_tsunami
    148148
    149 tsunami_source = slide_tsunami(length=project_slide.yacaaba_length,
    150                                width=project_slide.yacaaba_width,
    151                                depth=project_slide.yacaaba_depth,
    152                                slope=project_slide.yacaaba_slope,
    153                                thickness=project_slide.yacaaba_thickness,
    154                                x0=project_slide.slide_origin_yacaaba_a[0],
    155                                y0=project_slide.slide_origin_yacaaba_a[1],
    156                                alpha=project_slide.yacaaba_alpha,
     149tsunami_source = slide_tsunami(length=project_slide.birubi_length,
     150                               width=project_slide.birubi_width,
     151                               depth=project_slide.birubi_depth,
     152                               slope=project_slide.birubi_slope,
     153                               thickness=project_slide.birubi_thickness,
     154                               x0=project_slide.slide_origin_birubi_a[0],
     155                               y0=project_slide.slide_origin_birubi_a[1],
     156                               alpha=project_slide.birubi_alpha,
    157157                               domain=domain)
    158158
Note: See TracChangeset for help on using the changeset viewer.