Skip to content

Fix 6 low-risk pre-process bugs (batch) #1241

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
sbryngelson wants to merge 10 commits into
base: master
Choose a base branch
from
+17 −13
Open

Fix 6 low-risk pre-process bugs (batch) #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
541de4a
Fix moncon_cutoff declared as integer, truncating 1e-8 to 0
sbryngelson Feb 21, 2026
1db57b9
Fix grid stretching using wrong array bounds for y_cc and z_cc
sbryngelson Feb 21, 2026
e012f54
Remove duplicate R3bar accumulation line that doubles bubble perturba…
sbryngelson Feb 21, 2026
a8e0cc8
Fix y-velocity perturbation using already-modified x-velocity
sbryngelson Feb 21, 2026
08e6ce7
Fix hyper_cleaning psi initialization only covering k=0 plane
sbryngelson Feb 21, 2026
0daa425
Guard z_cc access in hyper_cleaning init for 2D case (p=0)
sbryngelson Feb 21, 2026
b63f9e2
Fix mixed-precision literals in hyper_cleaning psi initialization
sbryngelson Feb 21, 2026
cfed440
Fix IB patch vel/angular_vel/angles broadcast inside wrong loop
sbryngelson Feb 21, 2026
ea6715d
Simplify hyper_cleaning init and use size() for IB broadcast
sbryngelson Feb 23, 2026
9276e0b
Guard y_cc and z_cc access in hyper_cleaning init for 1D/2D safety
sbryngelson Feb 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: 1 addition & 1 deletion src/common/m_constants.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module m_constants
! Interface Compression
real(wp), parameter :: dflt_ic_eps = 1e-4_wp !< Ensure compression is only applied to surface cells in THINC
real(wp), parameter :: dflt_ic_beta = 1.6_wp !< Sharpness parameter's default value used in THINC
integer, parameter :: moncon_cutoff = 1e-8_wp !< Monotonicity constraint's limiter to prevent extremas in THINC
real(wp), parameter :: moncon_cutoff = 1e-8_wp !< Monotonicity constraint's limiter to prevent extremas in THINC

! Chemistry
real(wp), parameter :: dflt_T_guess = 1200._wp ! Default guess for temperature (when a previous value is not available)
Expand Down
1 change: 0 additions & 1 deletion src/pre_process/m_assign_variables.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ contains
if (qbmm) then
do i = 1, nb
R3bar = R3bar + weight(i)*0.5_wp*(q_prim_vf(bubxb + 1 + (i - 1)*nmom)%sf(j, k, l))**3._wp
R3bar = R3bar + weight(i)*0.5_wp*(q_prim_vf(bubxb + 1 + (i - 1)*nmom)%sf(j, k, l))**3._wp
end do
else
do i = 1, nb
Expand Down
4 changes: 2 additions & 2 deletions src/pre_process/m_grid.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ impure subroutine s_generate_serial_grid
end do

y_cb = y_cb*length
y_cc(0:m) = (y_cb(0:n) + y_cb(-1:n - 1))/2._wp
y_cc(0:n) = (y_cb(0:n) + y_cb(-1:n - 1))/2._wp

dy = minval(y_cb(0:n) - y_cb(-1:n - 1))

Expand Down Expand Up @@ -168,7 +168,7 @@ impure subroutine s_generate_serial_grid
end do

z_cb = z_cb*length
z_cc(0:m) = (z_cb(0:p) + z_cb(-1:p - 1))/2._wp
z_cc(0:p) = (z_cb(0:p) + z_cb(-1:p - 1))/2._wp

dz = minval(z_cb(0:p) - z_cb(-1:p - 1))

Expand Down
7 changes: 3 additions & 4 deletions src/pre_process/m_mpi_proxy.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ contains
call MPI_BCAST(patch_bc(i)%${VAR}$, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
#:endfor

#:for VAR in ['vel', 'angular_vel', 'angles']
call MPI_BCAST(patch_ib(i)%${VAR}$, 3, mpi_p, 0, MPI_COMM_WORLD, ierr)
#:endfor

call MPI_BCAST(patch_bc(i)%radius, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)

#:for VAR in ['centroid', 'length']
Expand Down Expand Up @@ -121,6 +117,9 @@ contains
call MPI_BCAST(patch_icpp(i)%Y, size(patch_icpp(i)%Y), mpi_p, 0, MPI_COMM_WORLD, ierr)
end if
! Broadcast IB variables
#:for VAR in ['vel', 'angular_vel', 'angles']
call MPI_BCAST(patch_ib(i)%${VAR}$, size(patch_ib(i)%${VAR}$), mpi_p, 0, MPI_COMM_WORLD, ierr)
#:endfor
call MPI_BCAST(patch_ib(i)%geometry, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(patch_ib(i)%model_filepath, len(patch_ib(i)%model_filepath), MPI_CHARACTER, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(patch_ib(i)%model_threshold, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
Expand Down
2 changes: 1 addition & 1 deletion src/pre_process/m_perturbation.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ contains
perturb_alpha = q_prim_vf(E_idx + perturb_flow_fluid)%sf(i, j, k)
call random_number(rand_real)
rand_real = rand_real*perturb_flow_mag
q_prim_vf(mom_idx%beg)%sf(i, j, k) = (1._wp + rand_real)*q_prim_vf(mom_idx%beg)%sf(i, j, k)
q_prim_vf(mom_idx%end)%sf(i, j, k) = rand_real*q_prim_vf(mom_idx%beg)%sf(i, j, k)
q_prim_vf(mom_idx%beg)%sf(i, j, k) = (1._wp + rand_real)*q_prim_vf(mom_idx%beg)%sf(i, j, k)
if (bubbles_euler) then
q_prim_vf(alf_idx)%sf(i, j, k) = (1._wp + rand_real)*q_prim_vf(alf_idx)%sf(i, j, k)
end if
Expand Down
14 changes: 10 additions & 4 deletions src/pre_process/m_start_up.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,8 @@ contains

real(wp), intent(inout) :: start, finish

integer :: j, k
integer :: j, k, l
real(wp) :: r2

! Setting up the grid and the initial condition. If the grid is read in from
! preexisting grid data files, it is checked for consistency. If the grid is
Expand All @@ -787,10 +788,15 @@ contains

! hard-coded psi
if (hyper_cleaning) then
do j = 0, m
do l = 0, p
do k = 0, n
q_cons_vf(psi_idx)%sf(j, k, 0) = 1d-2*exp(-(x_cc(j)**2 + y_cc(k)**2)/(2.0*0.05**2))
q_prim_vf(psi_idx)%sf(j, k, 0) = q_cons_vf(psi_idx)%sf(j, k, 0)
do j = 0, m
r2 = x_cc(j)**2
if (n > 0) r2 = r2 + y_cc(k)**2
if (p > 0) r2 = r2 + z_cc(l)**2
q_cons_vf(psi_idx)%sf(j, k, l) = 1.0e-2_wp*exp(-r2/(2.0_wp*0.05_wp**2))
q_prim_vf(psi_idx)%sf(j, k, l) = q_cons_vf(psi_idx)%sf(j, k, l)
end do
end do
end do
end if
Expand Down
Loading