Changeset 8918

Timestamp:

Jun 13, 2013, 5:04:12 PM (11 years ago)

Author:

steve

Message:

Added in validation test for avalanche_dry (actually doesn't pass
due to large error at wet dry interface)

Location:

trunk/anuga_core/source/anuga_validation_tests/analytical_exact/avalanche_dry

Files:

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

trunk/anuga_core/source/anuga_validation_tests/analytical_exact/avalanche_dry/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])
-u10,h10,w10,z10,p10 = analytical_sol(p2_st.x[v2], p2_st.time[10])
-u30,h30,w30,z30,p30 = analytical_sol(p2_st.x[v2], p2_st.time[30])
+x_n = p2_st.x[v2]
+
+
+
+u0,h0,w0,z0,p0 = analytical_sol(x_n, p2_st.time[0])
+u10,h10,w10,z10,p10 = analytical_sol(x_n, p2_st.time[10])
+u30,h30,w30,z30,p30 = analytical_sol(x_n, p2_st.time[30])
+
+
+w0_n  = p2_st.stage[0,v2]
+w10_n = p2_st.stage[10,v2]
+w30_n = p2_st.stage[30,v2]
+
+z_n = p2_st.elev[v2]
+
+uh0_n  = p2_st.xmom[0,v2]
+uh10_n = p2_st.xmom[10,v2]
+uh30_n = p2_st.xmom[30,v2]
+
+u0_n  = p2_st.xvel[0,v2]
+u10_n = p2_st.xvel[10,v2]
+u30_n = p2_st.xvel[30,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[10,v2], 'b.-')
-pyplot.plot(p2_st.x[v2], p2_st.stage[30,v2], 'b.-')
-pyplot.plot(p2_st.x[v2], w0,'r-', label='analytical stage')
-pyplot.plot(p2_st.x[v2], w10,'r-')
-pyplot.plot(p2_st.x[v2], w30,'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, w10_n, 'b.-')
+pyplot.plot(x_n, w30_n, 'b.-')
+pyplot.plot(x_n, w0,'r-', label='analytical stage')
+pyplot.plot(x_n, w10,'r-')
+pyplot.plot(x_n, w30,'r-')
+pyplot.plot(x_n, z_n,'k-', label='bed elevation')
 pyplot.title('Stage at several instants in time')
 pyplot.legend(loc='best')
@@ -36 +57 @@
 #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[10,v2], 'b.-')
-pyplot.plot(p2_st.x[v2], p2_st.xmom[30,v2],'b.-')
-pyplot.plot(p2_st.x[v2], u0*h0,'r-', label='analytical')
-pyplot.plot(p2_st.x[v2], u10*h10,'r-')
-pyplot.plot(p2_st.x[v2], u30*h30,'r-')
+pyplot.plot(x_n, uh0_n, 'b.-', label='numerical')
+pyplot.plot(x_n, uh10_n, 'b.-')
+pyplot.plot(x_n, uh30_n,'b.-')
+pyplot.plot(x_n, u0*h0,'r-', label='analytical')
+pyplot.plot(x_n, u10*h10,'r-')
+pyplot.plot(x_n, u30*h30,'r-')
 pyplot.title('Xmomentum at several instants in time')
 pyplot.legend(loc='best')
@@ -51 +72 @@
 #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[10,v2], 'b.-')
-pyplot.plot(p2_st.x[v2], p2_st.xvel[30,v2],'b.-')
-pyplot.plot(p2_st.x[v2], u0,'r-', label='analytical')
-pyplot.plot(p2_st.x[v2], u10,'r-')
-pyplot.plot(p2_st.x[v2], u30,'r-')
+pyplot.plot(x_n, u0_n, 'b.-', label='numerical')
+pyplot.plot(x_n, u10_n, 'b.-')
+pyplot.plot(x_n, u30_n,'b.-')
+pyplot.plot(x_n, u0,'r-', label='analytical')
+pyplot.plot(x_n, u10,'r-')
+pyplot.plot(x_n, u30,'r-')
 pyplot.title('Xvelocity at several instants in time')
 pyplot.legend(loc='best')