Changeset 924

Timestamp:

Feb 18, 2005, 2:52:59 PM (20 years ago)

Author:

duncan

Message:

update

Location:

inundation/ga/storm_surge/examples

Files:

• run_gong.py (modified) (5 diffs)
• run_tsh.py (modified) (2 diffs)

inundation/ga/storm_surge/examples/run_gong.py

@@ -25 +25 @@
 
 import time
-
-from config import default_datadir 
 
 ######################
@@ -63 +61 @@
         file_path, filename = path.split(filename)
         filename, ext = path.splitext(filename)
-        if domain.smooth is True:
-            s = 'smooth'
-        else:
-            s = 'nonsmooth'        
-        domain.filename = filename + '_' + s + '_ys'+ str(yieldstep) + \
+        domain.filename = filename + '_' + '_ys'+ str(yieldstep) + \
                           '_ft' + str(finaltime)
-        print "Output being written to " + default_datadir + sep + \
+        print "Output being written to " + domain.get_datadir() + sep + \
               domain.filename + "." + domain.format
 
@@ -86 +80 @@
 
     #Constant inflow
-    Bd = Dirichlet_boundary(array([10, 0.0, 0.0]))
+    Bd = Dirichlet_boundary(array([inflow_stage, 0.0, 0.0]))
 
     #Time dependent inflow
@@ -94 +88 @@
                         (inflow_stage*(sin(2.5*x*pi)+0.7)),0,0]))
 
+    boundary_file = 'kermadec2.sww'
+
+    Fb = File_boundary(boundary_file, domain, verbose=True)
 
     print 'Available boundary tags are', domain.get_boundary_tags()
+    print 'The extent is ', domain.get_extent()
 
     #Set the ocean...
@@ -103 +101 @@
     
     tags = {}
-    tsunami = Time_boundary(domain=domain,
-                       f=lambda x: array([(1 + sin(x*pi/4))*\
-                        (0.15*(sin(2.5*x*pi)+0.7)),0,0]))
+   
+    tsunami = Bw
     tags['w1'] = tsunami 
     tags['w2'] = tsunami

inundation/ga/storm_surge/examples/run_tsh.py

@@ -26 +26 @@
 import time
 
-from config import default_datadir 
+#from config import default_datadir 
 
 ######################
@@ -69 +69 @@
         domain.filename = filename + '_' + s + '_ys'+ str(yieldstep) + \
                           '_ft' + str(finaltime)
-        print "Output being written to " + default_datadir + sep + \
+        print "Output being written to " + domain.get_datadir() + sep + \
               domain.filename + "." + domain.format