Changeset 5587 for anuga_work/development/anuga_1d/dry_dam_sudi.py

Timestamp:

Jul 30, 2008, 5:03:47 PM (15 years ago)

Author:

steve

Message:

Added in minimum height

File:

• anuga_work/development/anuga_1d/dry_dam_sudi.py (modified) (4 diffs)

anuga_work/development/anuga_1d/dry_dam_sudi.py

@@ -22 +22 @@
         # Calculate Analytical Solution at time t > 0
         u3 = 2.0/3.0*(sqrt(g*h1)+x[i]/t) 
-        h3 = 4.0/(9.0*g)*(sqrt(g*h1)-x[i]/(2.0*t))*(sqrt(g*h1)-x[i]/(2.0*t)) 
+        h3 = 4.0/(9.0*g)*(sqrt(g*h1)-x[i]/(2.0*t))*(sqrt(g*h1)-x[i]/(2.0*t))
+        u3_ = 2.0/3.0*((x[i]+L/2.0)/t-sqrt(g*h1))
+        h3_ = 1.0/(9.0*g)*((x[i]+L/2.0)/t+2*sqrt(g*h1))*((x[i]+L/2.0)/t+2*sqrt(g*h1))
 
-        if ( x[i] <= -t*sqrt(g*h1) ):
+        if ( x[i] <= -1*L/2.0+2*(-sqrt(g*h1)*t)):
+            u[i] = 0.0
+            h[i] = h0
+        elif ( x[i] <= -1*L/2.0-(-sqrt(g*h1)*t)):
+            u[i] = u3_
+            h[i] = h3_
+
+        elif ( x[i] <= -t*sqrt(g*h1) ):
             u[i] = 0.0 
             h[i] = h1 
@@ -57 +66 @@
 
 L = 2000.0     # Length of channel (m)
-N = 100        # Number of compuational cells
+N = 800        # Number of computational cells
 cell_len = L/N # Origin = 0.0
 
@@ -85 +94 @@
 yieldstep = 1.0
 L = 2000.0     # Length of channel (m)
-number_of_cells = [100]#,200,500,1000,2000,5000,10000,20000]
+number_of_cells = [200]#,200,500,1000,2000,5000,10000,20000]
 h_error = zeros(len(number_of_cells),Float)
 uh_error = zeros(len(number_of_cells),Float)
@@ -102 +111 @@
     domain.set_boundary({'exterior': Reflective_boundary(domain)})
     domain.default_order = 2
-    domain.default_time_order = 1
+    domain.default_time_order = 2
     domain.cfl = 1.0
-    domain.limiter = "vanleer"
+    domain.limiter = "minmod"
 
     t0 = time.time()
 
     for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
-        pass
+        domain.write_time()
 
     N = float(N)