Changeset 8921

Timestamp:

Jun 15, 2013, 5:50:23 PM (12 years ago)

Author:

steve

Message:

Adding in validation tests for carrier_greenspan_periodic and transient

Location:

trunk/anuga_core/source/anuga_validation_tests/analytical_exact

Files:

• avalanche_dry/validate_avalanche_dry.py (modified) (1 diff)
• carrier_greenspan_periodic/analytical_carrier_greenspan.py (modified) (1 diff)
• carrier_greenspan_periodic/plot_results_cross_section.py (modified) (3 diffs)
• carrier_greenspan_periodic/validate_carrier_greenspan_periodic.py (added)
• carrier_greenspan_transient/plot_results.py (modified) (3 diffs)
• carrier_greenspan_transient/validate_carrier_greenspan_transient.py (added)

trunk/anuga_core/source/anuga_validation_tests/analytical_exact/avalanche_dry/validate_avalanche_dry.py

@@ -99 +99 @@
             print indent+'Errors in xmomentum: ',euh10, euh30
 
-        print euh10
 
         assert euh10 < 0.025,  'L^1 error %g greater than 2.5 percent'% euh10

trunk/anuga_core/source/anuga_validation_tests/analytical_exact/carrier_greenspan_periodic/analytical_carrier_greenspan.py

@@ -45 +45 @@
             jac = zeros((n,n))
             if 1.0+q[0]-x<0.0:
-                print "Problem occurs i=",i
-                print "PROBLEM OCCURS.......... 1.0+q[0]-x=",1.0+q[0]-x
+                #print "Problem occurs i=",i
+                #print "PROBLEM OCCURS.......... 1.0+q[0]-x=",1.0+q[0]-x
                 q[0] = x-1.0 + 0.0001
-                print "NOW problem is fixed as  1.0+q[0]-x=",1.0+q[0]-x
+                #print "NOW problem is fixed as  1.0+q[0]-x=",1.0+q[0]-x
             f0 = f(q)
             for i in range(n):

trunk/anuga_core/source/anuga_validation_tests/analytical_exact/carrier_greenspan_periodic/plot_results_cross_section.py

@@ -13 +13 @@
 v2=(p2_st.y==v)
 
-W1, P1, Z1, H1, U1 = analytic_cg(p2_st.x[v2], p2_st.time[288], h0=5e2, L=5e4, a=1.0, Tp=900.0)
-W2, P2, Z2, H2, U2 = analytic_cg(p2_st.x[v2], p2_st.time[296], h0=5e2, L=5e4, a=1.0, Tp=900.0)
-W3, P3, Z3, H3, U3 = analytic_cg(p2_st.x[v2], p2_st.time[304], h0=5e2, L=5e4, a=1.0, Tp=900.0)
-W4, P4, Z4, H4, U4 = analytic_cg(p2_st.x[v2], p2_st.time[312], h0=5e2, L=5e4, a=1.0, Tp=900.0)
-W5, P5, Z5, H5, U5 = analytic_cg(p2_st.x[v2], p2_st.time[320], h0=5e2, L=5e4, a=1.0, Tp=900.0)
-W6, P6, Z6, H6, U6 = analytic_cg(p2_st.x[v2], p2_st.time[328], h0=5e2, L=5e4, a=1.0, Tp=900.0)
+x_n = p2_st.x[v2]
+
+W1, P1, Z1, H1, U1 = analytic_cg(x_n, p2_st.time[288], h0=5e2, L=5e4, a=1.0, Tp=900.0)
+W2, P2, Z2, H2, U2 = analytic_cg(x_n, p2_st.time[296], h0=5e2, L=5e4, a=1.0, Tp=900.0)
+W3, P3, Z3, H3, U3 = analytic_cg(x_n, p2_st.time[304], h0=5e2, L=5e4, a=1.0, Tp=900.0)
+W4, P4, Z4, H4, U4 = analytic_cg(x_n, p2_st.time[312], h0=5e2, L=5e4, a=1.0, Tp=900.0)
+W5, P5, Z5, H5, U5 = analytic_cg(x_n, p2_st.time[320], h0=5e2, L=5e4, a=1.0, Tp=900.0)
+W6, P6, Z6, H6, U6 = analytic_cg(x_n, p2_st.time[328], h0=5e2, L=5e4, a=1.0, Tp=900.0)
+
+W1_n = p2_st.stage[288,v2]
+W2_n = p2_st.stage[296,v2]
+W3_n = p2_st.stage[304,v2]
+W4_n = p2_st.stage[312,v2]
+W5_n = p2_st.stage[320,v2]
+W6_n = p2_st.stage[328,v2]
+
+UH1_n = p2_st.xmom[288,v2]
+UH2_n = p2_st.xmom[296,v2]
+UH3_n = p2_st.xmom[304,v2]
+UH4_n = p2_st.xmom[312,v2]
+UH5_n = p2_st.xmom[320,v2]
+UH6_n = p2_st.xmom[328,v2]
+
+U1_n = p2_st.xvel[288,v2]
+U2_n = p2_st.xvel[296,v2]
+U3_n = p2_st.xvel[304,v2]
+U4_n = p2_st.xvel[312,v2]
+U5_n = p2_st.xvel[320,v2]
+U6_n = p2_st.xvel[328,v2]
 
 #Plot the stages##############################################################
 pyplot.clf()
-pyplot.plot(p2_st.x[v2], p2_st.stage[288,v2], 'b.', label='numerical') # 0*T/6
-pyplot.plot(p2_st.x[v2], p2_st.stage[296,v2], 'b.')                    # 1*T/6
-pyplot.plot(p2_st.x[v2], p2_st.stage[304,v2], 'b.')                     # 2*T/6
-pyplot.plot(p2_st.x[v2], p2_st.stage[312,v2], 'b.')                     # 3*T/6
-pyplot.plot(p2_st.x[v2], p2_st.stage[320,v2], 'b.')                     # 4*T/6
-pyplot.plot(p2_st.x[v2], p2_st.stage[328,v2], 'b.')  # 5*T/6
+pyplot.plot(x_n, W1_n, 'b.', label='numerical')  # 0*T/6
+pyplot.plot(x_n, W2_n, 'b.')                     # 1*T/6
+pyplot.plot(x_n, W3_n, 'b.')                     # 2*T/6
+pyplot.plot(x_n, W4_n, 'b.')                     # 3*T/6
+pyplot.plot(x_n, W5_n, 'b.')                     # 4*T/6
+pyplot.plot(x_n, W6_n, 'b.')                     # 5*T/6
 
-pyplot.plot(p2_st.x[v2], W1,'r-', label='analytical')
-pyplot.plot(p2_st.x[v2], W2,'r-')
-pyplot.plot(p2_st.x[v2], W3,'r-')
-pyplot.plot(p2_st.x[v2], W4,'r-')
-pyplot.plot(p2_st.x[v2], W5,'r-')
-pyplot.plot(p2_st.x[v2], W6,'r-')
+pyplot.plot(x_n, W1,'r-', label='analytical')
+pyplot.plot(x_n, W2,'r-')
+pyplot.plot(x_n, W3,'r-')
+pyplot.plot(x_n, W4,'r-')
+pyplot.plot(x_n, W5,'r-')
+pyplot.plot(x_n, W6,'r-')
 
 
@@ -47 +70 @@
 #Plot the momentums##########################################################
 pyplot.clf()
-pyplot.plot(p2_st.x[v2], p2_st.xmom[288,v2], 'b.', label='numerical') # 0*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xmom[296,v2], 'b.')                    # 1*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xmom[304,v2], 'b.')                     # 2*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xmom[312,v2], 'b.')                     # 3*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xmom[320,v2], 'b.')                     # 4*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xmom[328,v2], 'b.')  # 5*T/6
+pyplot.plot(x_n, UH1_n, 'b.', label='numerical')  # 0*T/6
+pyplot.plot(x_n, UH2_n, 'b.')                     # 1*T/6
+pyplot.plot(x_n, UH3_n, 'b.')                     # 2*T/6
+pyplot.plot(x_n, UH4_n, 'b.')                     # 3*T/6
+pyplot.plot(x_n, UH5_n, 'b.')                     # 4*T/6
+pyplot.plot(x_n, UH6_n, 'b.')                     # 5*T/6
 
-pyplot.plot(p2_st.x[v2], P1,'r-', label='analytical')
-pyplot.plot(p2_st.x[v2], P2,'r-')
-pyplot.plot(p2_st.x[v2], P3,'r-')
-pyplot.plot(p2_st.x[v2], P4,'r-')
-pyplot.plot(p2_st.x[v2], P5,'r-')
-pyplot.plot(p2_st.x[v2], P6,'r-')
+pyplot.plot(x_n, P1,'r-', label='analytical')
+pyplot.plot(x_n, P2,'r-')
+pyplot.plot(x_n, P3,'r-')
+pyplot.plot(x_n, P4,'r-')
+pyplot.plot(x_n, P5,'r-')
+pyplot.plot(x_n, P6,'r-')
 
 pyplot.title('Xmomentum at several instants in time')
@@ -71 +94 @@
 #Plot the velocities#########################################################
 pyplot.clf()
-pyplot.plot(p2_st.x[v2], p2_st.xvel[288,v2], 'b.', label='numerical') # 0*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xvel[296,v2], 'b.')                    # 1*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xvel[304,v2], 'b.')                     # 2*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xvel[312,v2], 'b.')                     # 3*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xvel[320,v2], 'b.')                     # 4*T/6
-pyplot.plot(p2_st.x[v2], p2_st.xvel[328,v2], 'b.')  # 5*T/6
+pyplot.plot(x_n, U1_n, 'b.', label='numerical')  # 0*T/6
+pyplot.plot(x_n, U2_n, 'b.')                     # 1*T/6
+pyplot.plot(x_n, U3_n, 'b.')                     # 2*T/6
+pyplot.plot(x_n, U4_n, 'b.')                     # 3*T/6
+pyplot.plot(x_n, U5_n, 'b.')                     # 4*T/6
+pyplot.plot(x_n, U6_n, 'b.')                     # 5*T/6
 
-pyplot.plot(p2_st.x[v2], U1,'r-', label='analytical')
-pyplot.plot(p2_st.x[v2], U2,'r-')
-pyplot.plot(p2_st.x[v2], U3,'r-')
-pyplot.plot(p2_st.x[v2], U4,'r-')
-pyplot.plot(p2_st.x[v2], U5,'r-')
-pyplot.plot(p2_st.x[v2], U6,'r-')
+pyplot.plot(x_n, U1,'r-', label='analytical')
+pyplot.plot(x_n, U2,'r-')
+pyplot.plot(x_n, U3,'r-')
+pyplot.plot(x_n, U4,'r-')
+pyplot.plot(x_n, U5,'r-')
+pyplot.plot(x_n, U6,'r-')
 
 pyplot.title('Xvelocity at several instants in time')

trunk/anuga_core/source/anuga_validation_tests/analytical_exact/carrier_greenspan_transient/plot_results.py

@@ -15 +15 @@
 #Dimensional parameters
 L   = 5e4         # Length of channel (m)      
-h0  = 5e2          # Height at origin when the water is still
+h0  = 5e2         # Height at origin when the water is still
 g   = 9.81        # Gravity
 
@@ -35 +35 @@
 H2 = W2 - Z2              # dimensional
 P2 = U2 * H2              # dimensional
+      
 
 W3 = W3*h0                # dimensional
@@ -41 +42 @@
 H3 = W3 - Z3              # dimensional
 P3 = U3 * H3              # dimensional
+
+
 
 #Plot the stages##############################################################