Changeset 8607 for trunk/anuga_work/development

Timestamp:

Nov 8, 2012, 2:25:20 PM (12 years ago)

Author:

steve

Message:

Added sww_merge dummy to shallow_water_domain

Location:

trunk/anuga_work/development/gareth

Files:

• experimental/anuga_tsunami/runup.py (modified) (2 diffs)
• experimental/anuga_tsunami/swb2_domain.py (modified) (1 diff)
• tests/runup_sinusoid/runup_sinusoid.py (modified) (1 diff)

trunk/anuga_work/development/gareth/experimental/anuga_tsunami/runup.py

@@ -23 +23 @@
 #from swb_domain import *
 #path.append('/home/gareth/storage/anuga_clean/anuga_jan12/trunk/anuga_work/development/gareth/balanced_basic')
-from balanced_basic.swb2_domain import *
+from anuga_tsunami.swb2_domain import *
 #---------
 #Setup computational domain
@@ -61 +61 @@
 Bd=anuga.Dirichlet_boundary([-0.2,0.,0.])       # Constant boundary values -- not used in this example
 Bw=anuga.Time_boundary(domain=domain,
-        f=lambda t: [(0.0*sin(t*2*pi)-0.1)*exp(-t)-0.1,0.0,0.0]) # Time varying boundary -- get rid of the 0.0 to do a runup.
+        function=lambda t: [(0.0*sin(t*2*pi)-0.1)*exp(-t)-0.1,0.0,0.0]) # Time varying boundary -- get rid of the 0.0 to do a runup.
 
 #----------------------------------------------

trunk/anuga_work/development/gareth/experimental/anuga_tsunami/swb2_domain.py

@@ -140 +140 @@
         print '# it really does improve things'
         print '#'
+        print '# Gareth Davies'
+        print '#'
         print '##########################################################################'
 

trunk/anuga_work/development/gareth/tests/runup_sinusoid/runup_sinusoid.py

@@ -14 +14 @@
 #from swb2_domain import *
 #from balanced_basic import *
-from balanced_dev import *
-#from anuga_tsunami import *
+#from balanced_dev import *
+from anuga_tsunami import *
 #---------
 #Setup computational domain
 #---------
-points, vertices, boundary = anuga.rectangular_cross(40,40, len1=1., len2=1.)
+points, vertices, boundary = anuga.rectangular_cross(20,20, len1=1., len2=1.)
 
 domain=Domain(points,vertices,boundary)    # Create Domain