Changeset 8433

Timestamp:

May 18, 2012, 4:20:29 PM (12 years ago)

Author:

davies

Message:

Cleaning validation

Location:

trunk/anuga_core/validation_tests/Tests/Analytical

Files:

• deep_wave/plotme.py (modified) (1 diff)
• deep_wave/results.tex (modified) (1 diff)
• parabolic_basin_1D/parabolaplot.py (modified) (4 diffs)
• runup_sinusoid/runup_sinusoidplot.py (modified) (4 diffs)
• trapezoidal_channel/plotme.py (modified) (4 diffs)

trunk/anuga_core/validation_tests/Tests/Analytical/deep_wave/plotme.py

@@ -18 +18 @@
 pyplot.ylim((-1.5,2.0))
 pyplot.legend()
+pyplot.xlabel('Time (s)')
+pyplot.ylabel('m')
 pyplot.savefig('wave_atten.png')

trunk/anuga_core/validation_tests/Tests/Analytical/deep_wave/results.tex

@@ -9 +9 @@
 \begin{center}
 \includegraphics[width=0.9\textwidth]{wave_atten.png}
-\caption{Stage over time in the centre of the parabola}
+\caption{Stage over time at 3 points in space}
 \label{stagewave}
 \end{center}

trunk/anuga_core/validation_tests/Tests/Analytical/parabolic_basin_1D/parabolaplot.py

@@ -73 +73 @@
 pyplot.plot(p2.time,p2.stage[:,ppp], color='green', label='numerical')
 pyplot.legend()
+pyplot.xlabel('time (s)')
+pyplot.ylabel('Stage (m)')
 pyplot.savefig('Stage_centre_v2.png')
 #       pyplot.savefig('runup_x_velocities.png')
@@ -79 +81 @@
 pyplot.plot(p2.time,p2.stage[:,ppp2], color='green', label='numerical')
 pyplot.legend(loc=10)
+pyplot.xlabel('time (s)')
+pyplot.ylabel('Stage (m)')
 pyplot.savefig('Stage_centre_v3.png')
 
@@ -90 +94 @@
 pyplot.plot(p2.x[v], -omega*A*numpy.sin(omega*p2.time[pltind])*(w>p2.elev[v]), label='Analytical')
 pyplot.legend()
+pyplot.xlabel('x (m)')
+pyplot.ylabel('x velocity (m/s)')
 pyplot.title('Velocity near to time=3T')
 pyplot.savefig('Vel_3T_v2.png')
@@ -101 +107 @@
 pyplot.plot(p2.x[v], -omega*A*numpy.sin(omega*p2.time[pltind])*(w>p2.elev[v]), label='Analytical')
 pyplot.legend()
+pyplot.xlabel('x (m)')
+pyplot.ylabel('x velocity (m/s)')
 pyplot.title('Velocity near to time=3.25T')
 pyplot.savefig('Vel_3_5T_v2.png')

trunk/anuga_core/validation_tests/Tests/Analytical/runup_sinusoid/runup_sinusoidplot.py

@@ -47 +47 @@
 pyplot.quiver(p1.x,p1.y,p1.xvel[t1,:],p1.yvel[t1,:])
 pyplot.title('The maximum VERTEX speed is '+ str(p1.vel[t1,:].max()) + ' m/s at time '+ str(p1.time[t1])+'s')
+pyplot.xlabel('x (m)')
+pyplot.ylabel('y (m)')
 pyplot.savefig('vel_sinu3s_v2.png')
 
@@ -55 +57 @@
 pyplot.quiver(p2.x,p2.y,p2.xvel[t1,:],p2.yvel[t1,:])
 pyplot.title('The maximum CENTROID speed is '+ str(p2.vel[t1,:].max()) + ' m/s at time ' + str(p1.time[t1]) + ' s')
+pyplot.xlabel('x (m)')
+pyplot.ylabel('y (m)')
 pyplot.savefig('vel_sinu3s_v2_cent.png')
 
@@ -63 +67 @@
 pyplot.quiver(p1.x,p1.y,p1.xvel[t2,:],p1.yvel[t2,:])
 pyplot.title('The maximum VERTEX speed is '+ str(p1.vel[t2,:].max()) + ' m/s at time ' + str(p1.time[t2]) +' s')
+pyplot.xlabel('x (m)')
+pyplot.ylabel('y (m)')
 pyplot.savefig('vel_sinu30s_v2.png')
 
@@ -71 +77 @@
 pyplot.quiver(p2.x,p2.y,p2.xvel[t2,:],p2.yvel[t2,:])
 pyplot.title('The maximum CENTROID speed is '+ str(p2.vel[t2,:].max()) + ' m/s at time' + str(p1.time[t2])+ ' s')
+pyplot.xlabel('x (m)')
+pyplot.ylabel('y (m)')
 pyplot.savefig('vel_sinu30s_v2_cent.png')
 

trunk/anuga_core/validation_tests/Tests/Analytical/trapezoidal_channel/plotme.py

@@ -83 +83 @@
 # But in my tests, they are not equal
 pyplot.legend( ('computed velocity', 'Analytical velocity', 'computed depth', 'analytical depth'), loc=4)
+pyplot.xlabel('Down channel distance (m)')
+pyplot.ylabel(' Generic scale (m or m/s)')
 pyplot.savefig('trapz_velocity_downstream_l0_eq_1_EL.png')
 
@@ -101 +103 @@
 pyplot.legend( ('computed velocity (m/s)', 'analytical velocity (m/s)', 'bed elevation (m)', 'computed stage (m)', 'analytical_stage (m)') ,loc=10)
 pyplot.title('Velocity (analytical and numerical) and Stage:' + '\n' +'Central channel regions (470 to 500m)' +'\n')
+pyplot.xlabel('Cross-channel distance (m)')
+pyplot.ylabel(' Generic scale (m or m/s)')
 pyplot.savefig('trapz_velocity_cross_channel_l0_eq_1_EL.png') 
 
@@ -120 +124 @@
 pyplot.legend( ('computed velocity (m/s)', 'analytical velocity (m/s)', 'bed elevation (m)', 'computed stage (m)', 'analytical_stage (m)') ,loc=10)
 pyplot.title('Velocity (analytical and numerical) and Stage:' + '\n' +'Central channel regions (470 to 500m)' +'\n')
+pyplot.xlabel('Cross-channel distance (m)')
+pyplot.ylabel(' Generic scale (m or m/s)')
 pyplot.savefig('trapz_velocity_cross_channel_l0_eq_1b_EL.png') 
 
@@ -138 +144 @@
 pyplot.legend( ('computed velocity (m/s)', 'analytical velocity (m/s)', 'bed elevation (m)', 'computed stage (m)', 'analytical_stage (m)') , loc=10)
 pyplot.title('Velocity (analytical and numerical) and Stage:' + '\n' +'Central channel regions (870 to 900m)' +'\n')
+pyplot.xlabel('Cross-channel distance (m)')
+pyplot.ylabel(' Generic scale (m or m/s)')
 pyplot.savefig('trapz_velocity_cross_channel_l0_eq_1c_EL.png')