Skip to content

Commit f80a94e

Browse files
sbryngelsonsbryngelson
committed
clean up bubble call in riemann solve
1 parent b30a421 commit f80a94e

File tree

1 file changed

+42
-35
lines changed

1 file changed

+42
-35
lines changed

‎src/simulation/m_riemann_solvers.fpp‎

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,46 +1586,53 @@ contains
15861586
15871587
! Momentum flux.
15881588
! f = \rho u u + p I, q = \rho u, q_star = \xi * \rho*(s_star, v, w)
1589-
if (bubbles .neqv. .true.) then
1590-
!$acc loop seq
1591-
do i = 1, num_dims
1592-
flux_rs${XYZ}$_vf(j, k, l, contxe + dir_idx(i)) = &
1593-
xi_M*(rho_L*(vel_L(dir_idx(1))* &
1594-
vel_L(dir_idx(i)) + &
1595-
s_M*(xi_L*(dir_flg(dir_idx(i))*s_S + &
1596-
(1d0 - dir_flg(dir_idx(i)))* &
1597-
vel_L(dir_idx(i))) - vel_L(dir_idx(i)))) + &
1598-
dir_flg(dir_idx(i))*(pres_L)) &
1599-
+ xi_P*(rho_R*(vel_R(dir_idx(1))* &
1600-
vel_R(dir_idx(i)) + &
1601-
s_P*(xi_R*(dir_flg(dir_idx(i))*s_S + &
1602-
(1d0 - dir_flg(dir_idx(i)))* &
1603-
vel_R(dir_idx(i))) - vel_R(dir_idx(i)))) + &
1604-
dir_flg(dir_idx(i))*(pres_R))
1605-
! if (j==0) print*, 'flux_rs_vf', flux_rs_vf(cont_idx%end+dir_idx(i))%sf(j,k,l)
1606-
end do
1607-
else
1608-
! Include p_tilde
1589+
!$acc loop seq
1590+
do i = 1, num_dims
1591+
flux_rs${XYZ}$_vf(j, k, l, contxe + dir_idx(i)) = &
1592+
xi_M*(rho_L*(vel_L(dir_idx(1))* &
1593+
vel_L(dir_idx(i)) + &
1594+
s_M*(xi_L*(dir_flg(dir_idx(i))*s_S + &
1595+
(1d0 - dir_flg(dir_idx(i)))* &
1596+
vel_L(dir_idx(i))) - vel_L(dir_idx(i)))) + &
1597+
dir_flg(dir_idx(i))*pres_L) &
1598+
+ xi_P*(rho_R*(vel_R(dir_idx(1))* &
1599+
vel_R(dir_idx(i)) + &
1600+
s_P*(xi_R*(dir_flg(dir_idx(i))*s_S + &
1601+
(1d0 - dir_flg(dir_idx(i)))* &
1602+
vel_R(dir_idx(i))) - vel_R(dir_idx(i)))) + &
1603+
dir_flg(dir_idx(i))*pres_R)
1604+
end do
1605+
1606+
if (bubbles) then
1607+
! Put p_tilde in
16091608
!$acc loop seq
16101609
do i = 1, num_dims
1611-
flux_rs${XYZ}$_vf(j, k, l, contxe + dir_idx(i)) = &
1612-
xi_M*(rho_L*(vel_L(dir_idx(1))* &
1613-
vel_L(dir_idx(i)) + &
1614-
s_M*(xi_L*(dir_flg(dir_idx(i))*s_S + &
1615-
(1d0 - dir_flg(dir_idx(i)))* &
1616-
vel_L(dir_idx(i))) - vel_L(dir_idx(i)))) + &
1617-
dir_flg(dir_idx(i))*(pres_L - ptilde_L)) &
1618-
+ xi_P*(rho_R*(vel_R(dir_idx(1))* &
1619-
vel_R(dir_idx(i)) + &
1620-
s_P*(xi_R*(dir_flg(dir_idx(i))*s_S + &
1621-
(1d0 - dir_flg(dir_idx(i)))* &
1622-
vel_R(dir_idx(i))) - vel_R(dir_idx(i)))) + &
1623-
dir_flg(dir_idx(i))*(pres_R - ptilde_R))
1624-
! if (j==0) print*, 'flux_rs_vf', flux_rs_vf(cont_idx%end+dir_idx(i))%sf(j,k,l)
1610+
flux_rs${XYZ}$_vf(j, k, l, contxe + dir_idx(i)) = &
1611+
flux_rs${XYZ}$_vf(j, k, l, contxe + dir_idx(i)) + &
1612+
xi_M*(dir_flg(dir_idx(i))*(-1d0*ptilde_L)) &
1613+
+ xi_P*(dir_flg(dir_idx(i))*(-1d0*ptilde_R))
16251614
end do
1626-
16271615
end if
16281616
1617+
!else
1618+
! !$acc loop seq
1619+
! do i = 1, num_dims
1620+
! flux_rs${XYZ}$_vf(j, k, l, contxe + dir_idx(i)) = &
1621+
! xi_M*(rho_L*(vel_L(dir_idx(1))* &
1622+
! vel_L(dir_idx(i)) + &
1623+
! s_M*(xi_L*(dir_flg(dir_idx(i))*s_S + &
1624+
! (1d0 - dir_flg(dir_idx(i)))* &
1625+
! vel_L(dir_idx(i))) - vel_L(dir_idx(i)))) + &
1626+
! dir_flg(dir_idx(i))*(pres_L)) &
1627+
! + xi_P*(rho_R*(vel_R(dir_idx(1))* &
1628+
! vel_R(dir_idx(i)) + &
1629+
! s_P*(xi_R*(dir_flg(dir_idx(i))*s_S + &
1630+
! (1d0 - dir_flg(dir_idx(i)))* &
1631+
! vel_R(dir_idx(i))) - vel_R(dir_idx(i)))) + &
1632+
! dir_flg(dir_idx(i))*(pres_R))
1633+
! end do
1634+
!end if
1635+
16291636
flux_rs${XYZ}$_vf(j, k, l, E_idx) = 0.d0
16301637
16311638
!$acc loop seq

0 commit comments

Comments
 (0)