Changeset 3354

Timestamp:

Jul 18, 2006, 3:49:47 PM (19 years ago)

Author:

sexton

Message:

updates for pt hedland

Location:

production/pt_hedland_2006

Files:

• make_report.py (modified) (9 diffs)
• project.py (modified) (1 diff)

production/pt_hedland_2006/make_report.py

@@ -24 +24 @@
 * Modelling Methodology
 * Tsunami scenario
+* Data sources
 * Inundation model
-* Data sources
-* Modelling results
+* Inundation modelling results
 * Impact modelling
 * Summary
@@ -70 +70 @@
 report_title = 'Tsunami impact modelling for the North West shelf: %s' %scenario_name.title()
 
-# DTED data
-#production_dirs = {'20060426_004129': '1.5 AHD',
-#                   '20060426_004237': '-1.5 AHD',
-#                   '20060515_001733': '0 AHD'}
-#damage_maps = {'1.5 AHD': 'HAT_damage',
-#               '-1.5 AHD': 'LAT_damage',
-#               '0 AHD': 'MSL_damage'}
-
 # WA DLI data
 production_dirs = {'20060707_001859': 'MSL',
@@ -87 +79 @@
             'LAT': 'LAT_map'}
 
-gauge_map = 'pt_hedland_gauge_map.jpg'
-
-compare_output = 'compare_output_datasets'
+gauge_map = 'pt_hedland_dli_gauge.jpg'
 
 # Create sections and graphs for each designated production directory
@@ -179 +169 @@
   \maketitle
 
-  \\tableofcontents
-
     \section{Executive Summary}
     \label{sec:execsum}
   \input{execsum}
+
+  \\tableofcontents
   
   \section{Introduction}
@@ -197 +187 @@
     \input{tsunami_scenario}
 
+  \section{Data sources}
+    \label{sec:data}
+    \input{data}
+    
    \section{Inundation model}
     \label{sec:anuga}
     \input{anuga}
     \input{computational_setup}
-    
-  \section{Data sources}
-    \label{sec:data}
-    \input{data}
-    
-  \section{Modelling results}
+        
+  \section{Inundation modelling results}
      \label{sec:results}
          
@@ -215 +205 @@
 s = '\\begin{table} \\begin{center} \n'
 fid.write(s)
-s = '\caption{Defined point locations for %s study area.}' %scenario
+s = '\caption{Defined point locations for %s study area.}' %scenario_name
 fid.write(s)
 s = """
@@ -282 +272 @@
     \input{references}
 
-    \appendix
+    \\appendix
     
    \section{Metadata}
@@ -288 +278 @@
      \input{metadata}
 
+\pagebreak
+
    \section{Time series}
      \label{sec:timeseries}
@@ -297 +289 @@
 
 s="""
+
+\pagebreak
+
    \section{Damage modelling inputs}
      \label{sec:damageinputs}
      \input{damage_inputs}
 
-        \section{Time series}
-     \label{sec:timeseriescompare}
-
-"""
-fid.write(s)
-
-s = '\input{%s} \n \clearpage \n \n' %compare_output
-fid.write(s)
-
-s = '\end{document}'
-fid.write(s)
+\end{document}
+"""
+fid.write(s)

production/pt_hedland_2006/project.py

@@ -73 +73 @@
 gauge_filename = gaugedir + 'gauge_location_port_hedland.csv'
 buildings_filename = gaugedir + 'pt_hedland_res.csv'
+buildings_filename_out = 'pt_hedland_res_modified.csv'
 community_filename = gaugedir + 'CHINS_v2.csv'
 community_scenario = gaugedir + 'community_pt_hedland.csv'