Changeset 4477


Ignore:
Timestamp:
May 23, 2007, 10:22:19 AM (17 years ago)
Author:
sexton
Message:

update project file to include newly acquired residential building data from EVP

Location:
anuga_work/production
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • anuga_work/production/broome_2006/project.py

    r4429 r4477  
    118118community_broome = gauges_dir + 'community_broome.csv'
    119119
    120 #buildings_filename = gauges_dir + 'broome_res_nexis.csv'
    121 buildings_filename_damage_out = 'broome_res_nexis_modified.csv'
     120buildings_filename = gauges_dir + 'Broome_res_Project.csv'
     121buildings_filename_out = 'Broome_res_Project_modified.csv'
    122122
    123123###############################

  • anuga_work/production/broome_2006/project_urs.py

    r4464 r4477  
    126126community_broome = gauges_dir + 'community_broome.csv'
    127127
    128 #buildings_filename = gauges_dir + 'broome_res_nexis.csv'
    129 buildings_filename_damage_out = 'broome_res_nexis_modified.csv'
     128buildings_filename = gauges_dir + 'Broome_res_Project.csv'
     129buildings_filename_out = 'Broome_res_Project_modified.csv'
    130130
    131131###############################

  • anuga_work/production/busselton_2006/project.py

    r4228 r4477  
    9696gauges_dir_name = gauges_dir + gauge_name
    9797
    98 #buildings_filename = gauges_dir + 'busselton_res_nexis.csv'
    99 buildings_filename_damage_out = 'busselton_res_nexis_modified.csv'
     98buildings_filename = gauges_dir + 'Busselton_res_Project.csv'
     99buildings_filename_out = 'Busselton_res_Project_modified.csv'
    100100
    101101###############################

  • anuga_work/production/dampier_2006/make_report.py

    r4228 r4477  
    118118                                                      report = True,
    119119                                                      reportname = reportname,
    120                                                       plot_quantity = ['stage', 'momentum'],
     120                                                      plot_quantity = ['stage', 'speed'],
    121121                                                      generate_fig = True,
    122122                                                      surface = False,
    123123                                                      time_min = None,
    124124                                                      time_max = None,
     125                                                      time_unit = 'hours',
    125126                                                      title_on = False,
     127                                                      use_cache = True,
    126128                                                      verbose = True)
    127129               
    … …  
    146148                                              report = True,
    147149                                              reportname = reportname,
    148                                               plot_quantity = ['stage', 'momentum'],
     150                                              plot_quantity = ['stage', 'speed'],
    149151                                              generate_fig = True,
    150152                                              surface = False,
    151153                                              time_min = None,
    152154                                              time_max = None,
     155                                              time_unit ='hours',
    153156                                              title_on = False,
     157                                              use_cache = True,
    154158                                              verbose = True)
    155159        latex_output.append(texname)

  • anuga_work/production/dampier_2006/make_report_cipma.py

    r4423 r4477  
    8181                    '20070426_045818_run': '1 in 10000 wave height'} # revised run with water flowing in the correct direction!
    8282
    83 is_parallel = True
     83is_parallel = False
    8484if is_parallel == True:
    8585    nodes = 8
    … …  
    107107
    108108            texname, elev_output = sww2timeseries(swwfiles,
    109                                                   project.gauge_filename,
     109                                                  project.gauges_dir_name,
    110110                                                  production_dirs,
    111111                                                  report = True,
    112112                                                  reportname = reportname,
    113                                                   plot_quantity = ['stage', 'momentum'],
     113                                                  plot_quantity = ['stage', 'speed'],
    114114                                                  generate_fig = True,
    115115                                                  surface = False,
    116116                                                  time_min = None,
    117117                                                  time_max = None,
     118                                                  time_unit = 'hours',
    118119                                                  title_on = False,
     120                                                  use_cache = True,
    119121                                                  verbose = True)
    120122           
    … …  
    122124   
    123125else:
    124    
     126    swwfiles = {}
    125127    for label_id in production_dirs.keys():
    126128
    … …  
    130132       
    131133    texname, elev_output = sww2timeseries(swwfiles,
    132                                           project.gauge_filename,
     134                                          project.gauges_dir_name,
    133135                                          production_dirs,
    134136                                          report = True,
    135137                                          reportname = report_name,
    136                                           plot_quantity = ['stage', 'momentum'],
     138                                          plot_quantity = ['stage', 'speed'],
    137139                                          generate_fig = True,
    138140                                          surface = False,
    139141                                          time_min = None,
    140142                                          time_max = None,
     143                                          time_unit = 'hours',
    141144                                          title_on = False,
     145                                          use_cache = True,
    142146                                          verbose = True)
     147    latex_output.append(texname)
    143148
    144149# Start report generation
    … …  
    265270"""
    266271fid.write(s)
    267 s = '\\begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/%s}}' %gauge_map3
     272s = '\\begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/%s}}' %gauge_map1
    268273fid.write(s)
    269274s  = """

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

    r4134 r4477  
    3030area will be the maximum cell area within the defined region and that each
    3131cell in the region does not necessarily have the same area.}.
    32 \Figure \ref{fig:dampier_area} shows the study area with regions of difference cell areas. The total number
     32Figure \ref{fig:dampier_area} shows the study area with regions of difference cell areas. The total number
    3333of cells is 177 191.
    3434Lateral accuracy refers to the distance at which we are confident in stating a region is inundated.

  • anuga_work/production/dampier_2006/report/dampier_2006_report_CIPMA.tex

    r4009 r4477  
    7474\begin{figure}[hbt] \centerline{\includegraphics[scale = 0.5]{../report_figures/dampier_gauges_2.jpg}}
    7575\caption{Point locations used for Dampier study; surrounding the facility.
    76 See Appendix \ref{sec:timeseries} for stage and speed results.
     76See Appendix \ref{sec:timeseries} for stage and momentum results.
    7777} 
    7878\label{fig:points2}
    7979\end{figure}
    8080\begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/dampier_gauges_1.jpg}}
    81 \caption{Point location used for Dampier study; surrounding the middle section of the pipeline.
    82 See Appendix \ref{sec:timeseries} for stage and speed results.}
    83 \label{fig:points1}
    84 \end{figure}
    85 \begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/dampier_gauges_3.jpg}}
    8681\caption{Point locations used for Dampier study; section
    8782of the pipeline towards the boundary of the region and other boundary gauges.
    88 See Appendix \ref{sec:timeseries} for stage and speed results.} 
     83See Appendix \ref{sec:timeseries} for stage and momentum results.} 
    8984\label{fig:points3}
    9085\end{figure}
    … …  
    10499
    105100    \appendix
    106    
     101
     102   \section{ANUGA modelling parameters}
     103\label{sec:anugasetup}
     104\input{anuga_setup}
     105
    107106   \section{Metadata}
    108107     \label{sec:metadata}
    … …  
    117116   \section{Time series}
    118117     \label{sec:timeseries}
    119 \input{latexoutput_cipma_020061116055135run}
    120  \clearpage
    121  
    122 \input{latexoutput_cipma_320061116055135run}
    123  \clearpage
    124  
    125 \input{latexoutput_cipma_720061116055135run}
     118\input{latexoutput_cipma20070426045818run}
    126119 \clearpage
    127120 

  • anuga_work/production/exmouth_2006/project.py

    r4476 r4477  
    126126community_exmouth = gauges_dir + 'community_exmouth.csv'
    127127
    128 buildings_filename_damage_out = 'exmouth_res_nexis_modified.csv'
     128buildings_filename = 'Exmouth_res_Project.csv'
     129buildings_filename_out = 'Exmouth_res_Project_modified.csv'
    129130
    130131###############################

  • anuga_work/production/onslow_2006/project.py

    r4432 r4477  
    8181community_filename = gaugedir + 'CHINS_v2.csv'
    8282community_scenario = gaugedir + 'community_onslow.csv'
    83 #buildings_filename = gaugedir + 'onslow_res.csv'
    84 buildings_filename = gaugedir + 'extra_points_nbed.csv'
    85 #buildings_filename_out = gaugedir + 'onslow_res_modified.csv'
    86 buildings_filename_damage_out = 'extra_points_nbed_modified.csv'
     83buildings_filename = gaugedir + 'Onslow_res_Project.csv'
     84buildings_filename_out = gaugedir + 'Onslow_res_Project.csv'
     85
    8786
    8887gaugetimeseries = gaugedir + 'onslow'

  • anuga_work/production/onslow_2006/project_urs.py

    r4432 r4477  
    125125community_filename = gauges_dir + 'CHINS_v2.csv'
    126126community_scenario = gauges_dir + 'community_onslow.csv'
    127 buildings_filename = gauges_dir + 'extra_points_nbed.csv'
    128 buildings_filename_damage_out = 'extra_points_nbed_modified.csv'
     127buildings_filename = gauges_dir + 'Onslow_res_Project.csv'
     128buildings_filename_out = 'Onslow_res_Project_modified.csv'
    129129###############################
    130130# Domain definitions

  • anuga_work/production/perth_2006/project.py

    r4228 r4477  
    112112gauges_dir_name = gauges_dir + gauge_name
    113113
    114 #buildings_filename = gauges_dir + 'perth_res_nexis.csv'
    115 buildings_filename_damage_out = 'perth_res_nexis_modified.csv'
     114buildings_filename = gauges_dir + 'Perth_res_Project.csv'
     115buildings_filename_out = 'Perth_res_Project_modified.csv'
    116116
    117117###############################

  • anuga_work/production/pt_hedland_2006/make_report.py

    r4228 r4477  
    112112                                                      report = True,
    113113                                                      reportname = reportname,
    114                                                       plot_quantity = ['stage', 'momentum'],
     114                                                      plot_quantity = ['stage', 'speed'],
    115115                                                      generate_fig = True,
    116116                                                      surface = False,
    117117                                                      time_min = None,
    118118                                                      time_max = None,
     119                                                      time_unit = 'hours',
    119120                                                      title_on = False,
     121                                                      use_cache = True,
    120122                                                      verbose = True)
    121123               
    … …  
    146148                                              time_min = None,
    147149                                              time_max = None,
     150                                              time_unit = 'hours',
    148151                                              title_on = False,
     152                                              use_cache = True,
    149153                                              verbose = True)
    150154       

  • anuga_work/production/pt_hedland_2006/project.py

    r4423 r4477  
    128128gauge_filename = gaugedir + 'gauge_location_port_hedland.csv'
    129129gauge_checking = gaugedir + 'gauge_checking_test.csv'
    130 buildings_filename = gaugedir + 'pt_hedland_res.csv'
    131 buildings_filename_out = 'pt_hedland_res_modified.csv'
    132 buildings_filename_damage_out = 'pt_hedland_res_modified_damage.csv'
     130buildings_filename = gaugedir + 'Port_Hedland_res_Project.csv'
     131buildings_filename_out = 'Port_Hedland_res_Project_modified.csv'
    133132community_filename = gaugedir + 'CHINS_v2.csv'
    134133community_scenario = gaugedir + 'community_pt_hedland.csv'

  • anuga_work/production/pt_hedland_2006/project_urs.py

    r4467 r4477  
    130130tide_dir = anuga_dir+'tide_data'+sep
    131131
    132 buildings_filename = gauges_dir + 'pt_hedland_res.csv'
    133 buildings_filename_out = 'pt_hedland_res_modified.csv'
    134 buildings_filename_damage_out = 'pt_hedland_res_modified_damage.csv'
     132buildings_filename = gauges_dir + 'Port_Hedland_res_Project.csv'
     133buildings_filename_out = 'Port_Hedland_res_Project_modified.csv'
    135134tidal_filename = tide_dir + 'pt_hedland_tide.txt'
    136135community_filename = gauges_dir + 'CHINS_v2.csv'
Note: See TracChangeset for help on using the changeset viewer.