Skip to content

Commit f0f9beb

Browse files
committed
Fix bubble probe initialization and ICFL checks
- Add bubble_probe_ready flag to prevent ICFL calculation before bubble initialization - Relax ICFL checks (NaN/Infinity) for bubble simulations during startup - Fix 2D/3D probe output format string mismatches - Skip probe writing until bubble data is stable - Initialize bubble probe after first RK stage for bubble cases
1 parent e2ce07d commit f0f9beb

File tree

1,052 files changed

+27176
-47878
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,052 files changed

+27176
-47878
lines changed

src/simulation/m_data_output.fpp

Lines changed: 175 additions & 108 deletions
Large diffs are not rendered by default.

src/simulation/m_derived_variables.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ contains
169169

170170
call s_derive_center_of_mass(q_prim_ts2(2)%vf, c_mass)
171171

172-
call s_write_probe_files(t_step, q_cons_ts(1)%vf, accel_mag)
172+
call s_write_probe_files(t_step, q_cons_ts(1)%vf)
173173

174174
call s_write_com_files(t_step, c_mass)
175175
end if

src/simulation/m_start_up.fpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,8 +1052,9 @@ contains
10521052
dyn_pres, pi_inf, gamma, rho, qv, rhoYks, pres, T, pres_mag=pres_mag)
10531053

10541054
do i = 1, num_fluids
1055-
v_vf(i + intxb - 1)%sf(j, k, l) = v_vf(i + advxb - 1)%sf(j, k, l)*(gammas(i)*pres + pi_infs(i)) &
1056-
+ v_vf(i + contxb - 1)%sf(j, k, l)*qvs(i)
1055+
v_vf(i + internalEnergies_idx%beg - 1)%sf(j, k, l) = v_vf(i + adv_idx%beg - 1)%sf(j, k, l)* &
1056+
(fluid_pp(i)%gamma*pres + fluid_pp(i)%pi_inf) &
1057+
+ v_vf(i + cont_idx%beg - 1)%sf(j, k, l)*fluid_pp(i)%qv
10571058
end do
10581059

10591060
end do
@@ -1136,7 +1137,6 @@ contains
11361137
if (relax) call s_infinite_relaxation_k(q_cons_ts(1)%vf)
11371138

11381139
! Time-stepping loop controls
1139-
11401140
t_step = t_step + 1
11411141

11421142
end subroutine s_perform_time_step

src/simulation/m_time_steppers.fpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,11 @@ contains
531531
end if
532532
end if
533533

534+
! Mark bubble probes as ready after second ICFL calculation
535+
if (t_step == t_step_start + 1 .and. bubbles_euler) then
536+
call s_mark_bubble_probe_ready()
537+
end if
538+
534539
if (probe_wrt) then
535540
call s_time_step_cycling(t_step)
536541
end if
@@ -709,9 +714,9 @@ contains
709714
real(wp), dimension(num_fluids) :: alpha !< Cell-avg. volume fraction
710715
real(wp) :: gamma !< Cell-avg. sp. heat ratio
711716
real(wp) :: pi_inf !< Cell-avg. liquid stiffness function
712-
real(wp) :: qv !< Cell-avg. fluid reference energy
713717
real(wp) :: c !< Cell-avg. sound speed
714718
real(wp) :: H !< Cell-avg. enthalpy
719+
real(wp) :: qv !< Cell-avg. reference energy
715720
real(wp), dimension(2) :: Re !< Cell-avg. Reynolds numbers
716721
type(vector_field) :: gm_alpha_qp
717722

tests/0045D9F8/golden-metadata.txt

Lines changed: 43 additions & 73 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/0045D9F8/golden.txt

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)