Changeset 8358

Timestamp:

Mar 13, 2012, 3:46:10 PM (13 years ago)

Author:

davies

Message:

Minor changes

Location:

trunk/anuga_work/development/gareth

Files:

• experimental/balanced_dev/swb2_domain_ext.c (modified) (1 diff)
• tests/runup_sinusoid/runup_sinusoid.py (modified) (2 diffs)

trunk/anuga_work/development/gareth/experimental/balanced_dev/swb2_domain_ext.c

@@ -67 +67 @@
     // Apply limiting of speeds according to the ANUGA manual
     if (*h < epsilon) {
+      //*h = max(0.0,*h);  // Could have been negative
       *h = 0.0;  // Could have been negative
       u = 0.0;

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

@@ -29 +29 @@
 # Define topography
 #------------------
-
+scale_me=1.0
 def topography(x,y):
-        return -x/2.0 +0.05*numpy.sin((x+y)*50.0)  
+        return (-x/2.0 +0.05*numpy.sin((x+y)*50.0))*scale_me
 
 def stagefun(x,y):
-    stge=-0.2 #-0.1*(x>0.5) -0.2*(x<=0.5)
+    stge=-0.2*scale_me #-0.1*(x>0.5) -0.2*(x<=0.5)
     #topo=topography(x,y) 
     return stge#*(stge>topo) + (topo)*(stge<=topo)
@@ -60 +60 @@
 Br=anuga.Reflective_boundary(domain)            # Solid reflective wall
 Bt=anuga.Transmissive_boundary(domain)          # Continue all values of boundary -- not used in this example
-Bd=anuga.Dirichlet_boundary([-0.1,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.
+Bd=anuga.Dirichlet_boundary([-0.1*scale_me,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.
 
 #----------------------------------------------