Changeset 3533

Timestamp:

Aug 25, 2006, 4:51:49 PM (19 years ago)

Author:

duncan

Message:

Tidy up dam simulation and minimum depth

Files:

• anuga_core/source/anuga/pyvolution/shallow_water.py (modified) (1 diff)
• development/dam_2006/project.py (modified) (3 diffs)
• development/dam_2006/run_dam.py (modified) (4 diffs)
• documentation/user_manual/anuga_user_manual.tex (modified) (1 diff)

anuga_core/source/anuga/pyvolution/shallow_water.py

@@ -142 +142 @@
             #self.reduction = min  #Looks better near steep slopes
 
+
+    def set_minimum_sww_depth(self, minimum_sww_depth):
+        """
+        Set the minimum depth that will be recognised when writing
+        to an sww file. This is useful for removing thin water layers
+        that seems to be caused by friction creep.
+
+        The minimum allowed sww depth is in meters.
+        """
+        self.minimum_sww_depth = minimum_sww_depth
 
 

development/dam_2006/project.py

@@ -15 +15 @@
 
 if sys.platform == 'win32':
-    home = environ['INUNDATIONHOME']     #Sandpit's parent dir
+    try:
+        home = environ['INUNDATIONHOME']     #Sandpit's parent dir
+    except:
+        home = '.'
 else:    
     home = getenv('INUNDATIONHOME', sep+'d'+sep+'cit'+sep+'1'+sep+'cit'+sep+'risk_assessment_methods_project'+sep+'inundation')     
 
+
+if not access(home, F_OK):
+    home = '.'
+    
 #Derive subdirectories and filenames
 time = strftime('%Y%m%d_%H%M%S',localtime()) #gets time for new dir
@@ -25 +32 @@
 outputtimedir = outputdir+time+sep
 meshdir = scenariodir+sep+'meshes'+sep
-datadir = scenariodir+sep+'topographies'+sep
-gaugedir = scenariodir+sep+'gauges'+sep
-polygondir = scenariodir+sep+'polygons'+sep
-boundarydir = scenariodir+sep+'boundaries'+sep
-#output dir without time
-outputdir = scenariodir+sep+'output'+sep
-tidedir = scenariodir+sep+'tide_data'+sep
 
-gauge_filename = gaugedir + 'gauge_location_dam.xya'
-#buildings_filename = gaugedir + 'onslow_res.csv'
-#community_filename = gaugedir + 'CHINS_v2.csv'
-#community_scenario = gaugedir + 'community_onslow.csv'
-#gaugetimeseries = gaugedir + 'onslow'
 depth_filename = outputtimedir + "depth.csv"
 velocity_x_filename = outputtimedir + "velocity_x.csv"
@@ -56 +51 @@
     mkdir (outputtimedir)
 
-if not access(gaugedir,F_OK):
-    mkdir (gaugedir)
-
-# boundary source data
-#MOST_dir = 'f:'+sep+'3'+sep+'ehn'+sep+'users'+sep+'davidb'+sep+'tsunami'+sep+'WA_project'+sep+'SU-AU_90'+sep+'most_2'+sep+'detailed'+sep
-
 codedir = getcwd()+sep
                                 

development/dam_2006/run_dam.py

@@ -1 @@
-"""Script for running a tsunami inundation scenario for Onslow, WA, Australia.
+"""Script for running a dam break simulation of UQ's dam break tank.
 
-Source data such as elevation and boundary data is assumed to be available in
-directories specified by project.py
-The output sww file is stored in project.outputtimedir 
 
-The scenario is defined by a triangular mesh created from project.polygon,
-the elevation data and a simulated submarine landslide.
-
-Ole Nielsen and Duncan Gray, GA - 2005 and Nick Bartzis, GA - 2006
+Ole Nielsen and Duncan Gray, GA - 2006 
 """
 
@@ -20 +14 @@
 import sys
 from shutil import copy
-from os import mkdir, access, F_OK, path
+from os import path
 
 # Related major packages
@@ -72 +66 @@
     print domain.statistics()
 
+    
     domain.set_name(project.basename)
     domain.set_datadir(project.outputtimedir)
     domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
+    domain.set_minimum_sww_depth(0.01)
 
     #-------------------------------------------------------------------------
@@ -80 +76 @@
     #-------------------------------------------------------------------------
 
-    tide = 0.0
     slope = 0.05
 

documentation/user_manual/anuga_user_manual.tex

@@ -1388 +1388 @@
     been run, returns the value \code{default\_datadir} specified in
     \code{config.py}.
+\end{methoddesc}
+
+\begin{methoddesc} {set\_minimum_sww_depth}{time=0.0}
+    Module: \module{pyvolution.domain}
+
+    Sets the minimum depth that will be recognised when writing
+        to an sww file. This is useful for removing thin water layers
+        that seems to be caused by friction creep.
 \end{methoddesc}