Changeset 4009

Timestamp:

Nov 17, 2006, 6:48:16 PM (18 years ago)

Author:

sexton

Message:

updates

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (2 diffs)
• anuga_core/source/anuga/shallow_water/smf.py (modified) (3 diffs)
• anuga_work/production/dampier_2006/export_results.py (modified) (1 diff)
• anuga_work/production/dampier_2006/make_report_cipma.py (modified) (2 diffs)
• anuga_work/production/dampier_2006/project.py (modified) (1 diff)
• anuga_work/production/dampier_2006/report/anuga_setup.tex (modified) (1 diff)
• anuga_work/production/dampier_2006/report/dampier_2006_report_CIPMA.tex (modified) (2 diffs)
• anuga_work/production/dampier_2006/report/modelling_methodology.tex (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1023 +1023 @@
         savefig('profilefig')
                 
-    stage_axis = axis([time_min/60.0, time_max/60.0, min(min_stages), max(max_stages)*1.1])
+    #stage_axis = axis([time_min/60.0, time_max/60.0, min(min_stages), max(max_stages)*1.1])
     #stage_axis = axis([time_min/60.0, time_max/60.0, -3.0, 3.0])    
-    vel_axis = axis([time_min/60.0, time_max/60.0, min(max_speeds), max(max_speeds)*1.1])
-    mom_axis = axis([time_min/60.0, time_max/60.0, min(max_momentums), max(max_momentums)*1.1])  
+    #vel_axis = axis([time_min/60.0, time_max/60.0, min(max_speeds), max(max_speeds)*1.1])
+    #mom_axis = axis([time_min/60.0, time_max/60.0, min(max_momentums), max(max_momentums)*1.1])  
     
     cstr = ['g', 'r', 'b', 'c', 'm', 'y', 'k']
@@ -1061 +1061 @@
                 if which_quantity == 'stage':
                     plot(model_time[0:n[j]-1,k,j], stages[0:n[j]-1,k,j], '-', c = cstr[j])
-                    axis(stage_axis)
+                    #axis(stage_axis)
                     units = 'm'
                 if which_quantity == 'momentum':
                     plot(model_time[0:n[j]-1,k,j], momenta[0:n[j]-1,k,j], '-', c = cstr[j])
-                    axis(mom_axis)
+                    #axis(mom_axis)
                     units = 'm^2 / sec'
                 if which_quantity == 'xmomentum':
                     plot(model_time[0:n[j]-1,k,j], xmom[0:n[j]-1,k,j], '-', c = cstr[j])
-                    axis(mom_axis)
+                    #axis(mom_axis)
                     units = 'm^2 / sec'
                 if which_quantity == 'ymomentum':
                     plot(model_time[0:n[j]-1,k,j], ymom[0:n[j]-1,k,j], '-', c = cstr[j])
-                    axis(mom_axis)
+                    #axis(mom_axis)
                     units = 'm^2 / sec'
                 if which_quantity == 'speed':
                     plot(model_time[0:n[j]-1,k,j], speed[0:n[j]-1,k,j], '-', c = cstr[j])
-                    axis(vel_axis)
+                    #axis(vel_axis)
                     units = 'm / sec'
                 if which_quantity == 'bearing':

anuga_core/source/anuga/shallow_water/smf.py

@@ -338 +338 @@
 
         am = self.a3D
+        am2 = self.a2D
         wa = self.wavelength
         wi = self.width
@@ -346 +347 @@
         kappa = self.kappa
         kappad = self.kappad
-        amin = self.find_min(x0,wa,kappad,kappa,dx,am)
-        print 'hello amin', amin
-        #amin = 1.0
+        #amin = self.find_min(x0,wa,kappad,kappa,dx,am)
+        amin = 1.0
 
         #double Gaussian calculation assumes water displacement is oriented
@@ -365 +365 @@
         for i in range(N):
             try:
-                z[i] =  -am / (amin*(cosh(kappa*(yr[i]-y0)/(wi+wa)))**2) \
+                z[i] =  -(am/am2) / (amin*(cosh(kappa*(yr[i]-y0)/(wi+wa)))**2) \
                             * (exp(-((xr[i]-x0)/wa)**2) - \
                                 kappad*exp(-((xr[i]-dx-x0)/wa)**2))

anuga_work/production/dampier_2006/export_results.py

@@ -5 +5 @@
 from os import sep
 
-time_dir = '20061107_070805_run' #
+time_dir = '20061116_055135_run' #
 directory = project.output_dir
 name = directory + time_dir + sep + project.scenario_name

anuga_work/production/dampier_2006/make_report_cipma.py

@@ -76 +76 @@
 production_dirs = {#'20061101_053132_run': 'big event'} # parallel
                     #'20061101_054432_run': 'big event'} # sequential
-                    '20061107_070805_run': 'Mw 9.0'}
+                    #'20061107_070805_run': 'Mw 9.0',
+                    '20061116_055135_run': 'Mw 9.0'} # multiple interior regions
+                    #'20061116_062924_run': 'Mw 9.0'} # one interior region
 
 is_parallel = True
@@ -250 +252 @@
 ##fid.write(s)
 ##
-s = '\\begin{figure}[hbt] \n \centerline{ \includegraphics[width=\paperwidth]{../report_figures/%s}}' %gauge_map1
-fid.write(s)
-
-s = '\n \centerline{ \includegraphics[width=\paperwidth]{../report_figures/%s}}' %gauge_map2
-fid.write(s)
-
-s = '\n \centerline{ \includegraphics[width=\paperwidth]{../report_figures/%s}}' %gauge_map3
-fid.write(s)
-
-
+
+s = '\\begin{figure}[hbt] \centerline{\includegraphics[scale = 0.5]{../report_figures/%s}}' %gauge_map2
+fid.write(s)
 s  = """
-\caption{Point locations used for Dampier study.}  
-\label{fig:points}
+\caption{Point locations used for Dampier study; surrounding the facility.
+See Appendix \\ref{sec:timeseries} for stage and speed results.
+}  
+\label{fig:points2}
+\end{figure}
+"""
+fid.write(s)
+s = '\\begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/%s}}' %gauge_map1
+fid.write(s)
+s  = """
+\caption{Point location used for Dampier study; surrounding the middle section of the pipeline.
+See Appendix \\ref{sec:timeseries} for stage and speed results.} 
+\label{fig:points1}
+\end{figure}
+"""
+fid.write(s)
+s = '\\begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/%s}}' %gauge_map3
+fid.write(s)
+s  = """
+\caption{Point locations used for Dampier study; section
+of the pipeline towards the boundary of the region and other boundary gauges.
+See Appendix \\ref{sec:timeseries} for stage and speed results.}  
+\label{fig:points3}
 \end{figure}
 """

anuga_work/production/dampier_2006/project.py

@@ -65 +65 @@
 combined_final_name ='dampier_combined_elevation_final'
 
-gauge_name = 'dampier_gauges.csv'
-#gauge_name = 'dampier_gauges_up2.csv' 
+#gauge_name = 'dampier_gauges.csv'
+gauge_name = 'dampier_gauges_up2.csv' 
 
 #Derive subdirectories and filenames

anuga_work/production/dampier_2006/report/anuga_setup.tex

@@ -43 +43 @@
 \begin{figure}[hbt]
 
-  \centerline{ \includegraphics[scale=0.15]{../report_figures/dampier_model.jpg}}
+  \centerline{ \includegraphics[scale=0.5]{../report_figures/dampier_model.jpg}}
 
   \caption{Study area for Dampier scenario highlighting four regions of increased refinement.

anuga_work/production/dampier_2006/report/dampier_2006_report_CIPMA.tex

@@ -72 +72 @@
      \label{sec:results}
          
-\begin{figure}[hbt] 
- \centerline{ \includegraphics[width=\paperwidth]{../report_figures/dampier_gauges_1.jpg}}
- \centerline{ \includegraphics[width=\paperwidth]{../report_figures/dampier_gauges_2.jpg}}
- \centerline{ \includegraphics[width=\paperwidth]{../report_figures/dampier_gauges_3.jpg}}
-\caption{Point locations used for Dampier study.}  
-\label{fig:points}
+\begin{figure}[hbt] \centerline{\includegraphics[scale = 0.5]{../report_figures/dampier_gauges_2.jpg}}
+\caption{Point locations used for Dampier study; surrounding the facility.
+See Appendix \ref{sec:timeseries} for stage and speed results.
+}  
+\label{fig:points2}
+\end{figure}
+\begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/dampier_gauges_1.jpg}}
+\caption{Point location used for Dampier study; surrounding the middle section of the pipeline.
+See Appendix \ref{sec:timeseries} for stage and speed results.} 
+\label{fig:points1}
+\end{figure}
+\begin{figure}[hbt] \centerline{\includegraphics[scale=0.5]{../report_figures/dampier_gauges_3.jpg}}
+\caption{Point locations used for Dampier study; section
+of the pipeline towards the boundary of the region and other boundary gauges.
+See Appendix \ref{sec:timeseries} for stage and speed results.}  
+\label{fig:points3}
 \end{figure}
 \input{mw9_map} 
@@ -107 +117 @@
    \section{Time series}
      \label{sec:timeseries}
-\input{latexoutput_cipma_420061107070805run} 
+\input{latexoutput_cipma_020061116055135run} 
  \clearpage 
  
-\input{latexoutput_cipma_620061107070805run} 
+\input{latexoutput_cipma_320061116055135run} 
  \clearpage 
  
-\input{latexoutput_cipma_720061107070805run} 
+\input{latexoutput_cipma_720061116055135run} 
  \clearpage 
  

anuga_work/production/dampier_2006/report/modelling_methodology.tex

@@ -60 +60 @@
 In this way, the output from URS serves as an input to ANUGA. 
 In modelling terms, the URS output is a boundary condition for ANUGA. Further details
-regarding the modelling requirements for this study can be found in \ref{sec:anugasetup}.
+regarding the modelling requirements for this study can be found in 
+Appendix \ref{sec:anugasetup}.
 
 The event chosen for this study has been determined from the probabilistic