@@ -31,17 +31,18 @@ def init_data(my_data, rp):
3131 ymom [:, :] = 0.0
3232
3333 rho_1 = rp .get_param ("kh.rho_1" )
34- v_1 = rp .get_param ("kh.v_1 " )
34+ u_1 = rp .get_param ("kh.u_1 " )
3535 rho_2 = rp .get_param ("kh.rho_2" )
36- v_2 = rp .get_param ("kh.v_2" )
36+ u_2 = rp .get_param ("kh.u_2" )
37+ bulk_velocity = rp .get_param ("kh.bulk_velocity" )
3738
3839 gamma = rp .get_param ("eos.gamma" )
3940
4041 myg = my_data .grid
4142
4243 dy = 0.025
4344 w0 = 0.01
44- vm = 0.5 * (v_1 - v_2 )
45+ vm = 0.5 * (u_1 - u_2 )
4546 rhom = 0.5 * (rho_1 - rho_2 )
4647
4748 idx1 = myg .y2d < 0.25
@@ -53,23 +54,23 @@ def init_data(my_data, rp):
5354
5455 # lower quarter
5556 dens [idx1 ] = rho_1 - rhom * np .exp ((myg .y2d [idx1 ] - 0.25 )/ dy )
56- xmom [idx1 ] = v_1 - vm * np .exp ((myg .y2d [idx1 ] - 0.25 )/ dy )
57+ xmom [idx1 ] = u_1 - vm * np .exp ((myg .y2d [idx1 ] - 0.25 )/ dy )
5758
5859 # second quarter
5960 dens [idx2 ] = rho_2 + rhom * np .exp ((0.25 - myg .y2d [idx2 ])/ dy )
60- xmom [idx2 ] = v_2 + vm * np .exp ((0.25 - myg .y2d [idx2 ])/ dy )
61+ xmom [idx2 ] = u_2 + vm * np .exp ((0.25 - myg .y2d [idx2 ])/ dy )
6162
6263 # third quarter
6364 dens [idx3 ] = rho_2 + rhom * np .exp ((myg .y2d [idx3 ] - 0.75 )/ dy )
64- xmom [idx3 ] = v_2 + vm * np .exp ((myg .y2d [idx3 ] - 0.75 )/ dy )
65+ xmom [idx3 ] = u_2 + vm * np .exp ((myg .y2d [idx3 ] - 0.75 )/ dy )
6566
6667 # fourth quarter
6768 dens [idx4 ] = rho_1 - rhom * np .exp ((0.75 - myg .y2d [idx4 ])/ dy )
68- xmom [idx4 ] = v_1 - vm * np .exp ((0.75 - myg .y2d [idx4 ])/ dy )
69+ xmom [idx4 ] = u_1 - vm * np .exp ((0.75 - myg .y2d [idx4 ])/ dy )
6970
7071 # upper half
7172 xmom [:, :] *= dens
72- ymom [:, :] = dens * w0 * np .sin (4 * np .pi * myg .x2d )
73+ ymom [:, :] = dens * ( bulk_velocity + w0 * np .sin (4 * np .pi * myg .x2d ) )
7374
7475 p = 2.5
7576 ener [:, :] = p / (gamma - 1.0 ) + 0.5 * (xmom [:, :]** 2 + ymom [:, :]** 2 )/ dens [:, :]
0 commit comments