Skip to content

Fix the azimuthal flux divergence and geometric sources in 3D cylindrical coordinates #2051

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

Open
aliencaocao wants to merge 3 commits into
base: master
Choose a base branch
from
+601 −42
Open

Fix the azimuthal flux divergence and geometric sources in 3D cylindrical coordinates #2051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afc0fe2
Fix the 3D cylindrical azimuthal flux divergence
aliencaocao Oct 13, 2026
c8ecef2
Merge branch 'master' into fix/cylindrical-angular-flux
wilfonba Oct 14, 2026
bc715da
shorten comments in cases.py
wilfonba Oct 15, 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 @@ -1070,7 +1070,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, pres_K, alpha_K, alpha_rho_K, blkmod_K

G1_eff = 0._wp
Expand Down Expand Up @@ -1332,16 +1332,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)
end do
end do
end do
Expand Down Expand Up @@ -1624,7 +1623,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 @@ -1639,7 +1638,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 @@ -1656,7 +1655,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 @@ -1669,7 +1668,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
11 changes: 11 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 @@ -695,6 +695,17 @@ contains
end if
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
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)
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
11 changes: 11 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 @@ -315,6 +315,17 @@ 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
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)
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
162 changes: 162 additions & 0 deletions tests/4C1D77D7/golden-metadata.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions tests/4C1D77D7/golden.txt
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading