Changeset 4958

Timestamp:

Jan 19, 2008, 7:26:50 PM (17 years ago)

Author:

steve

Message:

Changed anuga_1d to shallow_water_1d

Location:

anuga_work/development/shallow_water_1d

Files:

• . (moved) (moved from anuga_work/development/ANUGA_1D)
• analytic_dam.py (modified) (3 diffs)

anuga_work/development/shallow_water_1d/analytic_dam.py

@@ -61 +61 @@
         h = zeros(n,Float)
         uh = zeros(n,Float)
-        x = C-3*L/4.0
+        x = C-L/2.0
         #x = zeros(n,Float)
         #for i in range(n):
@@ -79 +79 @@
         x2=z*t
         x1=-c1*t
-        x1_ = -1*L/2.0-x1
-        x2_ = -1*L/2.0+2*x1
-        #x3_ = -1*L/2.0-x3
+    
         #t=50 
         #x = (-L/2:L/2) 
@@ -87 +85 @@
             # 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))
-            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 t == 30:
-            #    x[i] = 500
-            #    print 'x2',x2
-            #    print 'x3',x3
-            #    print 'x1',x1
-            if ( x[i] <= x2_ ):
-                #print 'here x2_=', x2_
-                u[i] = 0.0
-                h[i] = 0.0
-                uh [i] = u[i]*h[i]
-            #elif ( x[i] <= x3_ ):
-            #    print 'here x3_=', x3_
-            #    u[i] = -1*u2 
-            #    h[i] = h2
-            #    uh[i] = u[i]*h[i]
-            elif ( x[i] <= x1_ ):
-                #print 'here x1_=', x1_
-                u[i] = u3_ 
-                h[i] = h3_
-                uh[i] = u[i]*h[i]
-            #else:
-            #    u[i] = 0.0 
-            #    h[i] = h0
-            #    uh[i] = u[i]*h[i]
+            h3 = 4.0/(9.0*g)*(sqrt(g*h1)-x[i]/(2.0*t))*(sqrt(g*h1)-x[i]/(2.0*t)) 
 
-            #elif ( x[i] <= x1/2.0 ):
-            #    u[i] = 0.0 
-            #    h[i] = h1
-            #    uh[i] = u[i]*h[i]
-            elif ( x[i] <= x1 ):
-                #print 'here x1=', x1
+            if ( x[i] <= x1 ):
                 u[i] = 0.0 
                 h[i] = h1
                 uh[i] = u[i]*h[i]
             elif ( x[i] <= x3 ):
-                #print 'here x3=', x3
                 u[i] = u3 
                 h[i] = h3
                 uh[i] = u[i]*h[i]
             elif ( x[i] < x2 ):
-                #print 'here x2=', x2
                 u[i] = u2 
                 h[i] = h2
                 uh[i] = u[i]*h[i]
             else:
-                #print 'here the last section'
                 u[i] = 0.0 
                 h[i] = h0