Skip to content

Fix cylindrical angular flux scaling and geometric sources #1824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
aliencaocao wants to merge 2 commits into
base: master
Choose a base branch
from
+41 −8
Draft

Fix cylindrical angular flux scaling and geometric sources #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
654b5cb
Fix cylindrical angular flux scaling and geometric sources
aliencaocao Sep 5, 2026
fdc2196
Merge branch 'master' into fix/cylindrical-angular-flux
aliencaocao Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/simulation/m_rhs.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ contains
integer :: k_loop, l_loop, q_loop !< Standardized spatial loop iterators 0:m, 0:n, 0:p
integer :: i_fluid_loop
real(wp) :: inv_ds, flux_face1, flux_face2
real(wp) :: advected_qty_val, pressure_val, velocity_val
real(wp) :: advected_qty_val, pressure_val
real(wp) :: G1_eff, G2_eff

G1_eff = 0._wp
Expand Down Expand Up @@ -1310,16 +1310,15 @@ contains
end if

if (grid_geometry == 3) then ! Cylindrical Coordinates
$:GPU_PARALLEL_LOOP(collapse=4,private='[j, k, l, q, inv_ds, velocity_val, flux_face1, flux_face2]')
$:GPU_PARALLEL_LOOP(collapse=4,private='[j, k, l, q, inv_ds, flux_face1, flux_face2]')
do j = 1, sys_size
do k = 0, p
do q = 0, n
do l = 0, m
inv_ds = 1._wp/(dz(k)*y_cc(q))
velocity_val = q_prim_vf%vf(eqn_idx%cont%end + idir)%sf(l, q, k)
flux_face1 = flux_n(3)%vf(j)%sf(l, q, k - 1)
flux_face2 = flux_n(3)%vf(j)%sf(l, q, k)
rhs_vf(j)%sf(l, q, k) = rhs_vf(j)%sf(l, q, k) + inv_ds*velocity_val*(flux_face1 - flux_face2)
rhs_vf(j)%sf(l, q, k) = rhs_vf(j)%sf(l, q, k) + inv_ds*(flux_face1 - flux_face2)
Comment on lines 1318 to +1321
end do
end do
end do
Expand Down Expand Up @@ -1602,7 +1601,7 @@ contains
do k_idx = 0, p ! z_extent
do q_idx = 0, n ! y_extent
do l_idx = 0, m ! x_extent
local_inv_ds = 1._wp/dz(k_idx)
local_inv_ds = 1._wp/(dz(k_idx)*y_cc(q_idx))
local_term_coeff = q_prim_vf_arg%vf(eqn_idx%cont%end + current_idir)%sf(l_idx, q_idx, k_idx)
local_flux1 = flux_src_n_vf_arg%vf(j_adv)%sf(l_idx, q_idx, k_idx - 1)
local_flux2 = flux_src_n_vf_arg%vf(j_adv)%sf(l_idx, q_idx, k_idx)
Expand All @@ -1617,7 +1616,7 @@ contains
$:GPU_PARALLEL_LOOP(collapse=3, private='[k_idx, l_idx, q_idx, local_inv_ds, local_k_term_val, &
& local_flux1, local_flux2]')
do k_idx = 0, p; do q_idx = 0, n; do l_idx = 0, m
local_inv_ds = 1._wp/dz(k_idx)
local_inv_ds = 1._wp/(dz(k_idx)*y_cc(q_idx))
local_k_term_val = Kterm_arg(l_idx, q_idx, k_idx)
local_flux1 = nc_iface_vel_n(3)%vf(3)%sf(l_idx, q_idx, k_idx)
local_flux2 = nc_iface_vel_n(3)%vf(3)%sf(l_idx, q_idx, k_idx - 1)
Expand All @@ -1634,7 +1633,7 @@ contains
& local_flux1, local_flux2]')
do j_adv = eqn_idx%adv%beg, eqn_idx%adv%end
do k_idx = 0, p; do q_idx = 0, n; do l_idx = 0, m
local_inv_ds = 1._wp/dz(k_idx)
local_inv_ds = 1._wp/(dz(k_idx)*y_cc(q_idx))
local_term_coeff = q_cons_vf_arg%vf(j_adv)%sf(l_idx, q_idx, k_idx)
local_flux1 = flux_src_n_vf_arg%vf(eqn_idx%adv%beg)%sf(l_idx, q_idx, k_idx)
local_flux2 = flux_src_n_vf_arg%vf(eqn_idx%adv%beg)%sf(l_idx, q_idx, k_idx - 1)
Expand All @@ -1647,7 +1646,7 @@ contains
$:GPU_PARALLEL_LOOP(collapse=3, private='[k_idx, l_idx, q_idx, local_inv_ds, local_k_term_val, &
& local_flux1, local_flux2]')
do k_idx = 0, p; do q_idx = 0, n; do l_idx = 0, m
local_inv_ds = 1._wp/dz(k_idx)
local_inv_ds = 1._wp/(dz(k_idx)*y_cc(q_idx))
local_k_term_val = Kterm_arg(l_idx, q_idx, k_idx)
local_flux1 = flux_src_n_vf_arg%vf(eqn_idx%adv%beg)%sf(l_idx, q_idx, k_idx)
local_flux2 = flux_src_n_vf_arg%vf(eqn_idx%adv%beg)%sf(l_idx, q_idx, k_idx - 1)
Expand Down
17 changes: 17 additions & 0 deletions src/simulation/m_riemann_solver_hll.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,23 @@ contains
end do
end if
#:endif
#:if (NORM_DIR == 3)
if (grid_geometry == 3) then
$:GPU_LOOP(parallelism='[seq]')
do i = 1, sys_size
flux_gsrc_rsx_vf(${SF('')}$, i) = 0._wp
end do
Comment on lines +686 to +689
if (bubbles_euler) then
flux_gsrc_rsx_vf(${SF('')}$, eqn_idx%mom%beg + 1) = -flux_rsx_vf(${SF('')}$, &
& eqn_idx%mom%end) + (s_M*(pres_R - ptilde_R) - s_P*(pres_L - ptilde_L)) &
& /(s_M - s_P)
else
flux_gsrc_rsx_vf(${SF('')}$, eqn_idx%mom%beg + 1) = -flux_rsx_vf(${SF('')}$, &
& eqn_idx%mom%end) + (s_M*pres_R - s_P*pres_L)/(s_M - s_P)
end if
flux_gsrc_rsx_vf(${SF('')}$, eqn_idx%mom%end) = flux_rsx_vf(${SF('')}$, eqn_idx%mom%beg + 1)
end if
#:endif
end do
end do
end do
Expand Down
17 changes: 17 additions & 0 deletions src/simulation/m_riemann_solver_lf.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,23 @@ contains
end do
end if
#:endif
#:if (NORM_DIR == 3)
if (grid_geometry == 3) then
$:GPU_LOOP(parallelism='[seq]')
do i = 1, sys_size
flux_gsrc_rsx_vf(${SF('')}$, i) = 0._wp
end do
if (bubbles_euler) then
flux_gsrc_rsx_vf(${SF('')}$, eqn_idx%mom%beg + 1) = -flux_rsx_vf(${SF('')}$, &
& eqn_idx%mom%end) + (s_M*(pres_R - ptilde_R) - s_P*(pres_L - ptilde_L)) &
& /(s_M - s_P)
else
flux_gsrc_rsx_vf(${SF('')}$, eqn_idx%mom%beg + 1) = -flux_rsx_vf(${SF('')}$, &
& eqn_idx%mom%end) + (s_M*pres_R - s_P*pres_L)/(s_M - s_P)
end if
flux_gsrc_rsx_vf(${SF('')}$, eqn_idx%mom%end) = flux_rsx_vf(${SF('')}$, eqn_idx%mom%beg + 1)
end if
#:endif
Comment on lines +328 to +344
end do
end do
end do
Expand Down
Loading