Changeset 4869

Timestamp:

Nov 30, 2007, 4:02:48 PM (17 years ago)

Author:

sexton

Message:

updating Cairns demo for the usermanual

Location:

anuga_core

Files:

• documentation/user_manual/anuga_user_manual.tex (modified) (2 diffs)
• documentation/user_manual/demos/cairns/GetTimeseries.py (modified) (1 diff)
• documentation/user_manual/demos/cairns/gauges.csv (modified) (1 diff)
• documentation/user_manual/demos/cairns/runcairns.py (modified) (5 diffs)
• documentation/user_manual/graphics/cairnsgauges.jpg (modified) (previous)
• documentation/user_manual/graphics/fixedwavedepth.jpg (modified) (previous)
• documentation/user_manual/graphics/gaugeCairnsAirportboth.png (added)
• documentation/user_manual/graphics/gaugeElfordReefboth.png (modified) (previous)
• source/anuga/fit_interpolate/interpolate.py (modified) (2 diffs)

anuga_core/documentation/user_manual/anuga_user_manual.tex

@@ -1271 +1271 @@
 The user could develop a maximum absolute momentum or other expressions which can be
 derived from the quantities.
+It must be noted here that depth is more meaningful when the elevation is positive
+(\code{depth} = \code{stage} &$-$& \code{elevation}) as it describes the water height
+above the available elevation. When the elevation is negative, depth is meauring the
+water height from the sea floor. With this in mind, maximum inundation maps are 
+typically "clipped" to the coastline. However, the data input here did not contain a 
+coastline.
 
 \begin{figure}[hbt]
@@ -1310 +1316 @@
 
 Here, the time series for the quantities stage and speed will be generated for
-each gauge defined in the gauge file. Typically, stage is used over depth, particularly
-for offshore gauges. In being able to interpret the output for onshore gauges however,
-we use depth rather than stage. As an example output,
-Figure \ref{fig:reef} shows the time series for the quantity stage (or depth for
-onshore gauges) for the Elford Reef location for the slide scenario.
+each gauge defined in the gauge file. As described earlie, depth is more meaningful
+for onshore gauges, and stage is more appropriate for offshore gauges. However, the
+function used to generate the time series information at each gauge will plot
+stage or depth depending on the elevation at that gauge location. Note, if this is
+not required, users may update the relevation section of the function.
+
+As an example output,
+Figure \ref{fig:reef} shows the time series for the quantity stage for the 
+Elford Reef location for each scenario (the elevation at this location is negative, 
+thereby showing stage).
 
 \begin{figure}[hbt]
-\centerline{\includegraphics[scale=0.5]{graphics/gaugeElfordReefslide.png}}
-\caption{Time series information of the quantity depth for the Elford Reef location for the slide scenario.}
+\centerline{\includegraphics[scale=0.5]{graphics/gaugeElfordReefboth.png}}
+\caption{Time series information of the quantity stage for the Elford Reef location for the 
+fixed wave and slide scenario.}
 \label{fig:reef}
 \end{figure}
 
-Note, the user may choose to compare the output for each scenario by updating
-the \code{production\_dirs} as required. For example,
-
-{\small \begin{verbatim}
-
-    production_dirs = {'slide': 'Slide',
-                       'fixed_wave': 'Fixed Wave'}
-
-\end{verbatim}}
-
-In this case, the time series output for Elford Reef would be:
+By contrast, the time series for depth is shown for the onshore location of the Cairns
+Airport for each scenario is Figure \ref{fig:airportboth}.
 
 \begin{figure}[hbt]
-\centerline{\includegraphics[scale=0.5]{graphics/gaugeElfordReefboth.png}}
-\caption{Time series information of the quantity depth for the Elford Reef location for the slide and fixed wave scenario.}
-\label{fig:reefboth}
+\centerline{\includegraphics[scale=0.5]{graphics/gaugeCairnsAirportboth.png}}
+\caption{Time series information of the quantity depth for the Cairns Airport 
+location for the slide and fixed wave scenario.}
+\label{fig:airportboth}
 \end{figure}
 

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

@@ -21 +21 @@
 
 # nominate directory location of sww file with associated attribute
-production_dirs = {#'slide': 'Slide',
+production_dirs = {'slide': 'Slide',
                    'fixed_wave': 'Fixed Wave'}
 

anuga_core/documentation/user_manual/demos/cairns/gauges.csv

@@ -3 +3 @@
 360245.11,8142280.78,Trinity Beach,0
 386133.51,8131751.05,Cairns Headland,0
-425759.74,8128812.23,Elford Reef,0
+430250,8128812.23,Elford Reef,0
 367771.61,8133933.82,Cairns Airport,0

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

@@ -28 +28 @@
 from anuga.shallow_water import Time_boundary
 from anuga.shallow_water import File_boundary
+from anuga.shallow_water import Transmissive_Momentum_Set_Stage_boundary
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf
@@ -39 +40 @@
 # Define scenario as either slide or fixed_wave.
 #------------------------------------------------------------------------------
-#scenario = 'slide' 
-scenario = 'fixed_wave'
+scenario = 'slide' 
+#scenario = 'fixed_wave'
 
 if os.access(scenario, os.F_OK) == 0:
@@ -88 +89 @@
                          filename=meshname,
                          interior_regions=interior_regions,
-                         use_cache=True,
+                         use_cache=False,
                          verbose=True)
 
@@ -133 +134 @@
                     verbose=True,
                     alpha=0.1)
-
-
 
 #------------------------------------------------------------------------------
@@ -166 +165 @@
 if scenario == 'fixed_wave':
     Bw = Transmissive_Momentum_Set_Stage_boundary(domain = domain,
-                          f=lambda t: [(60<t<3660)*50, 0, 0])
+                          function=lambda t: [(60<t<3660)*50, 0, 0])
     domain.set_boundary({'ocean_east': Bw,
                          'bottom': Bd,

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -558 +558 @@
 
                 if verbose is True:
-                    from anuga.utilities.polygon import plot_polygons
-                    #out_interp_pts = take(interpolation_points,[indices])
-                    title = 'Interpolation points fall outside specified mesh'
-                    plot_polygons([mesh_boundary_polygon,interpolation_points,out_interp_pts],
-                                         ['line','point','outside'],figname='points_boundary_out',label=title,verbose=verbose)
+                    import sys
+                    if sys.platform == 'win32':
+                        from anuga.utilities.polygon import plot_polygons
+                        #out_interp_pts = take(interpolation_points,[indices])
+                        title = 'Interpolation points fall outside specified mesh'
+                        plot_polygons([mesh_boundary_polygon,interpolation_points,out_interp_pts],
+                                      ['line','point','outside'],figname='points_boundary_out',label=title,verbose=verbose)
 
                 # Joaquim Luis suggested this as an Exception, so
@@ -574 +576 @@
             # Plot boundary and interpolation points
             if verbose is True:
-                from anuga.utilities.polygon import plot_polygons
-                title = 'Interpolation function: Polygon and interpolation points'
-                plot_polygons([mesh_boundary_polygon,interpolation_points],
-                                     ['line','point'],figname='points_boundary',label=title,verbose=verbose)
+                import sys
+                if sys.platform == 'win32':
+                    from anuga.utilities.polygon import plot_polygons
+                    title = 'Interpolation function: Polygon and interpolation points'
+                    plot_polygons([mesh_boundary_polygon,interpolation_points],
+                                         ['line','point'],figname='points_boundary',label=title,verbose=verbose)
 
             m = len(self.interpolation_points)