Changeset 4145

Timestamp:

Jan 8, 2007, 3:36:39 PM (17 years ago)

Author:

sexton

Message:

report updates and fixes to check_list

Files:

• anuga_core/documentation/planning/0607scenarios.png (modified) (previous)
• anuga_core/documentation/planning/Inundation Scenarios - 06 07 Plan.Gnt (modified) (3 diffs)
• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (11 diffs)
• anuga_validation/solitary_waves/solitary_wave_runup.py (modified) (1 diff)
• anuga_work/production/onslow_2006/make_report.py (modified) (7 diffs)
• anuga_work/production/onslow_2006/report/anuga_setup.tex (modified) (2 diffs)
• anuga_work/production/onslow_2006/report/damage_inputs.tex (modified) (3 diffs)
• anuga_work/production/onslow_2006/report/introduction.tex (modified) (2 diffs)
• anuga_work/production/onslow_2006/report/latexoutput.tex (modified) (2 diffs)
• anuga_work/production/onslow_2006/report/modelling_methodology.tex (modified) (3 diffs)
• anuga_work/production/onslow_2006/report/onslow_2006_report.tex (modified) (5 diffs)
• anuga_work/production/onslow_2006/report_figures/gaugeAirportRunwayspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeAirportRunwaystage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonBayeastspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonBayeaststage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonBaywestspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonBayweststage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonCreekDocksspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonCreekDocksstage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonCreekmouthspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonCreekmouthstage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonCreeksouthofdockspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonCreeksouthofdockstage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonPointLoadingBerthspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBeadonPointLoadingBerthstage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBindiBindiCommunityspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeBindiBindiCommunitystage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeCentredamwallspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeCentredamwallstage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeDamoverflowspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeDamoverflowstage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeHospitalspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeHospitalstage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeLightTowerspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeLightTowerstage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugePowerStationspeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugePowerStationstage.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeWestofGroynespeed.png (modified) (previous)
• anuga_work/production/onslow_2006/report_figures/gaugeWestofGroynestage.png (modified) (previous)

anuga_core/documentation/planning/Inundation Scenarios - 06 07 Plan.Gnt

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--****WARNING: DO NOT MODIFY THIS FILE DIRECTLY******-->
-<Gantt Version="0.902" Checksum="+R8DXMfKYgs=">
+<Gantt Version="0.902" Checksum="FkpD2Gk1zVI=">
   <Display Width="0" Height="0" Split="178" />
-  <Miscellaneous Saved="2006-12-11 18:35:09Z" Created="Monday, 11 December 2006 7:35:09 " />
+  <Miscellaneous Saved="2006-12-19 10:48:35Z" Created="Monday, 18 December 2006 11:48:35 " />
   <Globalization>
     <Culture LCID="3081" ISO="ENA" DN="English (Australia)" Cal="System.Globalization.GregorianCalendar" Parent="English">English (Australia)</Culture>
@@ -10 +10 @@
   <FirstDay Date="2006-08-28" />
   <LastDay Date="2007-06-30" />
-  <Tasks Size="38">
+  <Tasks Size="40">
     <!--S=Start D=Duration P=Predecessor H=Height L=Lag VA=Valign R=Remarks F=Flag I=Importance-->
     <!--B=BarType BC=BarColor BTx=BarText-->
@@ -17 +17 @@
     <Task ID="3" Type="1" S="2006-09-20" SH="0" P="2" In="0" B="2" BC="-16776961" D="17" H="35" L="1" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Hobart scenario</Task>
     <Task ID="4" Type="1" S="2006-09-29" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Karratha/Dampier data to NM&amp;I</Task>
-    <Task ID="5" Type="1" S="2006-10-12" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of K/D data</Task>
+    <Task ID="5" Type="1" S="2006-10-12" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of K/D data for CIPMA scenario</Task>
     <Task ID="6" Type="1" S="2006-09-15" SH="12" P="0" In="0" B="2" BC="-16776961" D="50.5" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">K/D scenario</Task>
     <Task ID="7" Type="1" S="2006-10-06" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Broome offshore data to NM&amp;I</Task>
-    <Task ID="8" Type="1" S="2006-10-26" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Broome data</Task>
-    <Task ID="9" Type="1" S="2006-10-27" SH="12" P="8" In="0" B="2" BC="-16776961" D="15.0" H="35" L="1" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Broome setup</Task>
+    <Task ID="8" Type="1" S="2006-12-15" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Broome data</Task>
+    <Task ID="9" Type="1" S="2007-01-08" SH="0" P="8" In="0" B="2" BC="-16776961" D="3.0" H="35" L="15.5" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Broome setup</Task>
     <Task ID="10" Type="1" S="2006-11-24" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Perth offshore data to NM&amp;I</Task>
     <Task ID="11" Type="1" S="2006-12-07" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Perth data</Task>
-    <Task ID="12" Type="1" S="2006-12-08" SH="0" P="11" In="0" B="2" BC="-16776961" D="3" H="35" L="0.5" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Perth setup</Task>
+    <Task ID="12" Type="1" S="2006-12-08" SH="0" P="11" In="0" B="2" BC="-16776961" D="7" H="35" L="0.5" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Perth setup</Task>
     <Task ID="13" Type="1" S="2006-11-24" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Busselton offshore data to NM&amp;I</Task>
-    <Task ID="14" Type="1" S="2006-12-14" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Busselton data</Task>
-    <Task ID="15" Type="1" S="2006-12-18" SH="0" P="14" In="0" B="2" BC="-16776961" D="2.5" H="35" L="1.5" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Busselton setup</Task>
+    <Task ID="14" Type="1" S="2006-12-18" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Busselton data</Task>
+    <Task ID="15" Type="1" S="2006-12-19" SH="12" P="14" In="0" B="2" BC="-16776961" D="3.5" H="35" L="1.5" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Busselton setup</Task>
     <Task ID="16" Type="1" S="2006-11-27" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Exmouth offshore data to NM&amp;I</Task>
-    <Task ID="17" Type="1" S="2006-12-11" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Exmouth data</Task>
-    <Task ID="18" Type="1" S="2006-12-12" SH="12" P="17" In="0" B="2" BC="-16776961" D="3.5" H="35" L="1.5" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Exmouth setup</Task>
-    <Task ID="19" Type="1" S="2007-01-12" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Shark Bay offshore data to NM&amp;I</Task>
-    <Task ID="20" Type="1" S="2007-02-02" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Shark Bay data</Task>
-    <Task ID="21" Type="1" S="2007-01-24" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of BC for Shark Bay</Task>
-    <Task ID="22" Type="1" S="2007-02-05" SH="0" P="20" In="0" B="2" BC="-16776961" D="15" H="35" L="1" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Shark Bay validation exercise</Task>
-    <Task ID="23" Type="1" S="2007-01-17" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Decision of number and type of events</Task>
-    <Task ID="24" Type="1" S="2007-01-26" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of events</Task>
-    <Task ID="25" Type="1" S="2007-01-29" SH="12" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">K/D run</Task>
-    <Task ID="26" Type="1" S="2007-02-05" SH="0" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Broome run</Task>
-    <Task ID="27" Type="1" S="2007-02-12" SH="0" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Perth run</Task>
-    <Task ID="28" Type="1" S="2007-02-19" SH="0" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Busselton run</Task>
-    <Task ID="29" Type="1" S="2007-02-26" SH="0" P="0" In="0" B="2" BC="-16776961" D="14.5" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Exmouth run</Task>
-    <Task ID="30" Type="1" S="2007-03-05" SH="0" P="0" In="0" B="2" BC="-16776961" D="14.5" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Onslow run</Task>
-    <Task ID="31" Type="1" S="2007-03-12" SH="0" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Pt Hedland run</Task>
-    <Task ID="32" Type="1" S="2006-12-05" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of offshore data for NSW slump scenarios</Task>
-    <Task ID="33" Type="1" S="2006-12-07" SH="0" P="0" In="0" B="2" BC="-16776961" D="10" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Wollongong slump scenario</Task>
-    <Task ID="34" Type="1" S="2006-12-07" SH="0" P="0" In="0" B="2" BC="-16776961" D="10" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Sydney slump scenario</Task>
-    <Task ID="35" Type="1" S="2006-12-07" SH="0" P="0" In="0" B="2" BC="-16776961" D="10" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Newcastle slump scenario</Task>
-    <Task ID="36" Type="1" S="2006-12-15" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">ANUGA release</Task>
-    <Task ID="37" Type="1" S="2007-01-19" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Beowulf operational</Task>
-    <Task ID="38" Type="1" S="2006-12-22" SH="0" P="0" In="0" B="2" BC="-16776961" D="11" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Christmas Break</Task>
+    <Task ID="17" Type="1" S="2006-12-21" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Exmouth data</Task>
+    <Task ID="18" Type="1" S="2007-01-11" SH="0" P="17" In="0" B="2" BC="-16776961" D="3" H="35" L="15" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Exmouth setup</Task>
+    <Task ID="19" Type="1" S="2006-12-22" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Deliver of updated K/D data</Task>
+    <Task ID="20" Type="1" S="2007-01-03" SH="12" P="19" In="0" B="2" BC="-16776961" D="2.5" H="35" L="8.5" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">K/D resetup</Task>
+    <Task ID="21" Type="1" S="2007-01-12" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Shark Bay offshore data to NM&amp;I</Task>
+    <Task ID="22" Type="1" S="2007-02-02" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of Shark Bay data</Task>
+    <Task ID="23" Type="1" S="2007-01-24" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of BC for Shark Bay</Task>
+    <Task ID="24" Type="1" S="2007-02-05" SH="0" P="22" In="0" B="2" BC="-16776961" D="15" H="35" L="1" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Shark Bay validation exercise</Task>
+    <Task ID="25" Type="1" S="2007-01-17" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Decision of number and type of events</Task>
+    <Task ID="26" Type="1" S="2007-01-26" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of events</Task>
+    <Task ID="27" Type="1" S="2007-01-29" SH="12" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">K/D run</Task>
+    <Task ID="28" Type="1" S="2007-02-05" SH="0" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Broome run</Task>
+    <Task ID="29" Type="1" S="2007-02-12" SH="0" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Perth run</Task>
+    <Task ID="30" Type="1" S="2007-02-19" SH="0" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Busselton run</Task>
+    <Task ID="31" Type="1" S="2007-02-26" SH="0" P="0" In="0" B="2" BC="-16776961" D="14.5" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Exmouth run</Task>
+    <Task ID="32" Type="1" S="2007-03-05" SH="0" P="0" In="0" B="2" BC="-16776961" D="14.5" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Onslow run</Task>
+    <Task ID="33" Type="1" S="2007-03-12" SH="0" P="0" In="0" B="2" BC="-16776961" D="15" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Pt Hedland run</Task>
+    <Task ID="34" Type="1" S="2006-12-05" SH="12" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Delivery of offshore data for NSW slump scenarios</Task>
+    <Task ID="35" Type="1" S="2006-12-07" SH="0" P="0" In="0" B="2" BC="-16776961" D="10" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Wollongong slump scenario</Task>
+    <Task ID="36" Type="1" S="2006-12-07" SH="0" P="0" In="0" B="2" BC="-16776961" D="10" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Sydney slump scenario</Task>
+    <Task ID="37" Type="1" S="2006-12-07" SH="0" P="0" In="0" B="2" BC="-16776961" D="10" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Newcastle slump scenario</Task>
+    <Task ID="38" Type="1" S="2006-12-22" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">ANUGA release</Task>
+    <Task ID="39" Type="1" S="2007-01-19" SH="0" P="0" In="0" B="0" BC="-16776961" D="0" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Beowulf operational</Task>
+    <Task ID="40" Type="1" S="2006-12-22" SH="0" P="0" In="0" B="2" BC="-16776961" D="11" H="35" L="0" I="F" F="F" VA="1" R="" BTL="0" BTT="0" BTR="0" BTB="0">Christmas Break</Task>
   </Tasks>
   <TextStyles Size="8">

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -833 +833 @@
                     
     import sys
-    if not sys.version.startswith('2.4'):
+    #if not sys.version.startswith('2.4'):
         # Backwards compatibility
-        from sets import Set as set
-        
-    
-    if sys.platform == 'win32':
-        for i,j in enumerate(quantity):
-            quantity[i] = quantity[i].lower()
-        p = list(set(quantity).difference(set(all_quantity)))
-        if len(p) <> 0:
-            msg = 'Quantities %s do not exist - please try again' %p
-            raise Exception, msg
+    #   from sets import Set as set
+
+    from sets import Set as set
+            
+    for i,j in enumerate(quantity):
+        quantity[i] = quantity[i].lower()
+    p = list(set(quantity).difference(set(all_quantity)))
+    if len(p) <> 0:
+        msg = 'Quantities %s do not exist - please try again' %p
+        raise Exception, msg
         
     return 
@@ -928 +928 @@
     max_momentums = []
     max_speeds = []
-    c = 0
+    max_depths = []
     model_time_plot3d = zeros((n0,m), Float)
     stages_plot3d = zeros((n0,m), Float)
@@ -944 +944 @@
             max_stage = 0
             max_momentum = 0
-            max_speed = 0   
+            max_speed = 0
+            max_depth = 0
             gaugeloc = locations[k]
             thisfile = file_loc[j]+sep+'gauges_time_series'+'_'+gaugeloc+'.csv'
@@ -983 +984 @@
                     if m > max_momentum: max_momentum = m
                     if vel > max_speed: max_speed = vel
+                    if z > 0 and depth > max_depth: max_depth = depth
                     
                     
@@ -990 +992 @@
             min_stages.append(min_stage)
             max_momentums.append(max_momentum)
-            max_speeds.append(max_speed)     
+            max_speeds.append(max_speed)
+            max_depths.append(max_depth)
             #### finished generating quantities for each swwfile #####
         
@@ -1026 +1029 @@
         profilefig = 'solution_xprofile' 
         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, -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])  
+
+    depth_axis = axis([time_min/60.0, time_max/60.0, 0, max(max_depths)*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])  
     
     cstr = ['g', 'r', 'b', 'c', 'm', 'y', 'k']
@@ -1037 +1041 @@
     elev_output = []
     if len(label_id) > 1: graphname_report = []
+    pp = 1
+    div = 11.
     for k in gauge_index:
         g = gauges[k]
         count1 = 0
         if report == True and len(label_id) > 1:
-            s = '\\begin{figure}[hbt] \n \\centering \n \\begin{tabular}{cc} \n'
+            s = '\\begin{figure}[ht] \n \\centering \n \\begin{tabular}{cc} \n'
             fid.write(s)
         if len(label_id) > 1: graphname_report = []
@@ -1063 +1069 @@
                     plot(model_time[0:n[j]-1,k,j], depths[0:n[j]-1,k,j], '-', c = cstr[j])
                     units = 'm'
+                    axis(depth_axis)
                 if which_quantity == 'stage':
-                    if elevations[0:n[j]-1,k,j] < 0:
+                    if elevations[0,k,j] < 0:
                         plot(model_time[0:n[j]-1,k,j], stages[0:n[j]-1,k,j], '-', c = cstr[j])
+                        axis(stage_axis)
                     else:
                         plot(model_time[0:n[j]-1,k,j], depths[0:n[j]-1,k,j], '-', c = cstr[j])
-                    #axis(stage_axis)
+                        axis(depth_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':
@@ -1170 +1178 @@
                 s = '\end{tabular} \n \\caption{%s} \n \label{fig:%s} \n \end{figure} \n \n' %(caption, label)
                 fid.write(s)
-                c += 1
-                if c % 6 == 0: fid.write('\\clearpage \n')
+                cc += 1
+                if cc % 6 == 0: fid.write('\\clearpage \n')
                 savefig(graphname_latex)               
                 
@@ -1186 +1194 @@
                     else:
                         word_quantity += plot_quantity[i]
-                print 'hello', elevations[0,k,j]
                 where1 = 0
                 count1 += 1
@@ -1213 +1220 @@
             s = '\end{tabular} \n \\caption{%s} \n \label{fig:%s} \n \end{figure} \n \n' %(caption, label)
             fid.write(s)
-            c += 1
-            if c % 6 == 0: fid.write('\\clearpage \n')          
+            if float((k+1)/div - pp) == 0.:
+                fid.write('\\clearpage \n')
+                pp += 1
             
             #### finished generating figures ###

anuga_validation/solitary_waves/solitary_wave_runup.py

@@ -54 +54 @@
 
 # Structured mesh
-dx = 30           # Resolution: Length of subdivisions on x axis (length)
-dy = 30           # Resolution: Length of subdivisions on y axis (width)
+dx = 5           # Resolution: Length of subdivisions on x axis (length)
+dy = 5           # Resolution: Length of subdivisions on y axis (width)
 
 length = east-west

anuga_work/production/onslow_2006/make_report.py

@@ -187 +187 @@
   \input{execsum}
 
+\clearpage
+
   \\tableofcontents
   
@@ -210 +212 @@
 """
 fid.write(s)
-
-# Generate latex output for location points
-s = '\\begin{table} \\begin{center} \n'
-fid.write(s)
-s = '\caption{Defined point locations for %s study area.}' %scenario_name
-fid.write(s)
-s = """
-\label{table:locations}
-\\begin{tabular}{|l|l|l|l|}\hline
-\\bf{Point Name} & \\bf{Easting} & \\bf{Northing} & \\bf{Elevation (m)}\\\\ \hline
-"""
-fid.write(s)
-
-gauges, locations, elevation = get_gauges_from_file(project.gauge_filename)
-
-for name, gauges, elev in zip(locations, gauges, elevation):
-    east = gauges[0]
-    north = gauges[1]
-    s = '%s & %.2f & %.2f & %.2f \\\\ \hline \n' %(name.replace('_',' '), east, north, elev)
-    fid.write(s)
-
-s = '\\end{tabular} \n  \end{center} \n \end{table} \n \n'
-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 Onslow study.}  
-\label{fig:points}
-\end{figure}
-"""
-fid.write(s)
     
 s = '\input{interpretation} \n'
@@ -257 +226 @@
     fid.write(s)
 
+# Generate latex output for location points
+s = '\\begin{table} \\begin{center} \n'
+fid.write(s)
+s = '\caption{Defined point locations for %s study area.}' %scenario_name
+fid.write(s)
+s = """
+\label{table:locations}
+\\begin{tabular}{|l|l|l|l|}\hline
+\\bf{Point Name} & \\bf{Easting} & \\bf{Northing} & \\bf{Elevation (m)}\\\\ \hline
+"""
+fid.write(s)
+
+gauges, locations, elevation = get_gauges_from_file(project.gauge_filename)
+
+for name, gauges, elev in zip(locations, gauges, elevation):
+    east = gauges[0]
+    north = gauges[1]
+    s = '%s & %.2f & %.2f & %.2f \\\\ \hline \n' %(name.replace('_',' '), east, north, elev)
+    fid.write(s)
+
+s = '\\end{tabular} \n  \end{center} \n \end{table} \n \n'
+fid.write(s)
+
+#s = '\\begin{figure}[h] \n \centerline{ \includegraphics[width=\paperwidth]{../report_figures/%s}}' %gauge_map
+s = '\\begin{figure}[h] \n \centerline{ \includegraphics[scale=0.7]{../report_figures/%s}}' %gauge_map
+fid.write(s)
+
+s  = """
+\caption{Point locations used for Onslow study.}  
+\label{fig:points}
+\end{figure}
+
+\clearpage
+"""
+fid.write(s)
+
 # Closing
 
@@ -265 +270 @@
 """
 fid.write(s)
-
-#for i, name in enumerate(production_dirs.keys()):
-
-#    s = '\input{%s} \n \clearpage \n \n' %damage_maps[production_dirs[name]]
-#    fid.write(s)
 
 s = """
@@ -285 +285 @@
     \input{references}
 
+\clearpage
+
     \\appendix
 
@@ -302 +304 @@
      \label{sec:timeseries}
      \input{timeseriesdiscussion}
+     \clearpage
 """
 fid.write(s)
@@ -309 +312 @@
 
 s="""
-
-\pagebreak
 
    \section{Damage modelling inputs}

anuga_work/production/onslow_2006/report/anuga_setup.tex

@@ -55 +55 @@
 \begin{figure}[hbt]
 
-  \centerline{ \includegraphics[scale=0.15]{../report_figures/onslow_resolution_zones.jpg}}
+  \centerline{ \includegraphics[scale=0.125]{../report_figures/onslow_resolution_zones.jpg}}
 
   \caption{Study area for Onslow scenario highlighting four regions of increased refinement.
@@ -87 +87 @@
 \caption{Parameters used in ANUGA for the Onslow scenario.}
 \begin{tabular}{|l|l|l|}\hline
-Mesh & & \hline
-& resolution in Region 1 & 500 m$^2$ \hline
-& resolution in Region 2 & 2500 m$^2$ \hline
-& resolution in Region 3 & 20000 m$^2$ \hline
-& remaining resolution & 100 000 m$^2$ \hline
-Model parameters & & \hline
-& friction & 0.017
-& minimum stored height & 0.1 m \hline
+Mesh & & \\ \hline
+& resolution in Region 1 & 500 m$^2$ \\ \hline
+& resolution in Region 2 & 2500 m$^2$ \\ \hline
+& resolution in Region 3 & 20000 m$^2$ \\ \hline
+& remaining resolution & 100 000 m$^2$ \\ \hline
+Model parameters & & \\ \hline
+& friction & 0.017 \\ \hline
+& minimum stored height & 0.1 m \\ \hline
 \end{tabular}
 \end{center}

anuga_work/production/onslow_2006/report/damage_inputs.tex

@@ -1 @@
-\begin{table}[p]
+\begin{table}[h]
 \begin{center}
 \caption{Framed residential building collapse probability. $h$ is the
@@ -16 +16 @@
 \end{table}
 
-\begin{table}
+\begin{table}[h]
 \begin{center}
 \caption{Mortality and injury state probability}
@@ -34 +34 @@
 \end{table}
 
-\begin{table}
+\begin{table}[h]
 \begin{center}
 \caption{Injury level classificationse. Floor height is assumed to be 30cm}

anuga_work/production/onslow_2006/report/introduction.tex

@@ -22 +22 @@
 detailing critical infrastructure as well as damage modelling estimates. 
 
-This report is the first in a series of tsunami assessments 
-of the North West Shelf. The scenario used for this study has
-an unknown return period, but is considered a plausible event (see
-Section \ref{sec:methodology}). 
-Subsequent assessments will use refined hazard models with
-associate return periods. A suite of assessments will be
-made for Onslow and other localities, as advised by FESA.
+This report details the impact assessments for a range of tsunami events.
+These events are based on the probabilistic hazard assessment conducted
+for the Western Australian coastline. A number of events are selected for
+return periods of 500, 1000 and 2000 years, see Section \ref{sec:tsunamiscenario}.
+%This report is the first in a series of tsunami assessments 
+%of the North West Shelf. The scenario used for this study has
+%an unknown return period, but is considered a plausible event (see
+%Section \ref{sec:methodology}). 
+%Subsequent assessments will use refined hazard models with
+%associate return periods. A suite of assessments will be
+%made for Onslow and other localities, as advised by FESA.
 
 Onslow has a population of around 800 and
@@ -38 +42 @@
 
 The modelling technique to simulate the 
-impact ashore is discussed in Section \ref{sec:methodology} and data inputs
-discussed in Section \ref{sec:data}. 
+impact ashore is discussed in Section \ref{sec:methodology} with 
+event and data inputs
+discussed in Sections \ref{sec:tsunamiscenario} and \ref{sec:data} respectively. 
 The inundation results are presented and discussed in Section \ref{sec:results} 
 and the impact modelling results outlined in Section \ref{sec:impact}.

anuga_work/production/onslow_2006/report/latexoutput.tex

@@ -1 @@
-\begin{figure}[hbt] 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonPointLoadingBerthstage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonPointLoadingBerthspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for stage and speed at Beadon Point Loading Berth location (elevation -8.70m)} 
+ \label{fig:gaugeBeadonPointLoadingBerth} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeHospitalstage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeHospitalspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for depth and speed at Hospital location (elevation 6.02m)} 
+ \label{fig:gaugeHospital} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
  \centering 
  \begin{tabular}{cc} 
@@ -9 +29 @@
  \end{figure} 
  
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugePowerStationstage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugePowerStationspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for depth and speed at Power Station location (elevation 5.81m)} 
+ \label{fig:gaugePowerStation} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeAirportRunwaystage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeAirportRunwayspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for depth and speed at Airport Runway location (elevation 5.49m)} 
+ \label{fig:gaugeAirportRunway} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonCreekDocksstage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonCreekDocksspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for depth and speed at Beadon Creek Docks location (elevation 1.65m)} 
+ \label{fig:gaugeBeadonCreekDocks} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeWestofGroynestage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeWestofGroynespeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for stage and speed at West of Groyne location (elevation -2.11m)} 
+ \label{fig:gaugeWestofGroyne} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonCreekmouthstage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonCreekmouthspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for stage and speed at Beadon Creek mouth location (elevation -2.90m)} 
+ \label{fig:gaugeBeadonCreekmouth} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonCreeksouthofdockstage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonCreeksouthofdockspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for stage and speed at Beadon Creek south of dock location (elevation -1.81m)} 
+ \label{fig:gaugeBeadonCreeksouthofdock} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeCentredamwallstage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeCentredamwallspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for depth and speed at Centre dam wall location (elevation 2.09m)} 
+ \label{fig:gaugeCentredamwall} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeDamoverflowstage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeDamoverflowspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for depth and speed at Dam overflow location (elevation 0.88m)} 
+ \label{fig:gaugeDamoverflow} 
+ \end{figure} 
+ 
+\clearpage 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeLightTowerstage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeLightTowerspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for depth and speed at Light Tower location (elevation 3.86m)} 
+ \label{fig:gaugeLightTower} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonBayweststage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonBaywestspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for stage and speed at Beadon Bay west location (elevation -4.62m)} 
+ \label{fig:gaugeBeadonBaywest} 
+ \end{figure} 
+ 
+\begin{figure}[ht] 
+ \centering 
+ \begin{tabular}{cc} 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonBayeaststage.png}& 
+\includegraphics[width=0.49\linewidth, height=50mm]{../report_figures/gaugeBeadonBayeastspeed.png}\\ 
+\end{tabular} 
+ \caption{Time series for stage and speed at Beadon Bay east location (elevation -3.56m)} 
+ \label{fig:gaugeBeadonBayeast} 
+ \end{figure} 
+ 

anuga_work/production/onslow_2006/report/modelling_methodology.tex

@@ -29 +29 @@
 evenly spaced along the Sunda Arc subduction zone. 
 The assessment used the Method of Splitting Tsunamis (MOST)
-\cite{VT:MOST} model. A detailed probabilistic hazard map has now been completed
-for the WA coastline \cite{prob:fesa} which is based on the paradigm used by the URS corporation's 
-Probabilistic Tsunami Hazard Analysis \cite{somerville:urs}.
+\cite{VT:MOST} model. This preliminary hazard map had no probability attached to the event which is
+required to conduct a tsunami risk assessment. Using
+the Probabilistic Tsunami Hazard Analysis \cite{somerville:urs} paradigm
+used by the URS corporation, a detailed probabilistic hazard map has now been completed
+for the WA coastline \cite{prob:fesa}. 
 
 While MOST and URS are suitable for generating and propagating the tsunami wave from its source, 
@@ -57 +59 @@
 Further details
 regarding the inundation modelling requirements for this study can be found in 
-Appendix \ref{anugasetup}.
+Appendix \ref{sec:anugasetup}.
 
 The risk of a given tsunami scenario can only be determined when the likelihood
@@ -77 +79 @@
 for a range of probabilities (or return periods). As Figure \ref{fig:probonslow}
 shows, for a given probability, a number of events are possible. The resulting
-impact to Onslow would then vary depending on the source of the event.  
+impact to Onslow would then vary depending on the source of the event.  Further detail
+on the tsunami scenarios are outlined in Section \ref{sec:tsunamiscenario}.
 
 % used for the 2005 report when looking at one event

anuga_work/production/onslow_2006/report/onslow_2006_report.tex

@@ -53 +53 @@
   \input{execsum}
 
+\clearpage
+
   \tableofcontents
   
@@ -74 +76 @@
      \label{sec:results}
          
+\input{interpretation} 
+\input{HAT_map} 
+ \clearpage 
+ 
+\input{MSL_map} 
+ \clearpage 
+ 
+\input{LAT_map} 
+ \clearpage 
+ 
 \begin{table} \begin{center} 
 \caption{Defined point locations for onslow study area.}
@@ -97 +109 @@
  \end{table} 
  
-\begin{figure}[hbt] 
- \centerline{ \includegraphics[width=\paperwidth]{../report_figures/onslow_dli_gauge.jpg}}
+\begin{figure}[h] 
+ \centerline{ \includegraphics[scale=0.7]{../report_figures/onslow_dli_gauge.jpg}}
 \caption{Point locations used for Onslow study.}  
 \label{fig:points}
 \end{figure}
-\input{interpretation} 
-\input{HAT_map} 
- \clearpage 
- 
-\input{MSL_map} 
- \clearpage 
- 
-\input{LAT_map} 
- \clearpage 
- 
+
+\clearpage
 
    \section{Impact modelling}
@@ -130 +134 @@
     \input{references}
 
+\clearpage
+
     \appendix
 
@@ -147 +153 @@
      \label{sec:timeseries}
      \input{timeseriesdiscussion}
+     \clearpage
 \input{latexoutput} 
  \clearpage 
  
-
-
-\pagebreak
 
    \section{Damage modelling inputs}