Skip to content

Commit 300b93f

Browse files
hyeoksu-leehyeoksu-lee
committed
fix merge bugs
1 parent 200cf6b commit 300b93f

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

‎src/simulation/m_mpi_proxy.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ contains
115115
& 'bc_y%grcbc_in', 'bc_y%grcbc_out', 'bc_y%grcbc_vel_out', &
116116
& 'bc_z%grcbc_in', 'bc_z%grcbc_out', 'bc_z%grcbc_vel_out', &
117117
& 'cfl_adap_dt', 'cfl_const_dt', 'cfl_dt', 'surface_tension', &
118-
& 'shear_stress', 'bulk_stress', 'bubbles_lagrange','fft_wrt' &
118+
& 'shear_stress', 'bulk_stress', 'bubbles_lagrange','fft_wrt', &
119119
& 'hyperelasticity', 'down_sample', 'int_comp', 'preconditioning' ]
120120
call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
121121
#:endfor

‎src/simulation/m_time_steppers.fpp‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,7 @@ contains
727727
real(wp), dimension(num_fluids) :: alpha !< Cell-avg. volume fraction
728728
real(wp) :: gamma !< Cell-avg. sp. heat ratio
729729
real(wp) :: pi_inf !< Cell-avg. liquid stiffness function
730+
real(wp) :: qv !< Cell-avg. fluid reference energy
730731
real(wp) :: c !< Cell-avg. sound speed
731732
real(wp) :: H !< Cell-avg. enthalpy
732733
real(wp), dimension(2) :: Re !< Cell-avg. Reynolds numbers
@@ -771,8 +772,8 @@ contains
771772
do k = 0, n
772773
do j = 0, m
773774
if (preconditioning) then
774-
call s_compute_enthalpy(q_prim_vf, pres, rho, gamma, pi_inf, Re, H, alpha, vel, vel_sum, j, k, l)
775-
call s_compute_speed_of_sound(pres, rho, gamma, pi_inf, H, alpha, vel_sum, 0._wp, c)
775+
call s_compute_enthalpy(q_prim_vf, pres, rho, gamma, pi_inf, Re, H, alpha, vel, vel_sum, qv, j, k, l)
776+
call s_compute_speed_of_sound(pres, rho, gamma, pi_inf, H, alpha, vel_sum, 0._wp, c, qv)
776777
beta = min(max(sgm_eps, vel_sum/c**2._wp), 1._wp)
777778

778779
do i = contxb, contxe
@@ -884,6 +885,7 @@ contains
884885
real(wp), dimension(num_fluids) :: alpha !< Cell-avg. volume fraction
885886
real(wp) :: gamma !< Cell-avg. sp. heat ratio
886887
real(wp) :: pi_inf !< Cell-avg. liquid stiffness function
888+
real(wp) :: qv !< Cell-avg. fluid reference energy
887889
real(wp) :: c !< Cell-avg. sound speed
888890
real(wp) :: H !< Cell-avg. enthalpy
889891
real(wp), dimension(2) :: Re !< Cell-avg. Reynolds numbers
@@ -925,8 +927,8 @@ contains
925927
do k = 0, n
926928
do j = 0, m
927929
if (preconditioning) then
928-
call s_compute_enthalpy(q_prim_vf, pres, rho, gamma, pi_inf, Re, H, alpha, vel, vel_sum, j, k, l)
929-
call s_compute_speed_of_sound(pres, rho, gamma, pi_inf, H, alpha, vel_sum, 0._wp, c)
930+
call s_compute_enthalpy(q_prim_vf, pres, rho, gamma, pi_inf, Re, H, alpha, vel, vel_sum, qv, j, k, l)
931+
call s_compute_speed_of_sound(pres, rho, gamma, pi_inf, H, alpha, vel_sum, 0._wp, c, qv)
930932
beta = min(max(sgm_eps, vel_sum/c**2._wp), 1._wp)
931933

932934
do i = contxb, contxe
@@ -1038,6 +1040,7 @@ contains
10381040
real(wp), dimension(num_fluids) :: alpha !< Cell-avg. volume fraction
10391041
real(wp) :: gamma !< Cell-avg. sp. heat ratio
10401042
real(wp) :: pi_inf !< Cell-avg. liquid stiffness function
1043+
real(wp) :: qv !< Cell-avg. fluid reference energy
10411044
real(wp) :: c !< Cell-avg. sound speed
10421045
real(wp) :: H !< Cell-avg. enthalpy
10431046
real(wp), dimension(2) :: Re !< Cell-avg. Reynolds numbers
@@ -1115,8 +1118,8 @@ contains
11151118
do k = 0, n
11161119
do j = 0, m
11171120
if (preconditioning) then
1118-
call s_compute_enthalpy(q_prim_vf, pres, rho, gamma, pi_inf, Re, H, alpha, vel, vel_sum, j, k, l)
1119-
call s_compute_speed_of_sound(pres, rho, gamma, pi_inf, H, alpha, vel_sum, 0._wp, c)
1121+
call s_compute_enthalpy(q_prim_vf, pres, rho, gamma, pi_inf, Re, H, alpha, vel, vel_sum, qv, j, k, l)
1122+
call s_compute_speed_of_sound(pres, rho, gamma, pi_inf, H, alpha, vel_sum, 0._wp, c, qv)
11201123
mach2 = vel_sum/c**2._wp
11211124
if (mach2 > 0.3) then
11221125
beta = 1._wp
@@ -1231,6 +1234,7 @@ contains
12311234
real(wp), dimension(num_fluids) :: alpha !< Cell-avg. volume fraction
12321235
real(wp) :: gamma !< Cell-avg. sp. heat ratio
12331236
real(wp) :: pi_inf !< Cell-avg. liquid stiffness function
1237+
real(wp) :: qv !< Cell-avg. fluid reference energy
12341238
real(wp) :: c !< Cell-avg. sound speed
12351239
real(wp) :: H !< Cell-avg. enthalpy
12361240
real(wp), dimension(2) :: Re !< Cell-avg. Reynolds numbers
@@ -1308,8 +1312,8 @@ contains
13081312
do k = 0, n
13091313
do j = 0, m
13101314
if (preconditioning) then
1311-
call s_compute_enthalpy(q_prim_vf, pres, rho, gamma, pi_inf, Re, H, alpha, vel, vel_sum, j, k, l)
1312-
call s_compute_speed_of_sound(pres, rho, gamma, pi_inf, H, alpha, vel_sum, 0._wp, c)
1315+
call s_compute_enthalpy(q_prim_vf, pres, rho, gamma, pi_inf, Re, H, alpha, vel, vel_sum, qv, j, k, l)
1316+
call s_compute_speed_of_sound(pres, rho, gamma, pi_inf, H, alpha, vel_sum, 0._wp, c, qv)
13131317
! mach2 = vel_sum/c**2._wp
13141318
! if (mach2 > 0.3**2._wp) then
13151319
! beta = 1._wp

0 commit comments

Comments
 (0)