Changeset 4023

Timestamp:

Nov 21, 2006, 3:54:12 PM (18 years ago)

Author:

sexton

Message:

fix up smf function

Location:

anuga_core

Files:

• documentation/user_manual/demos/cairns/runcairns.py (modified) (8 diffs)
• source/anuga/shallow_water/smf.py (modified) (4 diffs)

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

@@ -1 @@
-"""Script for running a tsunami inundation scenario for Broome, WA, Australia.
+"""Script for running a tsunami inundation scenario for Cairns, QLD Australia.
 
 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 output sww file is stored in directory named after the scenario, i.e
+slump or fixed_wave.
 
 The scenario is defined by a triangular mesh created from project.polygon,
-the elevation data and a tsunami wave generated by MOST.
-
-Ole Nielsen and Duncan Gray, GA - 2005 and Nick Bartzis, GA - 2006
+the elevation data and a tsunami wave generated by a submarine mass failure.
+
+Ole Nielsen and Duncan Gray, GA - 2005 and Jane Sexton and Nick Bartzis, GA - 2006
 """
 
@@ -35 +36 @@
 # Define scenario as either slump or fixed_wave.
 #-------------------------------------------------------------------------------
-#scenario = 'slump' # OR 
+#scenario = 'slump' 
 scenario = 'fixed_wave'
 if access(scenario,F_OK) == 0:
@@ -89 +90 @@
 # Setup computational domain
 #-------------------------------------------------------------------------------                                 
+
 domain = Domain(meshname, use_cache = True, verbose = True)
 
@@ -117 +119 @@
 # Setup information for slump scenario (to be applied 1 min into simulation
 #-------------------------------------------------------------------------------
+
 if scenario == 'slump':
     from anuga.shallow_water.smf import slump_tsunami  # Function for submarine slump
@@ -135 +138 @@
 # Setup boundary conditions
 #-------------------------------------------------------------------------------
+
 print 'Available boundary tags', domain.get_boundary_tags()
 
@@ -156 +160 @@
 # Evolve system through time
 #-------------------------------------------------------------------------------
+
 import time
 t0 = time.time()
@@ -168 +173 @@
         domain.write_boundary_statistics(tags = 'ocean_east')     
         
-        # add slump
-        thisstagestep = domain.get_quantity('stage')
-        if allclose(t, 60):
-            slump = Quantity(domain)
-            slump.set_values(tsunami_source)
-            domain.set_quantity('stage', slump + thisstagestep)
-
-        # save every two mins leading up to wave approaching land
-        for t in domain.evolve(yieldstep = 120, finaltime = 1000, 
-                               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')
-
-if scenario == 'fixed_wave':
+    # add slump
+    thisstagestep = domain.get_quantity('stage')
+    if allclose(t, 60):
+        slump = Quantity(domain)
+        slump.set_values(tsunami_source)
+        domain.set_quantity('stage', slump + thisstagestep)
 
     # save every two mins leading up to wave approaching land
-    for t in domain.evolve(yieldstep = 120, finaltime = 1000): 
-        domain.write_time()
-        domain.write_boundary_statistics(tags = 'ocean_east')     
+    for t in domain.evolve(yieldstep = 120, finaltime = 1000, 
+                           skip_initial_step = True):
+        domain.write_time()
+        domain.write_boundary_statistics(tags = 'ocean_east')
 
     # save every 30 secs as wave starts inundating ashore
@@ -199 +191 @@
         domain.write_time()
         domain.write_boundary_statistics(tags = 'ocean_east')
+
+if scenario == 'fixed_wave':
+
+    # save every two mins leading up to wave approaching land
+    for t in domain.evolve(yieldstep = 120, finaltime = 1000): 
+        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

@@ -91 +91 @@
              * (1 - exp(-2.2*(gamma-1)))
     a3D = a2D / (1 + (15.5*sqrt(depth/(length*sint))))
-
-    if verbose is True:
         
     #a few temporary print statements
@@ -113 +111 @@
         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
@@ -120 +117 @@
         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:
@@ -342 +338 @@
 
         am = self.a3D
-        am2 = self.a2D
+        am2 = 1.0
+        #am2 = self.a2D
         wa = self.wavelength
         wi = self.width