Changeset 4346


Ignore:
Timestamp:
Apr 2, 2007, 6:11:24 PM (18 years ago)
Author:
sexton
Message:

slide modelling updates and slide report updates

Location:
anuga_work/production
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • anuga_work/production/newcastle_2006/export_results.py

    r4314 r4346  
    2323
    2424#corrected yacaaba and birubi
    25 time_dir = '20070322_004007' # yacaaba_c1 - potential
    26 #time_dir = '20070322_003255' # yacaaba_c2 - historical
     25#time_dir = '20070323_012157' # yacaaba_c1 - potential
     26#time_dir = '20070323_012425' # yacaaba_c2 - historical
    2727#time_dir = '20070322_032705' # birubi_c1 - historical
    2828#time_dir = '20070322_032618' # birubi_c2 - potential
     29#time_dir = '20070322_060006' # bulli_c2 - potential
     30#time_dir = '20070322_060132' # shovel_c2 - potential
    2931
    3032# new region
    3133#time_dir = '20070322_033350' # birubi
    32 #time_dir = '20070322_033545' # yacaaba
     34#time_dir = '20070323_012310' # yacaaba
    3335#time_dir = '20070322_033716' # shovel
    3436#time_dir = '20070322_033608' # bulli
     37
     38# rerun
     39#time_dir = '20070331_080432' # birubi - historical
     40#time_dir = '20070331_070841' # yacaaba - c1
     41#time_dir = '20070331_080603' # birubi - c2
     42time_dir = '20070401_030248' # yacaaba - historical
     43#time_dir = '20070331_080235' # bulli - c2
     44#time_dir = '20070331_080213' # shovel - c2
    3545
    3646directory = project_slide.outputdir
    … …  
    3949is_parallel = False
    4050if is_parallel == True: nodes = 4
    41 print 'output dir:', name
     51print 'output dir:', directory + time_dir
    4252
    4353which_var = 2
    … …  
    5161
    5262if which_var == 2:  # Depth
    53     outname = name + '_depth-yacaaba'
     63    outname = name + '_depth'
    5464    quantityname = 'stage-elevation' 
    5565
    … …  
    8494                quantity = quantityname,
    8595                cellsize = 25,     
    86                 easting_min = project_slide.eastingmin,
    87                 easting_max = project_slide.eastingmax,
    88                 northing_min = project_slide.northingmin,
    89                 northing_max = project_slide.northingmax,       
     96##                easting_min = project_slide.eastingmin1,
     97##                easting_max = project_slide.eastingmax1,
     98##                northing_min = project_slide.northingmin1,
     99##                northing_max = project_slide.northingmax1,
     100                easting_min = project_slide.eastingmin2,
     101                easting_max = project_slide.eastingmax2,
     102                northing_min = project_slide.northingmin2,
     103                northing_max = project_slide.northingmax2,
    90104                reduction = max,
    91105                verbose = True,

  • anuga_work/production/newcastle_2006/project_slide.py

    r4314 r4346  
    117117poly_surveyclip = read_polygon(polygondir+'surveyclip.csv')
    118118
    119 # exporting asc grid
    120 eastingmin = 366890
    121 eastingmax = 404270
    122 northingmin = 6335450
    123 northingmax = 6375630
     119# exporting asc grid for c1
     120eastingmin1 = 366890
     121eastingmax1 = 404270
     122northingmin1 = 6335450
     123northingmax1 = 6375630
    124124
    125 # exporting asc grid for Michelle
    126 eastingmin = 386450
    127 eastingmax = 432900
    128 northingmin = 6357500
    129 northingmax = 6400700
     125# exporting asc grid for Michelle and for c2
     126eastingmin2 = 386450
     127eastingmax2 = 432900
     128northingmin2 = 6357500
     129northingmax2 = 6400700
     130
     131# exporting asc grid - The Entrance
     132eastingmin0 = 350950
     133eastingmax0 = 370015
     134northingmin0 = 6305280
     135northingmax0 = 6325620
    130136
    131137###################################################################
    … …  
    177183
    178184#yacaaba_depth = 1119.0
    179 yacaaba_depth = 938
    180 yacaaba_length = 4189
    181 yacaaba_thickness = 53
    182 yacaaba_width = 2898
     185yacaaba_depth = 938.0
     186yacaaba_length = 4189.0
     187yacaaba_thickness = 53.0
     188yacaaba_width = 2898.0
    183189yacaaba_density = 1.48
    184190yacaaba_slope = 2.3

  • anuga_work/production/newcastle_2006/run_newcastle_slide.py

    r4314 r4346  
    133133domain.set_quantity('elevation',
    134134                    filename = project_slide.combined_dem_name + '.pts',
    135                     use_cache = True,
     135                    use_cache = False,
    136136                    verbose = True,
    137137                    alpha = 0.1
    … …  
    143143from smf import slide_tsunami
    144144
    145 tsunami_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,
     145tsunami_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,
    153153                               domain=domain)
    154154
    … …  
    173173from anuga.abstract_2d_finite_volumes.quantity import Quantity
    174174
    175 for t in domain.evolve(yieldstep = 30, finaltime = 5000):
     175for t in domain.evolve(yieldstep = 30, finaltime = 10000):
    176176    domain.write_time()
    177177    domain.write_boundary_statistics(tags = 'e14')

  • anuga_work/production/sydney_2006/export_results.py

    r4314 r4346  
    1313#time_dir = '20070121_213444' #bulli
    1414#corrected yacaaba and birubi
    15 time_dir = '20070322_035214' # yacaaba
    16 #time_dir = '20070322_035135' # birubi
     15#time_dir = '20070322_035214' # yacaaba
     16time_dir = '20070322_035135' # birubi
    1717
    1818directory = project_slide.outputdir
    … …  
    2525print 'output dir:', name
    2626
    27 which_var = 0
     27which_var = 2
    2828if which_var == 0:  # Stage
    2929    outname = name + '_stage-eq-thurs-test'
    … …  
    3535
    3636if which_var == 2:  # Depth
    37     outname = name + '_depth-yacaaba'
     37    outname = name + '_depth'
    3838    quantityname = 'stage-elevation' 
    3939

  • anuga_work/production/sydney_2006/report/anuga_setup.tex

    r4327 r4346  
    160160C & Birubi - Historical & ${\rm newcastle \_tsunami\_scenario\_2006 \backslash anuga
    161161\backslash outputs \backslash
    162 20070325\_064917}$ \\ \hline
     16220070331\_080432}$ \\ \hline
    163163C & Bulli (near Historical Birubi) &  ${\rm newcastle \_tsunami\_scenario\_2006 \backslash anuga
    164164\backslash outputs \backslash
    … …  
    169169C & Yacaaba (near Historical Birubi) & ${\rm newcastle \_tsunami\_scenario\_2006 \backslash anuga
    170170\backslash outputs \backslash
    171 20070325\_065002}$ \\ \hline
     17120070331\_070841}$ \\ \hline
    172172C & Yacaaba - Historical & ${\rm newcastle \_tsunami\_scenario\_2006 \backslash anuga
    173173\backslash outputs \backslash
    174 20070325\_064426}$ \\ \hline
     174220070402\_062735}$ \\ \hline
    175175C & Birubi (near Historical Yacaaba) & ${\rm newcastle \_tsunami\_scenario\_2006 \backslash anuga
    176176\backslash outputs \backslash
    177 20070325\_064651}$ \\ \hline
     17720070331\_080603}$ \\ \hline
    178178C & Shovel (near Historical Yacaaba) & ${\rm newcastle \_tsunami\_scenario\_2006 \backslash anuga
    179179\backslash outputs \backslash
    180 20070325\_064525}$ \\ \hline
     18020070331\_080213}$ \\ \hline
    181181C & Bulli (near Historical Yacaaba) & ${\rm newcastle \_tsunami\_scenario\_2006 \backslash anuga
    182182\backslash outputs \backslash
    183 20070325\_064602}$ \\ \hline
     18320070331\_080235}$ \\ \hline
    184184C0 & Bulli &  ${\rm newcastle \_tsunami\_scenario\_2006 \backslash anuga
    185185\backslash outputs \backslash

  • anuga_work/production/sydney_2006/report/birubi_C0_map.tex

    r4343 r4346  
    11\begin{figure}[p]
    2 \centerline{\includegraphics[scale=0.55]{../report_figures/birubiCimageryreviseddepth.jpg}}
     2\centerline{\includegraphics[scale=0.55]{../report_figures/birubiC0imageryreviseddepth.jpg}}
    33\caption{Maximum inundation map for the potential Birubi slide in region C. Data: NSW Department of Lands and AHO.} 
    44\label{fig:birubiC0}

  • anuga_work/production/sydney_2006/report/birubi_C2_map.tex

    r4327 r4346  
    11\begin{figure}[p]
    2 %\centerline{\includegraphics[scale=0.55]{../report_figures/birubiC2imageryreviseddepth.jpg}}
    3 \caption{Maximum inundation map for the potential Birubi slide in region C (near Historical Yacaaba). Data: NSW Department of Lands and AHO.} 
     2\centerline{\includegraphics[scale=0.55]{../report_figures/birubiC2imageryreviseddepth.jpg}}
     3\caption{Maximum inundation map for the potential Birubi slide in region C2 (near Historical Yacaaba). Data: NSW Department of Lands and AHO.} 
    44\label{fig:birubiC2}
    55\end{figure}

  • anuga_work/production/sydney_2006/report/birubi_C_map.tex

    r4316 r4346  
    11\begin{figure}[p]
    2 %\centerline{\includegraphics[scale=0.55]{../report_figures/birubiCimageryreviseddepth.jpg}}
     2\centerline{\includegraphics[scale=0.55]{../report_figures/birubiCimageryreviseddepth.jpg}}
    33\caption{Maximum inundation map for the historical Birubi slide in region C. Data: NSW Department of Lands and AHO.} 
    44\label{fig:birubiC}

  • anuga_work/production/sydney_2006/report/bulli_C2_map.tex

    r4316 r4346  
    11\begin{figure}[p]
    2 %\centerline{\includegraphics[scale=0.55]{../report_figures/bulliC2imageryreviseddepth.jpg}}
    3 \caption{Maximum inundation map for a potential Bulli slide in region C (near Historical Yacaaba). Data: NSW Department of Lands and AHO.} 
     2\centerline{\includegraphics[scale=0.55]{../report_figures/bulliC2imageryreviseddepth.jpg}}
     3\caption{Maximum inundation map for a potential Bulli slide in region C2 (near Historical Yacaaba). Data: NSW Department of Lands and AHO.} 
    44\label{fig:bulliC2}
    55\end{figure}

  • anuga_work/production/sydney_2006/report/interpretation.tex

    r4327 r4346  
    7878
    7979\begin{figure}[p]
    80 \centerline{\includegraphics[scale=0.25]{../report_figures/depthvsampdataslide.png}}
     80%\centerline{\includegraphics[scale=0.25]{../report_figures/depthvsampdataslide.png}}
    8181\caption{Relationship between characteristic 3D amplitude and depth
    8282for each slide volume.}

  • anuga_work/production/sydney_2006/report/shovel_C2_map.tex

    r4316 r4346  
    11\begin{figure}[p]
    2 %\centerline{\includegraphics[scale=0.55]{../report_figures/shovelC2imageryreviseddepth.jpg}}
    3 \caption{Maximum inundation map for a potential Shovel slide in region C (near Historical Yacaaba). Data: NSW Department of Lands and AHO.} 
     2\centerline{\includegraphics[scale=0.55]{../report_figures/shovelC2imageryreviseddepth.jpg}}
     3\caption{Maximum inundation map for a potential Shovel slide in region C2 (near Historical Yacaaba). Data: NSW Department of Lands and AHO.} 
    44\label{fig:shovelC2}
    55\end{figure}

  • anuga_work/production/sydney_2006/report/sydney_2006_report.tex

    r4343 r4346  
    8585 \clearpage
    8686 
    87 \input{bulli_b_map}
     87\input{bulli_B_map}
    8888 \clearpage
    8989 
    … …  
    163163   \section{Time series}
    164164     \label{sec:timeseries}
    165 \input{latexoutput20061211071516}
    166  \clearpage
     165%\input{latexoutput20061211071516}
     166 %\clearpage
    167167 
    168 \input{latexoutput20061211060105}
    169  \clearpage
     168%\input{latexoutput20061211060105}
     169% \clearpage
    170170 
    171 \input{latexoutput20061211073709}
    172  \clearpage
     171%\input{latexoutput20061211073709}
     172% \clearpage
    173173 
    174174

  • anuga_work/production/sydney_2006/report/yacaaba_C2_map.tex

    r4316 r4346  
    11\begin{figure}[p]
    22%\centerline{\includegraphics[scale=0.55]{../report_figures/yacaabaC2imageryreviseddepth.jpg} }
    3 \caption{Maximum inundation map for the historical Yacaaba slide in region C. Data: NSW Department of Lands and AHO.} 
     3\caption{Maximum inundation map for the historical Yacaaba slide in region C2. Data: NSW Department of Lands and AHO.} 
    44\label{fig:yacaabaC2}
    55\end{figure}

  • anuga_work/production/wollongong_2006/export_results.py

    r4314 r4346  
    4444
    4545if which_var == 2:  # Depth
    46     outname = name + '_depth-yacaaba'
     46    outname = name + '_depth-origclip'
    4747    quantityname = 'stage-elevation' 
    4848

  • anuga_work/production/wollongong_2006/project_slide.py

    r4314 r4346  
    118118
    119119# exporting asc grid for Amy
    120 eastingmin = 282000
    121 eastingmax = 306500
    122 northingmin = 6131750
    123 northingmax = 6170850
     120##eastingmin = 282000
     121##eastingmax = 306500
     122##northingmin = 6131750
     123##northingmax = 6170850
    124124
    125125###################################################################
Note: See TracChangeset for help on using the changeset viewer.