Skip to content

Fix #797 #813

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

Closed
wants to merge 24 commits into from
Closed

Fix #797 #813

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
687659c
Removing stop commands
Apr 1, 2025
102bee3
Remove stop commands from GPU regions.
Apr 1, 2025
fd5eb3b
Fix frontier tests: removing changes from m_checker.fpp
Apr 3, 2025
4a398c1
Fix frontier tests: removing changes from m_start_up.fpp
Apr 3, 2025
9cc0626
Fix frontier tests: removing changes from m_bubbles_EL_kernels.fpp
Apr 3, 2025
00fc3e9
Fix frontier tests: removing changes in GPU regions from EL.fpp and E…
Apr 3, 2025
4330e06
Fixed frontier attempt 1
Apr 3, 2025
d6b00ec
Merge branch 'master' into master
sbryngelson Apr 4, 2025
1874569
Fixed frontier attempt 2
Apr 4, 2025
ce43b82
Fixed frontier attempt 3
Apr 4, 2025
35f71e2
Fixed frontier attempt 4
Apr 4, 2025
8fbecff
Isolating bug 1
Apr 4, 2025
0771c04
Isolating bug 2
Apr 4, 2025
20809e4
Isolating bug 3
Apr 4, 2025
e9a47c3
Isolating bug 4
Apr 5, 2025
b026936
Fixing isolated bug 1
Apr 5, 2025
654bc3c
Fixing isolated bug 2
Apr 5, 2025
e2c7f7c
p_inf from subroutine to function
Apr 6, 2025
665321b
printing statements in rkck
Apr 7, 2025
d1a9050
printing statements in smear_voidfraction
Apr 7, 2025
6736d6c
re-defining s_gaussian kernel
Apr 7, 2025
3773d10
removing bc_xyz from gaussian
Apr 7, 2025
d88de9f
printing in s_gaussian
Apr 10, 2025
a7c0930
remove all stops in kernels, do not relocate
Apr 11, 2025
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
33 changes: 14 additions & 19 deletions src/simulation/m_bubbles_EL.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
end do
close (94)
else
stop "if you include lagrange bubbles, you have to initialize them in input/lag_bubbles.dat"
stop "Lagrange bubbles: you have to initialize them in input/lag_bubbles.dat"

Check warning on line 254 in src/simulation/m_bubbles_EL.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_bubbles_EL.fpp#L254 

Added line #L254 was not covered by tests
end if
else
if (proc_rank == 0) print *, 'Restarting lagrange bubbles at save_count: ', save_count
Expand Down Expand Up @@ -338,6 +338,16 @@
cell = -buff_size
call s_locate_cell(mtn_pos(bub_id, 1:3, 1), cell, mtn_s(bub_id, 1:3, 1))

! Check if the bubble is located in the ghost cell of a symmetric boundary
if (bc_x%beg == -2 .and. cell(1) < 0) stop "Lagrange bubble is in the ghost cells of a symmetric boundary (bc_x%beg)."
if (bc_x%end == -2 .and. cell(1) > m) stop "Lagrange bubble is in the ghost cells of a symmetric boundary (bc_x%end)."
if (bc_y%beg == -2 .and. cell(2) < 0) stop "Lagrange bubble is in the ghost cells of a symmetric boundary (bc_y%beg)."
if (bc_y%end == -2 .and. cell(2) > n) stop "Lagrange bubble is in the ghost cells of a symmetric boundary (bc_y%end)."
if (p > 0) then
if (bc_z%beg == -2 .and. cell(3) < 0) stop "Lagrange bubble is in the ghost cells of a symmetric boundary (bc_z%beg)."
if (bc_z%end == -2 .and. cell(3) > p) stop "Lagrange bubble is in the ghost cells of a symmetric boundary (bc_z%end)."
end if

! If particle is in the ghost cells, find the closest non-ghost cell
cell(1) = min(max(cell(1), 0), m)
cell(2) = min(max(cell(2), 0), n)
Expand Down Expand Up @@ -366,17 +376,15 @@
gas_mv(bub_id, 1) = pv*volparticle*(1._wp/(R_v*Tw))*(massflag) ! vapermass
gas_mg(bub_id) = (gas_p(bub_id, 1) - pv*(massflag))*volparticle*(1._wp/(R_n*Tw)) ! gasmass
if (gas_mg(bub_id) <= 0._wp) then
stop 'the initial mass of gas inside the bubble is negative. Check your initial conditions'
stop "The initial mass of gas inside the bubble is negative. Check your initial conditions."

Check warning on line 379 in src/simulation/m_bubbles_EL.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_bubbles_EL.fpp#L379 

Added line #L379 was not covered by tests
end if
totalmass = gas_mg(bub_id) + gas_mv(bub_id, 1) ! totalmass

! Bubble natural frequency
concvap = gas_mv(bub_id, 1)/(gas_mv(bub_id, 1) + gas_mg(bub_id))
omegaN = (3._wp*(gas_p(bub_id, 1) - pv*(massflag)) + 4._wp*(1._wp/Web)/bub_R0(bub_id))/rhol
if (pv*(massflag) > gas_p(bub_id, 1)) then
print *, 'Not allowed: bubble initially located in a region with pressure below the vapor pressure'
print *, 'location:', mtn_pos(bub_id, 1:3, 1)
stop
stop "Lagrange bubble initially located in a region with pressure below the vapor pressure."

Check warning on line 387 in src/simulation/m_bubbles_EL.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_bubbles_EL.fpp#L387 

Added line #L387 was not covered by tests
end if
omegaN = sqrt(omegaN/bub_R0(bub_id)**2._wp)

Expand Down Expand Up @@ -906,11 +914,7 @@
! Bubble dynamic closure from Maeda and Colonius (2018)

! Range of cells included in Omega
if (lag_params%smooth_type == 1) then
mapCells_pinf = mapCells
else
stop "lag_params%cluster_type: 2 requires lag_params%smooth_type: 1."
end if
mapCells_pinf = mapCells

! Include the cell that contains the bubble (mapCells+1+mapCells)
smearGrid = mapCells_pinf - (-mapCells_pinf) + 1
Expand Down Expand Up @@ -987,9 +991,6 @@
f_pinfl = charpres2/charvol2
vol = charvol
dc = (3._wp*abs(vol)/(4._wp*pi))**(1._wp/3._wp)
else

stop "Check cluterflag. Exiting."

end if

Expand Down Expand Up @@ -1038,7 +1039,6 @@
mtn_vel(k, 1:3, 1) = mtn_vel(k, 1:3, 1) + dt*mtn_dveldt(k, 1:3, 1)
gas_p(k, 1) = gas_p(k, 1) + dt*gas_dpdt(k, 1)
gas_mv(k, 1) = gas_mv(k, 1) + dt*gas_dmvdt(k, 1)
if (intfc_rad(k, 1) <= 0._wp) stop "Negative bubble radius encountered, please reduce dt"
end do

call s_transfer_data_to_tmp()
Expand All @@ -1061,7 +1061,6 @@
mtn_vel(k, 1:3, 2) = mtn_vel(k, 1:3, 1) + dt*mtn_dveldt(k, 1:3, 1)
gas_p(k, 2) = gas_p(k, 1) + dt*gas_dpdt(k, 1)
gas_mv(k, 2) = gas_mv(k, 1) + dt*gas_dmvdt(k, 1)
if (intfc_rad(k, 2) <= 0._wp) stop "Negative bubble radius encountered, please reduce dt"
end do

elseif (stage == 2) then
Expand All @@ -1074,7 +1073,6 @@
mtn_vel(k, 1:3, 1) = mtn_vel(k, 1:3, 1) + dt*(mtn_dveldt(k, 1:3, 1) + mtn_dveldt(k, 1:3, 2))/2._wp
gas_p(k, 1) = gas_p(k, 1) + dt*(gas_dpdt(k, 1) + gas_dpdt(k, 2))/2._wp
gas_mv(k, 1) = gas_mv(k, 1) + dt*(gas_dmvdt(k, 1) + gas_dmvdt(k, 2))/2._wp
if (intfc_rad(k, 1) <= 0._wp) stop "Negative bubble radius encountered, please reduce dt"
end do

call s_transfer_data_to_tmp()
Expand All @@ -1099,7 +1097,6 @@
mtn_vel(k, 1:3, 2) = mtn_vel(k, 1:3, 1) + dt*mtn_dveldt(k, 1:3, 1)
gas_p(k, 2) = gas_p(k, 1) + dt*gas_dpdt(k, 1)
gas_mv(k, 2) = gas_mv(k, 1) + dt*gas_dmvdt(k, 1)
if (intfc_rad(k, 2) <= 0._wp) stop "Negative bubble radius encountered, please reduce dt"
end do

elseif (stage == 2) then
Expand All @@ -1112,7 +1109,6 @@
mtn_vel(k, 1:3, 2) = mtn_vel(k, 1:3, 1) + dt*(mtn_dveldt(k, 1:3, 1) + mtn_dveldt(k, 1:3, 2))/4._wp
gas_p(k, 2) = gas_p(k, 1) + dt*(gas_dpdt(k, 1) + gas_dpdt(k, 2))/4._wp
gas_mv(k, 2) = gas_mv(k, 1) + dt*(gas_dmvdt(k, 1) + gas_dmvdt(k, 2))/4._wp
if (intfc_rad(k, 2) <= 0._wp) stop "Negative bubble radius encountered, please reduce dt"
end do
elseif (stage == 3) then
!$acc parallel loop gang vector default(present) private(k)
Expand All @@ -1124,7 +1120,6 @@
mtn_vel(k, 1:3, 1) = mtn_vel(k, 1:3, 1) + (2._wp/3._wp)*dt*(mtn_dveldt(k, 1:3, 1)/4._wp + mtn_dveldt(k, 1:3, 2)/4._wp + mtn_dveldt(k, 1:3, 3))
gas_p(k, 1) = gas_p(k, 1) + (2._wp/3._wp)*dt*(gas_dpdt(k, 1)/4._wp + gas_dpdt(k, 2)/4._wp + gas_dpdt(k, 3))
gas_mv(k, 1) = gas_mv(k, 1) + (2._wp/3._wp)*dt*(gas_dmvdt(k, 1)/4._wp + gas_dmvdt(k, 2)/4._wp + gas_dmvdt(k, 3))
if (intfc_rad(k, 1) <= 0._wp) stop "Negative bubble radius encountered, please reduce dt"
end do

call s_transfer_data_to_tmp()
Expand Down
36 changes: 6 additions & 30 deletions src/simulation/m_bubbles_EL_kernels.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,51 +317,27 @@

! x-dir
if (bc_x%beg == -2 .and. (cell(1) <= mapCells - 1)) then
if (cell(1) >= 0) then
cellaux(1) = abs(cellaux(1)) - 1
else
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_x%beg)."
end if
cellaux(1) = abs(cellaux(1)) - 1

Check warning on line 320 in src/simulation/m_bubbles_EL_kernels.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_bubbles_EL_kernels.fpp#L320 

Added line #L320 was not covered by tests
end if
if (bc_x%end == -2 .and. (cell(1) >= m + 1 - mapCells)) then
if (cell(1) <= m) then
cellaux(1) = cellaux(1) - (2*(cellaux(1) - m) - 1)
else
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_x%end)."
end if
cellaux(1) = cellaux(1) - (2*(cellaux(1) - m) - 1)

Check warning on line 323 in src/simulation/m_bubbles_EL_kernels.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_bubbles_EL_kernels.fpp#L323 

Added line #L323 was not covered by tests
end if

!y-dir
if (bc_y%beg == -2 .and. (cell(2) <= mapCells - 1)) then
if (cell(2) >= 0) then
cellaux(2) = abs(cellaux(2)) - 1
else
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_y%beg)."
end if
cellaux(2) = abs(cellaux(2)) - 1

Check warning on line 328 in src/simulation/m_bubbles_EL_kernels.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_bubbles_EL_kernels.fpp#L328 

Added line #L328 was not covered by tests
end if
if (bc_y%end == -2 .and. (cell(2) >= n + 1 - mapCells)) then
if (cell(2) <= n) then
cellaux(2) = cellaux(2) - (2*(cellaux(2) - n) - 1)
else
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_y%end)."
end if
cellaux(2) = cellaux(2) - (2*(cellaux(2) - n) - 1)

Check warning on line 331 in src/simulation/m_bubbles_EL_kernels.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_bubbles_EL_kernels.fpp#L331 

Added line #L331 was not covered by tests
end if

if (p > 0) then
!z-dir
if (bc_z%beg == -2 .and. (cell(3) <= mapCells - 1)) then
if (cell(3) >= 0) then
cellaux(3) = abs(cellaux(3)) - 1
else
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_z%beg)."
end if
cellaux(3) = abs(cellaux(3)) - 1

Check warning on line 337 in src/simulation/m_bubbles_EL_kernels.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_bubbles_EL_kernels.fpp#L337 

Added line #L337 was not covered by tests
end if
if (bc_z%end == -2 .and. (cell(3) >= p + 1 - mapCells)) then
if (cell(3) <= p) then
cellaux(3) = cellaux(3) - (2*(cellaux(3) - p) - 1)
else
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_z%end)."
end if
cellaux(3) = cellaux(3) - (2*(cellaux(3) - p) - 1)

Check warning on line 340 in src/simulation/m_bubbles_EL_kernels.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_bubbles_EL_kernels.fpp#L340 

Added line #L340 was not covered by tests
end if
end if

Expand Down
2 changes: 2 additions & 0 deletions src/simulation/m_checker.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ contains
@:PROHIBIT(bubbles_lagrange .and. file_per_process, "file_per_process must be false for bubbles_lagrange")
@:PROHIBIT(bubbles_lagrange .and. n==0, "bubbles_lagrange accepts 2D and 3D simulations only")
@:PROHIBIT(bubbles_lagrange .and. model_eqns==3, "The 6-equation flow model does not support bubbles_lagrange")
@:PROHIBIT(bubbles_lagrange .and. lag_params%cluster_type<=0, "cluster_type must be specified")
@:PROHIBIT(bubbles_lagrange .and. lag_params%cluster_type>=2 .and. lag_params%smooth_type/=1, "cluster_type=2 requires smooth_type=1")
end subroutine s_check_inputs_bubbles_lagrange

!> Checks miscellaneous constraints,
Expand Down
10 changes: 9 additions & 1 deletion src/simulation/m_start_up.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,9 +1395,17 @@
end if

if (bubbles_lagrange) then
!$acc update host(intfc_rad)
do i = 1, nBubs
if (ieee_is_nan(intfc_rad(i, 1)) .or. intfc_rad(i, 1) <= 0._wp) then
print *, "Bubble radius is negative or NaN", proc_rank, t_step, i, intfc_rad(i, 1)
error stop "Bubble radius is negative or NaN, please reduce dt"

Check warning on line 1402 in src/simulation/m_start_up.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_start_up.fpp#L1401-L1402 

Added lines #L1401 - L1402 were not covered by tests
end if
end do

!$acc update host(q_beta%vf(1)%sf)
call s_write_data_files(q_cons_ts(1)%vf, q_T_sf, q_prim_vf, save_count, q_beta%vf(1))
!$acc update host(Rmax_stats, Rmin_stats, gas_p, gas_mv, intfc_rad, intfc_vel)
!$acc update host(Rmax_stats, Rmin_stats, gas_p, gas_mv, intfc_vel)
call s_write_restart_lag_bubbles(save_count) !parallel
if (lag_params%write_bubbles_stats) call s_write_lag_bubble_stats()
else
Expand Down
Loading