Changeset 8917

Timestamp:

Jun 13, 2013, 5:02:54 PM (12 years ago)

Author:

steve

Message:

Added in validation test for avalanche_wet

Location:

trunk/anuga_core/source/anuga_validation_tests/analytical_exact/avalanche_wet

Files:

• plot_results.py (modified) (3 diffs)
• validate_results.py (added)

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

@@ -13 +13 @@
 v2=(p2_st.y==v)
 
-u0,h0,w0,z0,p0 = analytical_sol(p2_st.x[v2], p2_st.time[0])
-u20,h20,w20,z20,p20 = analytical_sol(p2_st.x[v2], p2_st.time[20])
-u40,h40,w40,z40,p40 = analytical_sol(p2_st.x[v2], p2_st.time[40])
+x_n = p2_st.x[v2]
+
+u0,h0,w0,z0,p0 = analytical_sol(x_n, p2_st.time[0])
+u20,h20,w20,z20,p20 = analytical_sol(x_n, p2_st.time[20])
+u40,h40,w40,z40,p40 = analytical_sol(x_n, p2_st.time[40])
+
+
+
+w0_n  = p2_st.stage[0,v2]
+w20_n = p2_st.stage[20,v2]
+w40_n = p2_st.stage[40,v2]
+
+z_n = p2_st.elev[v2]
+
+uh0_n  = p2_st.xmom[0,v2]
+uh20_n = p2_st.xmom[20,v2]
+uh40_n = p2_st.xmom[40,v2]
+
+u0_n  = p2_st.xvel[0,v2]
+u20_n = p2_st.xvel[20,v2]
+u40_n = p2_st.xvel[40,v2]
 
 #Plot stages
 pyplot.clf()
-pyplot.plot(p2_st.x[v2], p2_st.stage[0,v2],'b.-', label='numerical stage')
-pyplot.plot(p2_st.x[v2], p2_st.stage[20,v2], 'b.-')
-pyplot.plot(p2_st.x[v2], p2_st.stage[40,v2], 'b.-')
-pyplot.plot(p2_st.x[v2], w0,'r-', label='analytical stage')
-pyplot.plot(p2_st.x[v2], w20,'r-')
-pyplot.plot(p2_st.x[v2], w40,'r-')
-pyplot.plot(p2_st.x[v2], p2_st.elev[v2],'k-', label='bed elevation')
+pyplot.plot(x_n, w0_n,'b.-', label='numerical stage')
+pyplot.plot(x_n, w20_n, 'b.-')
+pyplot.plot(x_n, w40_n, 'b.-')
+pyplot.plot(x_n, w0,'r-', label='analytical stage')
+pyplot.plot(x_n, w20,'r-')
+pyplot.plot(x_n, w40,'r-')
+pyplot.plot(x_n, p2_st.elev[v2],'k-', label='bed elevation')
 pyplot.title('Stage at several instants in time')
 pyplot.legend(loc='best')
@@ -36 +54 @@
 #Plot xmomentum
 pyplot.clf()
-pyplot.plot(p2_st.x[v2], p2_st.xmom[0,v2], 'b.-', label='numerical')
-pyplot.plot(p2_st.x[v2], p2_st.xmom[20,v2], 'b.-')
-pyplot.plot(p2_st.x[v2], p2_st.xmom[40,v2],'b.-')
-pyplot.plot(p2_st.x[v2], u0*h0,'r-', label='analytical')
-pyplot.plot(p2_st.x[v2], u20*h20,'r-')
-pyplot.plot(p2_st.x[v2], u40*h40,'r-')
+pyplot.plot(x_n, uh0_n, 'b.-', label='numerical')
+pyplot.plot(x_n, uh20_n, 'b.-')
+pyplot.plot(x_n, uh40_n,'b.-')
+pyplot.plot(x_n, u0*h0,'r-', label='analytical')
+pyplot.plot(x_n, u20*h20,'r-')
+pyplot.plot(x_n, u40*h40,'r-')
 pyplot.title('Xmomentum at several instants in time')
 pyplot.legend(loc='best')
@@ -51 +69 @@
 #Plot velocities
 pyplot.clf()
-pyplot.plot(p2_st.x[v2], p2_st.xvel[0,v2], 'b.-', label='numerical')
-pyplot.plot(p2_st.x[v2], p2_st.xvel[20,v2], 'b.-')
-pyplot.plot(p2_st.x[v2], p2_st.xvel[40,v2],'b.-')
-pyplot.plot(p2_st.x[v2], u0,'r-', label='analytical')
-pyplot.plot(p2_st.x[v2], u20,'r-')
-pyplot.plot(p2_st.x[v2], u40,'r-')
+pyplot.plot(x_n, u0_n, 'b.-', label='numerical')
+pyplot.plot(x_n, u20_n, 'b.-')
+pyplot.plot(x_n, u40_n,'b.-')
+pyplot.plot(x_n, u0,'r-', label='analytical')
+pyplot.plot(x_n, u20,'r-')
+pyplot.plot(x_n, u40,'r-')
 pyplot.title('Xvelocity at several instants in time')
 pyplot.legend(loc='best')