Skip to content

IGR integration #1615

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
StevenXue98 wants to merge 14 commits into
base: master
Choose a base branch
from
Open

IGR integration #1615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8f24389
added igr integration TODOs for m_start_up and m_time_steppers
StevenXue98 Jun 6, 2026
1fbe923
igr allocates/deallocates q_prim_vf in m_time_steppers
StevenXue98 Jun 6, 2026
721a8c0
added TODO integration comments in m_rhs.fpp
StevenXue98 Jun 9, 2026
e3dd144
Integrate inviscid IGR with LF Riemann path
StevenXue98 Jun 21, 2026
f453e41
Merge main into igr-integration
StevenXue98 Jun 21, 2026
b1057a8
Integrate IGR with shared LF RHS path
StevenXue98 Jun 22, 2026
a92a09d
Merge branch 'main' into igr-integration
StevenXue98 Jun 22, 2026
3126a99
Route IGR viscous RHS through shared physics accumulation
StevenXue98 Jun 23, 2026
20033cc
Merge branch 'main' into igr-integration
StevenXue98 Jun 23, 2026
062316b
Route IGR Sigma through shared source-flux RHS path
StevenXue98 Jun 23, 2026
c18a82e
Use standard RHS field bounds for IGR
StevenXue98 Jun 23, 2026
b420e25
Clean up shared IGR RHS flow
StevenXue98 Jun 23, 2026
0374918
Update IGR goldens for full alpha output
StevenXue98 Jun 23, 2026
8359606
Merge remote-tracking branch 'upstream/master' into igr-integration
StevenXue98 Jun 23, 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
2 changes: 2 additions & 0 deletions src/common/include/3dHardcodedIC.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
q_prim_vf(eqn_idx%cont%beg)%sf(i, j, k) = (rho_th - rho_am)*rcut*xcut + rho_am
else
q_prim_vf(eqn_idx%adv%beg)%sf(i, j, k) = (1._wp - 2._wp*eps)*rcut*xcut + eps
q_prim_vf(eqn_idx%adv%end)%sf(i, j, k) = 1._wp - q_prim_vf(eqn_idx%adv%beg)%sf(i, j, k)
q_prim_vf(eqn_idx%cont%beg)%sf(i, j, k) = rho_th*q_prim_vf(eqn_idx%adv%beg)%sf(i, j, k)
q_prim_vf(eqn_idx%cont%end)%sf(i, j, k) = rho_am*(1._wp - q_prim_vf(eqn_idx%adv%beg)%sf(i, j, k))
end if
Expand All @@ -160,6 +161,7 @@
q_prim_vf(eqn_idx%cont%beg)%sf(i, j, k) = (rho_th - rho_am)*rcut*xcut + rho_am
else
q_prim_vf(eqn_idx%adv%beg)%sf(i, j, k) = (1._wp - 2._wp*eps)*rcut*xcut + eps
q_prim_vf(eqn_idx%adv%end)%sf(i, j, k) = 1._wp - q_prim_vf(eqn_idx%adv%beg)%sf(i, j, k)
q_prim_vf(eqn_idx%cont%beg)%sf(i, j, k) = rho_th*q_prim_vf(eqn_idx%adv%beg)%sf(i, j, k)
q_prim_vf(eqn_idx%cont%end)%sf(i, j, k) = rho_am*(1._wp - q_prim_vf(eqn_idx%adv%beg)%sf(i, j, k))
end if
Expand Down
13 changes: 4 additions & 9 deletions src/common/m_global_parameters_common.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,10 @@ contains
eqn_idx%mom%end = eqn_idx%cont%end + num_vels
eqn_idx%E = eqn_idx%mom%end + 1

if (igr) then
! IGR: volume fractions after energy (N-1 for N fluids; skipped when num_fluids=1)
eqn_idx%adv%beg = eqn_idx%E + 1
eqn_idx%adv%end = eqn_idx%E + num_fluids - 1
else
! WENO/MUSCL + Riemann tracks a total of (N) volume fractions for N fluids
eqn_idx%adv%beg = eqn_idx%E + 1
eqn_idx%adv%end = eqn_idx%E + num_fluids
end if
! Store all N volume fractions for N fluids. IGR originally used a compact N-1 layout,
! but the shared Riemann path expects the final volume fraction to be available.
eqn_idx%adv%beg = eqn_idx%E + 1
eqn_idx%adv%end = eqn_idx%E + num_fluids

sys_size = eqn_idx%adv%end

Expand Down
10 changes: 4 additions & 6 deletions src/common/m_variables_conversion.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,12 +820,10 @@ contains
! Obtaining the density, specific heat ratio function and the liquid stiffness function, respectively
call s_convert_to_mixture_variables(q_prim_vf, j, k, l, rho, gamma, pi_inf, qv, Re_K, G, fluid_pp(:)%G)

if (.not. igr .or. num_fluids > 1) then
! Transferring the advection equation(s) variable(s)
do i = eqn_idx%adv%beg, eqn_idx%adv%end
q_cons_vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
end do
end if
! Transferring the advection equation(s) variable(s)
do i = eqn_idx%adv%beg, eqn_idx%adv%end
q_cons_vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
end do

if (relativity) then
if (n == 0) then
Expand Down
24 changes: 9 additions & 15 deletions src/pre_process/m_assign_variables.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,9 @@ contains

call s_convert_to_mixture_variables(q_prim_vf, j, k, l, orig_rho, orig_gamma, orig_pi_inf, orig_qv)

if (.not. igr .or. num_fluids > 1) then
do i = eqn_idx%adv%beg, eqn_idx%adv%end
q_prim_vf(i)%sf(j, k, l) = patch_icpp(patch_id)%alpha(i - eqn_idx%E)
end do
end if
do i = eqn_idx%adv%beg, eqn_idx%adv%end
q_prim_vf(i)%sf(j, k, l) = patch_icpp(patch_id)%alpha(i - eqn_idx%E)
end do

if (mpp_lim .and. bubbles_euler) then
! adjust volume fractions, according to modeled gas void fraction
Expand Down Expand Up @@ -291,11 +289,9 @@ contains
end do
end if

if (.not. igr .or. num_fluids > 1) then
do i = eqn_idx%adv%beg, eqn_idx%adv%end
q_prim_vf(i)%sf(j, k, l) = patch_icpp(smooth_patch_id)%alpha(i - eqn_idx%E)
end do
end if
do i = eqn_idx%adv%beg, eqn_idx%adv%end
q_prim_vf(i)%sf(j, k, l) = patch_icpp(smooth_patch_id)%alpha(i - eqn_idx%E)
end do

if (mpp_lim .and. bubbles_euler) then
! adjust volume fractions, according to modeled gas void fraction
Expand Down Expand Up @@ -356,11 +352,9 @@ contains

q_prim_vf(eqn_idx%E)%sf(j, k, l) = (eta*patch_icpp(patch_id)%pres + (1._wp - eta)*orig_prim_vf(eqn_idx%E))

if (.not. igr .or. num_fluids > 1) then
do i = eqn_idx%adv%beg, eqn_idx%adv%end
q_prim_vf(i)%sf(j, k, l) = eta*patch_icpp(patch_id)%alpha(i - eqn_idx%E) + (1._wp - eta)*orig_prim_vf(i)
end do
end if
do i = eqn_idx%adv%beg, eqn_idx%adv%end
q_prim_vf(i)%sf(j, k, l) = eta*patch_icpp(patch_id)%alpha(i - eqn_idx%E) + (1._wp - eta)*orig_prim_vf(i)
end do

if (mhd) then
if (n == 0) then ! 1D: By, Bz
Expand Down
Loading
Loading