Changeset 3150


Ignore:
Timestamp:
Jun 13, 2006, 4:37:58 PM (18 years ago)
Author:
sexton
Message:

updates to comparison report

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • documentation/experimentation/boundary_ANUGA_MOST/report/MOST_ANUGA.tex

    r3148 r3150  
    135135any relationships between the bathymetric topography and the ``matching''
    136136of the ANUGA and MOST outputs. The difficult question is to
    137 how to define this matching. Here, we define the measure of blah de blah.
     137how to define this matching. Further, are we concerned with the matching
     138MOST and ANUGA in deeper water, or are we concerned
     139with the impact difference ashore? Section \ref{label:} deals with the first
     140issue with Section \ref{label:} dealing with the second.
     141
    138142
    139143Firstly, at what water depth should we place the ANUGA boundary? And where
     
    164168
    165169\subsubsection{MOST and ANUGA comparison - 100m contour}
     170\label{mostanugaonslow}
    166171
    167172\begin{figure}
    168173\caption{Diagram of MOST grid layout, ANUGA boundary and gauge
    169174locatations.}
    170 \label{fig:setup}
     175\label{fig:setuponslow}
    171176\end{figure}
    172177
     178\begin{table}
     179\label{table:mostanugacomparisononslow}
     180\caption{Comparison in output between ANUGA boundary at 100m
     181MOST output.}
     182\centering
     183\begin{tabular}{|l|l|l|}\hline
     184Point location & MOST & ANUGA \\ \hline
     185& some sort of measure of fit - eg max/min amplitude&   \\ \hline
     186\end{tabular}
     187\end{table}
     188
    173189\subsubsection{ANUGA comparison - 50m and 100m contour}
     190\label{compare50100onslow}
     191
     192Here, whilst it is not reasonable to compare MOST and ANUGA
     193output in very shallow water (whatever that definition is) we will
     194briefly examine the time series for the point locations
     195described in Table \ref{table:locations}.
     196It is evident that the model output when the boundary is placed
     197at the 50m contour does not pick up the
     198detail which is evident in the output for the 100m contour. This
     199is due to the fact that the output
     200for the 100m contour has been propagated by ANUGA which is more effective
     201in modelling the propagation in shallow water.
     202It seems that the maximum amplitudes are
     203effectively matched for most of the locations chosen;
     204see for example the output for the Ocean polygon 1 and 2 locations.
    174205
    175206\input{comparison_onslow}
    176207
    177 \begin{table}
    178 \label{table:comparison}
    179 \caption{Comparison in output when ANUGA boundary at 50m and
    180 100m contour.}
    181 \centering
    182 \begin{tabular}{|l|l|l|}\hline
    183 Gauge number & Boundary at 50m contour & Boundary at 100m contour \\ \hline
    184 & &  some sort of measure of fit \\ \hline
    185 \end{tabular}
    186 \end{table}
    187 
     208It is more instructive in this case to compare differences in
     209inundation depths and extent ashore as the boundary location is changed.
     210Table \ref{table:anugacomparisononslow} lists inundation depths
     211for locations within the internal polygon with the finest resolution.
     212
     213\begin{table}
     214\label{table:anugacomparisononslow}
     215\caption{Comparison in inundation depth at select locations when ANUGA boundary
     216is at the 50m and 100m contour.}
     217\centering
     218\begin{tabular}{|l|l|l|}\hline
     219Point location & Boundary at 50m contour & Boundary at 100m contour \\ \hline
     220&  &   \\ \hline
     221\end{tabular}
     222\end{table}
     223
     224\begin{figure}
     225\caption{Map showing inundation extent for 50m and 100m contour line.}
     226\label{fig:extentcomparisononslow}
     227\end{figure}
    188228
    189229\subsection{Pt Hedland case study}
    190230
    191231\subsubsection{MOST and ANUGA comparison - 100m contour}
     232\label{mostanugapthedland}
     233
     234\begin{table}
     235\label{table:mostanugacomparisonpthedland}
     236\caption{Comparison in output between ANUGA boundary at 100m
     237MOST output.}
     238\centering
     239\begin{tabular}{|l|l|l|}\hline
     240Point location & MOST & ANUGA \\ \hline
     241& some sort of measure of fit &   \\ \hline
     242\end{tabular}
     243\end{table}
    192244
    193245\subsubsection{ANUGA comparison - 50m and 100m contour}
     246\label{compare50100pthedland}
    194247
    195248%\input{comparison_pt_hedland}
    196249
    197250\begin{table}
    198 \label{table:comparison}
    199 \caption{Comparison in output when ANUGA boundary at 50m contour and
    200 100m contour.}
    201 \centering
    202 \begin{tabular}{|l|l|l|}\hline
    203 Gauge number & Boundary at 50m contour & Boundary at 100m contour \\ \hline
    204 & &  some sort of measure of fit \\ \hline
    205 \end{tabular}
    206 \end{table}
     251\label{table:anugacomparisonpthedland}
     252\caption{Comparison in inundation depth at select location when ANUGA boundary
     253is at the 50m and 100m contour.}
     254\centering
     255\begin{tabular}{|l|l|l|}\hline
     256Point location & Boundary at 50m contour & Boundary at 100m contour \\ \hline
     257&  &   \\ \hline
     258\end{tabular}
     259\end{table}
     260
     261\begin{figure}
     262\caption{Map showing inundation extent for 50m and 100m contour line.}
     263\label{fig:extentcomparisonpthedland}
     264\end{figure}
    207265
    208266\section{Summary}
  • documentation/experimentation/boundary_ANUGA_MOST/report/comparison_onslow.tex

    r3148 r3150  
    1 \begin{table} \label{table:locations}
     1\begin{table} \label{table:locationsonslow}
    22\caption{Defined point locations for comparison study for Onslow region.}
    33\begin{center}
  • documentation/user_manual/examples/project.py

    r3136 r3150  
    187187botanybay_polygon_2, zone = convert_points_from_latlon_to_utm([j92, j12, j22, j62, j82, j72, j42])
    188188
    189 slump_origin = [385000.0, 6255000.0] #Absolute UTM
     189slump_origin = [372500.0, 6255000.0] #Absolute UTM
  • documentation/user_manual/examples/runsydney.py

    r3136 r3150  
    135135import time
    136136t0 = time.time()
     137tend = 7200.0
     138print 'Simulate to time = %d secs' %tend
    137139
    138 for t in domain.evolve(yieldstep = 120, duration = 18000):
     140for t in domain.evolve(yieldstep = 60, duration = tend):
    139141    print domain.timestepping_statistics()
    140142    print domain.boundary_statistics(tags = 'oceaneast')   
  • inundation/pyvolution/util.py

    r3141 r3150  
    907907    nn = len(plot_quantity)
    908908    no_cols = 2
     909    elev_output = []
    909910    if len(label_id) > 1: graphname_report = []
    910911    for k, g in enumerate(gauges):
     
    10201021                word_quantity += ' and ' + plot_quantity[nn-1]               
    10211022                caption = 'Time series for %s at %s gauge location (elevation %.2fm)' %(word_quantity, locations[k], elev[k]) #gaugeloc.replace('_',' '))
     1023                if elev[k] == 0.0:
     1024                    caption = 'Time series for %s at %s gauge location (elevation %.2fm)' %(word_quantity, locations[k], elevations[0,k,j])
     1025                    east = gauges[0]
     1026                    north = gauges[1]
     1027                    elev_output.append([locations[k],east,north,elevations[0,k,j]])
    10221028                label = '%sgauge%s' %(label_id2, gaugeloc2)
    10231029                s = '\end{tabular} \n \\caption{%s} \n \label{fig:%s} \n \end{figure} \n \n' %(caption, label)
     
    10491055            word_quantity += ' and ' + plot_quantity[nn-1]           
    10501056            label = 'gauge%s' %(gaugeloc2)
    1051             caption = 'Time series for %s at %s gauge location (elevation %.2fm)' %(word_quantity, locations[k], elev[k])
     1057            caption = 'Time series for %s at %s gauge location (elevation %.2fm)' %(word_quantity, locations[k], elev[k])
     1058            if elev[k] == 0.0:
     1059                    caption = 'Time series for %s at %s gauge location (elevation %.2fm)' %(word_quantity, locations[k], elevations[0,k,j])
     1060                    thisgauge = gauges[k]
     1061                    east = thisgauge[0]
     1062                    north = thisgauge[1]
     1063                    elev_output.append([locations[k],east,north,elevations[0,k,j]])
    10521064           
    10531065            s = '\end{tabular} \n \\caption{%s} \n \label{fig:%s} \n \end{figure} \n \n' %(caption, label)
     
    10601072        close('all')
    10611073   
    1062     return texfile2
     1074    return texfile2, elev_output
  • production/onslow_2006/compare_timeseries.py

    r3136 r3150  
    2727gauge_map = 'onslow_boundary_gauges.png'
    2828
     29plot_quantity = ['stage', 'speed']
     30
    2931# Create sections and graphs for each designated production directory
    3032latex_output = []
     
    3638    swwfiles[swwfile] = label_id
    3739
    38 texname = sww2timeseries(swwfiles,
    39                          project.gauges50,
    40                          production_dirs,
    41                          report = True,
    42                          plot_quantity = ['stage', 'speed'],
    43                          time_min = None,
    44                          time_max = None,
    45                          title_on = False,
    46                          verbose = True)
     40texname, vec = sww2timeseries(swwfiles,
     41                              project.gauges50,
     42                              production_dirs,
     43                              report = True,
     44                              reportname = 'latexoutput_compare',
     45                              plot_quantity = plot_quantity,
     46                              time_min = None,
     47                              time_max = None,
     48                              title_on = False,
     49                              verbose = True)
    4750
    48 texname = texname + '_compare'
    4951latex_output.append(texname)
    5052
    51 from shutil import copy
    52 copy (texname, project.comparereportdir + 'latex_input.tex')
     53from shutil import copy, move
     54copy ('report' + sep + texname + '.tex', project.comparereportdir + sep + texname + '.tex')
     55
    5356
    5457# Start report generation
     
    5760
    5861# Generate latex output for location points
    59 s = '\\begin{table} \label{table:locations} \n'
     62s = '\\begin{table} \label{table:locationsonslow} \n'
    6063fid.write(s)
    6164s = '\caption{Defined point locations for comparison study for Onslow region.}'
     
    6467\\begin{center}
    6568\\begin{tabular}{|l|l|l|l|}\hline
    66 \\bf{Point Name} & \\bf{Easting} & \\bf{Northing} & \\bf{Elevation}\\\\ \hline
     69\\bf{Point Name} & \\bf{Easting} & \\bf{Northing} & \\bf{Elevation (m)}\\\\ \hline
    6770"""
    6871fid.write(s)
    6972
    70 gauges, locations, elevation = get_gauges_from_file(project.gauges50)
    71 
    72 for name, gauges, elev in zip(locations, gauges, elevation):
    73     east = gauges[0]
    74     north = gauges[1]
    75     s = '%s & %.2f & %.2f & %.2f \\\\ \hline \n' %(name.replace('_',' '), east, north, elev)
     73for i, thisvec in enumerate(vec):
     74    name = thisvec[0]
     75    east = thisvec[1]
     76    north = thisvec[2]
     77    elev = thisvec[3]
     78    s = '%s & %.2f & %.2f & %.2f \\\\ \hline \n' %(name, east, north, elev)
    7679    fid.write(s)
     80    for which_one in plot_quantity:
     81        move ('report_figures' + sep + 'gauge'+name.replace(' ','')+which_one+'.png', project.comparereportfigdir)
    7782
    7883s = '\\end{tabular} \n  \end{center} \n \end{table} \n \n'
     
    8388
    8489s  = """
    85 \caption{Point locations used for Onslow study.} 
     90\caption{Point locations used for comparison between boundary at 50m and 100m contour for Onslow region.} 
    8691\label{fig:points}
    8792\end{figure}
     
    9196s = '\input{%s} \n \clearpage \n \n' %latex_output[0]
    9297fid.write(s)
    93      
    94 s = '\end{document}'
    95 fid.write(s)
  • production/onslow_2006/plot_data_extent.py

    r3136 r3150  
    5959    x = []
    6060    y = []
     61    name = []
    6162    line1 = lines[0]
    6263    for line in lines[1:]:
     
    6465        x.append(float(fields[0]))
    6566        y.append(float(fields[1]))
     67        if len(line) > 2: name.append(fields[2])
    6668   
    67     return x, y
     69    return x, y, name
    6870
    6971if plot_data == True:
     
    119121    figure(4)
    120122    figname = 'onslow_gauges'
    121     x, y = read_file(project.gauge_filename)
     123    x, y, name = read_file(project.gauge_filename)
    122124    plot(x1,y1,'r-',x,y,'r+')
    123125    savefig(figname)
     
    125127    figure(5)
    126128    figname = 'onslow_new_boundary_test'
    127     gaugex, gaugey = read_file(project.gauges50)
     129    gaugex, gaugey, name = read_file(project.gauges50)
    128130    x50, y50 = poly_xy(project.bounding_poly50)
    129131    x_onslow, y_onslow = poly_xy(project.poly_onslow)
     
    132134    #plot(x50,y50,'r-',x25,y25,'r-',x1,y1,'g-')
    133135    plot(x50,y50,'r-',x1,y1,'g-', gaugex, gaugey, 'b+', x_onslow, y_onslow,'r-', x_coast, y_coast,'r-')
     136    for i, string in enumerate(name):
     137        text(gaugex[i],gaugey[i],string,fontsize=7)
    134138    savefig(figname)
    135139close('all')
  • production/onslow_2006/project.py

    r3136 r3150  
    5252outputdir = home+sep+scenario_dir_name+sep+'output'+sep
    5353tidedir = home+sep+scenario_dir_name+sep+'tide_data'+sep
    54 comparereportdir = comparehome+sep+'documentation'+sep+'experimentation'+'boundary_ANUGA_MOST'
     54comparereportdir = comparehome+sep+'documentation'+sep+'experimentation'+sep+'boundary_ANUGA_MOST'+sep+'report'
     55comparereportfigdir = comparehome+sep+'documentation'+sep+'experimentation'+sep+'boundary_ANUGA_MOST'+sep+'report_figures'
    5556print'bound', boundarydir
    5657
Note: See TracChangeset for help on using the changeset viewer.