Changeset 4009


Ignore:
Timestamp:
Nov 17, 2006, 6:48:16 PM (16 years ago)
Author:
sexton
Message:

updates

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

    r4006 r4009  
    10231023        savefig('profilefig')
    10241024               
    1025     stage_axis = axis([time_min/60.0, time_max/60.0, min(min_stages), max(max_stages)*1.1])
     1025    #stage_axis = axis([time_min/60.0, time_max/60.0, min(min_stages), max(max_stages)*1.1])
    10261026    #stage_axis = axis([time_min/60.0, time_max/60.0, -3.0, 3.0])   
    1027     vel_axis = axis([time_min/60.0, time_max/60.0, min(max_speeds), max(max_speeds)*1.1])
    1028     mom_axis = axis([time_min/60.0, time_max/60.0, min(max_momentums), max(max_momentums)*1.1]) 
     1027    #vel_axis = axis([time_min/60.0, time_max/60.0, min(max_speeds), max(max_speeds)*1.1])
     1028    #mom_axis = axis([time_min/60.0, time_max/60.0, min(max_momentums), max(max_momentums)*1.1]) 
    10291029   
    10301030    cstr = ['g', 'r', 'b', 'c', 'm', 'y', 'k']
     
    10611061                if which_quantity == 'stage':
    10621062                    plot(model_time[0:n[j]-1,k,j], stages[0:n[j]-1,k,j], '-', c = cstr[j])
    1063                     axis(stage_axis)
     1063                    #axis(stage_axis)
    10641064                    units = 'm'
    10651065                if which_quantity == 'momentum':
    10661066                    plot(model_time[0:n[j]-1,k,j], momenta[0:n[j]-1,k,j], '-', c = cstr[j])
    1067                     axis(mom_axis)
     1067                    #axis(mom_axis)
    10681068                    units = 'm^2 / sec'
    10691069                if which_quantity == 'xmomentum':
    10701070                    plot(model_time[0:n[j]-1,k,j], xmom[0:n[j]-1,k,j], '-', c = cstr[j])
    1071                     axis(mom_axis)
     1071                    #axis(mom_axis)
    10721072                    units = 'm^2 / sec'
    10731073                if which_quantity == 'ymomentum':
    10741074                    plot(model_time[0:n[j]-1,k,j], ymom[0:n[j]-1,k,j], '-', c = cstr[j])
    1075                     axis(mom_axis)
     1075                    #axis(mom_axis)
    10761076                    units = 'm^2 / sec'
    10771077                if which_quantity == 'speed':
    10781078                    plot(model_time[0:n[j]-1,k,j], speed[0:n[j]-1,k,j], '-', c = cstr[j])
    1079                     axis(vel_axis)
     1079                    #axis(vel_axis)
    10801080                    units = 'm / sec'
    10811081                if which_quantity == 'bearing':
  • anuga_core/source/anuga/shallow_water/smf.py

    r3565 r4009  
    338338
    339339        am = self.a3D
     340        am2 = self.a2D
    340341        wa = self.wavelength
    341342        wi = self.width
     
    346347        kappa = self.kappa
    347348        kappad = self.kappad
    348         amin = self.find_min(x0,wa,kappad,kappa,dx,am)
    349         print 'hello amin', amin
    350         #amin = 1.0
     349        #amin = self.find_min(x0,wa,kappad,kappa,dx,am)
     350        amin = 1.0
    351351
    352352        #double Gaussian calculation assumes water displacement is oriented
     
    365365        for i in range(N):
    366366            try:
    367                 z[i] =  -am / (amin*(cosh(kappa*(yr[i]-y0)/(wi+wa)))**2) \
     367                z[i] =  -(am/am2) / (amin*(cosh(kappa*(yr[i]-y0)/(wi+wa)))**2) \
    368368                            * (exp(-((xr[i]-x0)/wa)**2) - \
    369369                                kappad*exp(-((xr[i]-dx-x0)/wa)**2))
  • anuga_work/production/dampier_2006/export_results.py

    r3955 r4009  
    55from os import sep
    66
    7 time_dir = '20061107_070805_run' #
     7time_dir = '20061116_055135_run' #
    88directory = project.output_dir
    99name = directory + time_dir + sep + project.scenario_name
  • anuga_work/production/dampier_2006/make_report_cipma.py

    r3999 r4009  
    7676production_dirs = {#'20061101_053132_run': 'big event'} # parallel
    7777                    #'20061101_054432_run': 'big event'} # sequential
    78                     '20061107_070805_run': 'Mw 9.0'}
     78                    #'20061107_070805_run': 'Mw 9.0',
     79                    '20061116_055135_run': 'Mw 9.0'} # multiple interior regions
     80                    #'20061116_062924_run': 'Mw 9.0'} # one interior region
    7981
    8082is_parallel = True
     
    250252##fid.write(s)
    251253##
    252 s = '\\begin{figure}[hbt] \n \centerline{ \includegraphics[width=\paperwidth]{../report_figures/%s}}' %gauge_map1
    253 fid.write(s)
    254 
    255 s = '\n \centerline{ \includegraphics[width=\paperwidth]{../report_figures/%s}}' %gauge_map2
    256 fid.write(s)
    257 
    258 s = '\n \centerline{ \includegraphics[width=\paperwidth]{../report_figures/%s}}' %gauge_map3
    259 fid.write(s)
    260 
    261 
     254
     255s = '\\begin{figure}[hbt] \centerline{\includegraphics[scale = 0.5]{../report_figures/%s}}' %gauge_map2
     256fid.write(s)
    262257s  = """
    263 \caption{Point locations used for Dampier study.} 
    264 \label{fig:points}
     258\caption{Point locations used for Dampier study; surrounding the facility.
     259See Appendix \\ref{sec:timeseries} for stage and speed results.
     260
     261\label{fig:points2}
     262\end{figure}
     263"""
     264fid.write(s)
     265s = '\\begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/%s}}' %gauge_map1
     266fid.write(s)
     267s  = """
     268\caption{Point location used for Dampier study; surrounding the middle section of the pipeline.
     269See Appendix \\ref{sec:timeseries} for stage and speed results.}
     270\label{fig:points1}
     271\end{figure}
     272"""
     273fid.write(s)
     274s = '\\begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/%s}}' %gauge_map3
     275fid.write(s)
     276s  = """
     277\caption{Point locations used for Dampier study; section
     278of the pipeline towards the boundary of the region and other boundary gauges.
     279See Appendix \\ref{sec:timeseries} for stage and speed results.} 
     280\label{fig:points3}
    265281\end{figure}
    266282"""
  • anuga_work/production/dampier_2006/project.py

    r3999 r4009  
    6565combined_final_name ='dampier_combined_elevation_final'
    6666
    67 gauge_name = 'dampier_gauges.csv'
    68 #gauge_name = 'dampier_gauges_up2.csv'
     67#gauge_name = 'dampier_gauges.csv'
     68gauge_name = 'dampier_gauges_up2.csv'
    6969
    7070#Derive subdirectories and filenames
  • anuga_work/production/dampier_2006/report/anuga_setup.tex

    r3999 r4009  
    4343\begin{figure}[hbt]
    4444
    45   \centerline{ \includegraphics[scale=0.15]{../report_figures/dampier_model.jpg}}
     45  \centerline{ \includegraphics[scale=0.5]{../report_figures/dampier_model.jpg}}
    4646
    4747  \caption{Study area for Dampier scenario highlighting four regions of increased refinement.
  • anuga_work/production/dampier_2006/report/dampier_2006_report_CIPMA.tex

    r3999 r4009  
    7272     \label{sec:results}
    7373         
    74 \begin{figure}[hbt]
    75  \centerline{ \includegraphics[width=\paperwidth]{../report_figures/dampier_gauges_1.jpg}}
    76  \centerline{ \includegraphics[width=\paperwidth]{../report_figures/dampier_gauges_2.jpg}}
    77  \centerline{ \includegraphics[width=\paperwidth]{../report_figures/dampier_gauges_3.jpg}}
    78 \caption{Point locations used for Dampier study.} 
    79 \label{fig:points}
     74\begin{figure}[hbt] \centerline{\includegraphics[scale = 0.5]{../report_figures/dampier_gauges_2.jpg}}
     75\caption{Point locations used for Dampier study; surrounding the facility.
     76See Appendix \ref{sec:timeseries} for stage and speed results.
     77
     78\label{fig:points2}
     79\end{figure}
     80\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.
     82See 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}}
     86\caption{Point locations used for Dampier study; section
     87of the pipeline towards the boundary of the region and other boundary gauges.
     88See Appendix \ref{sec:timeseries} for stage and speed results.} 
     89\label{fig:points3}
    8090\end{figure}
    8191\input{mw9_map}
     
    107117   \section{Time series}
    108118     \label{sec:timeseries}
    109 \input{latexoutput_cipma_420061107070805run}
     119\input{latexoutput_cipma_020061116055135run}
    110120 \clearpage
    111121 
    112 \input{latexoutput_cipma_620061107070805run}
     122\input{latexoutput_cipma_320061116055135run}
    113123 \clearpage
    114124 
    115 \input{latexoutput_cipma_720061107070805run}
     125\input{latexoutput_cipma_720061116055135run}
    116126 \clearpage
    117127 
  • anuga_work/production/dampier_2006/report/modelling_methodology.tex

    r3999 r4009  
    6060In this way, the output from URS serves as an input to ANUGA.
    6161In modelling terms, the URS output is a boundary condition for ANUGA. Further details
    62 regarding the modelling requirements for this study can be found in \ref{sec:anugasetup}.
     62regarding the modelling requirements for this study can be found in
     63Appendix \ref{sec:anugasetup}.
    6364
    6465The event chosen for this study has been determined from the probabilistic
Note: See TracChangeset for help on using the changeset viewer.