Changeset 3999

Timestamp:

Nov 16, 2006, 9:54:30 AM (18 years ago)

Author:

sexton

Message:

dampier report updates

Location:

anuga_work/production/dampier_2006

Files:

• make_report_cipma.py (modified) (4 diffs)
• project.py (modified) (2 diffs)
• report/anuga.tex (deleted)
• report/anuga_setup.tex (added)
• report/computational_setup.tex (deleted)
• report/dampier_2006_report_CIPMA.tex (modified) (3 diffs)
• report/modelling_methodology.tex (modified) (1 diff)
• report_figures/dampier_gauges_1.jpg (added)
• report_figures/dampier_gauges_2.jpg (added)
• report_figures/dampier_gauges_3.jpg (added)

anuga_work/production/dampier_2006/make_report_cipma.py

@@ -84 +84 @@
 max_maps = {'Mw 9.0': 'mw9_map'}
 
-gauge_map = 'dampier_gauges.jpg'
-gauge_filename = 'test.xya'
+gauge_map1 = 'dampier_gauges_1.jpg'
+gauge_map2 = 'dampier_gauges_2.jpg'
+gauge_map3 = 'dampier_gauges_3.jpg'
+
 # Create sections and graphs for each designated production directory
 latex_output = []
@@ -214 +216 @@
     \input{data}
     
-   \section{Inundation model}
-    \label{sec:anuga}
-    \input{anuga}
-    \input{computational_setup}
+   %\section{Inundation model}
+   % \label{sec:anuga}
+   % \input{anuga}
+   % \input{computational_setup}
         
   \section{Inundation modelling results}
@@ -248 +250 @@
 ##fid.write(s)
 ##
-s = '\\begin{figure}[hbt] \n \centerline{ \includegraphics[width=\paperwidth]{../report_figures/%s}}' %gauge_map
-fid.write(s)
-
-#s  = """
-#\caption{Point locations used for Dampier study.}  
-#\label{fig:points}
-#\end{figure}
-#"""
-#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  = """
+\caption{Point locations used for Dampier study.}  
+\label{fig:points}
+\end{figure}
+"""
+fid.write(s)
     
 #s = '\input{interpretation} \n'
@@ -287 +296 @@
      \label{sec:metadata}
      \input{metadata}
+     
+\section{ANUGA modelling parameters}
+\label{sec:anugasetup}
+\input{anuga_setup}
 
 \clearpage

anuga_work/production/dampier_2006/project.py

@@ -65 +65 @@
 combined_final_name ='dampier_combined_elevation_final'
 
-gauge_name = 'dampier_gauges_up2.csv'
+gauge_name = 'dampier_gauges.csv'
+#gauge_name = 'dampier_gauges_up2.csv' 
 
 #Derive subdirectories and filenames
@@ -97 +98 @@
 
 gauge_dir = home+sep+state+sep+scenario_datas_name+sep+'anuga'+sep+'gauges'+sep
-gauge_filename = gauge_dir + 'dampier_gauges_up2.csv'
+gauge_filename = gauge_dir + gauge_name
 
 gauges_dir_name = gauges_dir + gauge_name

anuga_work/production/dampier_2006/report/dampier_2006_report_CIPMA.tex

@@ -64 +64 @@
     \input{data}
     
-   \section{Inundation model}
-    \label{sec:anuga}
-    \input{anuga}
-    \input{computational_setup}
+   %\section{Inundation model}
+   % \label{sec:anuga}
+   % \input{anuga}
+   % \input{computational_setup}
         
   \section{Inundation modelling results}
@@ -73 +73 @@
          
 \begin{figure}[hbt] 
- \centerline{ \includegraphics[width=\paperwidth]{../report_figures/dampier_gauges.jpg}}\input{mw9_map} 
+ \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}
+\end{figure}
+\input{mw9_map} 
  \clearpage 
  
@@ -92 +98 @@
      \label{sec:metadata}
      \input{metadata}
+     
+\section{ANUGA modelling parameters}
+\label{sec:anugasetup}
+\input{anuga_setup}
 
 \clearpage

anuga_work/production/dampier_2006/report/modelling_methodology.tex

@@ -59 +59 @@
 modelling the event itself with the URS model and modelling the impact with ANUGA. 
 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.
+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}.
 
 The event chosen for this study has been determined from the probabilistic