Changeset 4021

Timestamp:

Nov 21, 2006, 3:02:03 PM (18 years ago)

Author:

sexton

Message:

(i) updates for Dampier report (ii) update cairns demo

Files:

• anuga_core/documentation/user_manual/demos/cairns/gauges.csv (added)
• anuga_core/documentation/user_manual/demos/cairns/runcairns.py (modified) (2 diffs)
• anuga_core/source/anuga/shallow_water/smf.py (modified) (3 diffs)
• anuga_work/production/dampier_2006/export_results.py (modified) (2 diffs)
• anuga_work/production/dampier_2006/make_report_cipma.py (modified) (6 diffs)
• anuga_work/production/dampier_2006/report/MetadataforATWSDampierScenario.pdf (modified) (previous)
• anuga_work/production/dampier_2006/report/anuga_setup.tex (modified) (3 diffs)
• anuga_work/production/dampier_2006/report/data.tex (modified) (1 diff)
• anuga_work/production/dampier_2006/report/execsum.tex (modified) (2 diffs)
• anuga_work/production/dampier_2006/report/metadata.tex (modified) (1 diff)
• anuga_work/production/dampier_2006/report_figures/dampier_gauges_1.jpg (modified) (previous)
• anuga_work/production/dampier_2006/report_figures/dampier_gauges_2.jpg (modified) (previous)
• anuga_work/production/dampier_2006/report_figures/dampier_gauges_3.jpg (deleted)
• anuga_work/production/dampier_2006/report_figures/max_inundation_high_tide.jpg (modified) (previous)

anuga_core/documentation/user_manual/demos/cairns/runcairns.py

@@ -35 +35 @@
 # Define scenario as either slump or fixed_wave.
 #-------------------------------------------------------------------------------
-scenario = 'slump' # OR 'fixed_wave'
+#scenario = 'slump' # OR 
+scenario = 'fixed_wave'
 if access(scenario,F_OK) == 0:
     mkdir (scenario)
@@ -193 +194 @@
         domain.write_boundary_statistics(tags = 'ocean_east')     
 
-        # save every 30 secs as wave starts inundating ashore
-        for t in domain.evolve(yieldstep = 30, finaltime = 10000, 
-                               skip_initial_step = True):
-            domain.write_time()
-            domain.write_boundary_statistics(tags = 'ocean_east')
+    # save every 30 secs as wave starts inundating ashore
+    for t in domain.evolve(yieldstep = 30, finaltime = 10000, 
+                           skip_initial_step = True):
+        domain.write_time()
+        domain.write_boundary_statistics(tags = 'ocean_east')
             
 print 'That took %.2f seconds' %(time.time()-t0)

anuga_core/source/anuga/shallow_water/smf.py

@@ -92 +92 @@
     a3D = a2D / (1 + (15.5*sqrt(depth/(length*sint))))
 
+    if verbose is True:
+        
     #a few temporary print statements
     if verbose is True:
@@ -111 +113 @@
         print '\t2D amplitude: ', a2D
         print '\t3D amplitude: ', a3D
+        print '\t HELLO', a0, ut, s0, t0, w, a2D, a3D
 
     #keep an eye on some of the assumptions built into the maths
@@ -117 +120 @@
         if verbose is True:
             print 'WARNING: slope out of range (5 - 30 degrees) ', slope
+            print 'hello'
     if ((depth/length < 0.06) or (depth/length > 1.5)):
         if verbose is True:

anuga_work/production/dampier_2006/export_results.py

@@ -19 +19 @@
 
 if which_var == 1:  # Absolute Momentum
-    outname = name + '_momentum'
+    outname = name + '_momentum_i0'
     quantityname = '(xmomentum**2 + ymomentum**2)**0.5'  
 
 if which_var == 2:  # Depth
-    outname = name + '_depth'
+    outname = name + '_depth_test100'
     quantityname = 'stage-elevation'  
 
 if which_var == 3:  # Speed
-    outname = name + '_speed'
+    outname = name + '_speed_i8'
     #quantityname = '((xmomentum/(stage-elevation))**2 + (ymomentum/(stage-elevation))**2)**0.5'  #Speed
     quantityname = '(xmomentum**2 + ymomentum**2)**0.5/(stage-elevation+1.e-30)'  #Speed
@@ -42 +42 @@
         sww2dem(namei, basename_out = outnamei,
                     quantity = quantityname,
-                    cellsize = 20,      
+                    #timestep = 0,
+                    cellsize = 100,      
                     easting_min = project.e_min_area,
                     easting_max = project.e_max_area,

anuga_work/production/dampier_2006/make_report_cipma.py

@@ -88 +88 @@
 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
@@ -111 +110 @@
                                                   report = True,
                                                   reportname = reportname,
-                                                  plot_quantity = ['stage', 'speed'],
+                                                  plot_quantity = ['stage', 'momentum'],
                                                   surface = False,
                                                   time_min = None,
@@ -133 +132 @@
                                           report = True,
                                           reportname = report_name,
-                                          plot_quantity = ['stage', 'speed'],
+                                          plot_quantity = ['stage', 'momentum'],
                                           surface = False,
                                           time_min = None,
@@ -257 +256 @@
 s  = """
 \caption{Point locations used for Dampier study; surrounding the facility.
-See Appendix \\ref{sec:timeseries} for stage and speed results.
+See Appendix \\ref{sec:timeseries} for stage and momentum results.
 }  
 \label{fig:points2}
@@ -263 +262 @@
 """
 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)
@@ -277 +267 @@
 \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.}  
+See Appendix \\ref{sec:timeseries} for stage and momentum results.}  
 \label{fig:points3}
 \end{figure}

anuga_work/production/dampier_2006/report/anuga_setup.tex

@@ -19 +19 @@
 
 To set up a model for the tsunami scenario, a study area is first 
-determined. Here, we define the study area to cover around km of coastline
-and extending offshore to around the 70m depth contour. Onshore data covers the
+determined. Here, we define the study area to 
+extend offshore to around the 70m depth contour with the onshore data covering the
 area of interest to CIPMA. The study area is around 6250 km$^2$.
 
@@ -30 +30 @@
 area will be the maximum cell area within the defined region and that each 
 cell in the region does not necessarily have the same area.}.
-The cell areas should not be too small as this will cause unrealisticly long computational time, 
-and not too great as this may inadequately capture important behaviour. 
-%There are no gains in choosing the area to be less than the supporting data.
-Figure \ref{fig:dampier_area} shows the study area with regions of difference cell areas. The total number
-of cells is 177 000. 
+\Figure \ref{fig:dampier_area} shows the study area with regions of difference cell areas. The total number
+of cells is 177 191. 
 Lateral accuracy refers to the distance at which we are confident in stating a region is inundated. 
 Figure \ref{fig:dampier_area} shows the maximum triangular cell area and lateral accuracy for each region. 
@@ -46 +43 @@
 
   \caption{Study area for Dampier scenario highlighting four regions of increased refinement.
-Region 1: Surrounds onshore gas infrastructure at Dampier with a cell area of 500 m$^2$ (lateral accuracy 30 m).
+Region 1: Surrounds onshore gas infrastructure at Dampier with a cell area of 500 m$^2$ (lateral accuracy 30 m) - not shown here.
 Region 2: Surrounds the gas pipelines with a cell area of 2000 m$^2$ (lateral accuracy 100 m).
 Region 3: Surrounds the coastal regions with a cell area of 10000 m$^2$ (lateral accuracy  m).

anuga_work/production/dampier_2006/report/data.tex

@@ -13 +13 @@
 as the vertical datum. Mean Sea Level (MSL) is approximately equal to
 0m AHD with the Highest Astronomical Tide (HAT) 
-and Lowest Astronomical Tide (LAT) defined as 2.4m AHD
-and -m AHD respectively for Dampier \cite{antt:06}. 
+defined as 2.4m AHD for Dampier \cite{antt:06}. 
 
 Data for this study have been sourced from a number of agencies. With

anuga_work/production/dampier_2006/report/execsum.tex

@@ -3 +3 @@
 Risk Assessment Methods Project (RAMP). The purpose of this
 study is to determine the potential tsunami inundation extent and 
-particle velocity as the tsunami
+particle momentum as the tsunami
 impacts the major gas facilities and infrastructure in Dampier.
 
@@ -10 +10 @@
 and results (Section \ref{sec:results})
 for a specific tsunami-genic event as it impacts the Dampier gas facilities and infrastructure.
-In particular, maximum inundation and velocity maps are shown 
+In particular, maximum inundation and depth and velocity time series are shown 
 for the event occurring at highest astronomical tide. 
 Impact assessments will be conducted by CIPMA and are not discussed here.

anuga_work/production/dampier_2006/report/metadata.tex

@@ -1 @@
-\includepdf[pages={1-5}]{MetadataforATWSDampierScenario}
+\includepdf[pages={1-6}]{MetadataforATWSDampierScenario}