Skip to content

Fix WP_MOK hardcoded to 8 bytes, use storage_size for portability #1187

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

Draft
sbryngelson wants to merge 9 commits into
base: master
Choose a base branch
from
+13 −13
Draft

Fix WP_MOK hardcoded to 8 bytes, use storage_size for portability #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e0fbf01
Fix WP_MOK hardcoded to 8 bytes, use storage_size for precision porta…
sbryngelson Feb 21, 2026
b966fee
Extend storage_size fix to simulation and pre_process MPI-IO
sbryngelson Feb 21, 2026
50e9df4
Fix IB marker stride using WP size instead of integer size
sbryngelson Feb 24, 2026
b06ed51
Fix WP_MOK to use stp instead of wp for main field data I/O
sbryngelson Feb 24, 2026
f8dee0f
Fix typo in m_start_up.fpp: equilirium -> equilibrium
sbryngelson Feb 26, 2026
42bade2
Fix wp -> stp in pre_process I/O and remove dead Lustre block
sbryngelson Feb 26, 2026
9b5fe23
Restore file_per_process Lustre sequential-read path
sbryngelson Feb 26, 2026
b012f15
Fix IB data WP_MOK to use stp instead of default integer
sbryngelson Feb 26, 2026
43bbd2b
Fix dq_prim_dy_vf -> dq_prim_dz_vf in 2D cylindrical viscous boundary
sbryngelson Mar 1, 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
6 changes: 3 additions & 3 deletions src/post_process/m_data_input.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ impure subroutine s_setup_mpi_io_params(data_size, m_MOK, n_MOK, p_MOK, WP_MOK,
m_MOK = int(m_glb + 1, MPI_OFFSET_KIND)
n_MOK = int(n_glb + 1, MPI_OFFSET_KIND)
p_MOK = int(p_glb + 1, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
str_MOK = int(name_len, MPI_OFFSET_KIND)
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
Expand Down Expand Up @@ -177,7 +177,7 @@ impure subroutine s_read_ib_data_files(file_loc_base, t_step)
n_MOK = int(n_glb + 1, MPI_OFFSET_KIND)
p_MOK = int(p_glb + 1, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
save_index = t_step/t_step_save ! get the number of saves done to this point

data_size = (m + 1)*(n + 1)*(p + 1)
Expand Down Expand Up @@ -521,7 +521,7 @@ impure subroutine s_read_parallel_conservative_data(t_step, m_MOK, n_MOK, p_MOK,
m_MOK = int(m_glb + 1, MPI_OFFSET_KIND)
n_MOK = int(n_glb + 1, MPI_OFFSET_KIND)
p_MOK = int(p_glb + 1, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
str_MOK = int(name_len, MPI_OFFSET_KIND)
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
Expand Down
4 changes: 2 additions & 2 deletions src/pre_process/m_data_output.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ contains
m_MOK = int(m_glb_save, MPI_OFFSET_KIND)
n_MOK = int(n_glb_save, MPI_OFFSET_KIND)
p_MOK = int(p_glb_save, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
str_MOK = int(name_len, MPI_OFFSET_KIND)
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
Expand Down Expand Up @@ -617,7 +617,7 @@ contains
m_MOK = int(m_glb + 1, MPI_OFFSET_KIND)
n_MOK = int(n_glb + 1, MPI_OFFSET_KIND)
p_MOK = int(p_glb + 1, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
str_MOK = int(name_len, MPI_OFFSET_KIND)
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
Expand Down
4 changes: 2 additions & 2 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 @@ -660,7 +660,7 @@ contains
m_MOK = int(m_glb + 1, MPI_OFFSET_KIND)
n_MOK = int(n_glb + 1, MPI_OFFSET_KIND)
p_MOK = int(p_glb + 1, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
str_MOK = int(name_len, MPI_OFFSET_KIND)
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
Expand Down Expand Up @@ -798,7 +798,7 @@ contains
if (relax) then
if (proc_rank == 0) then
print *, 'initial condition might have been altered due to enforcement of &
& pTg-equilirium (relax = "T" activated)'
& pTg-equilibrium (relax = "T" activated)'
end if

call s_infinite_relaxation_k(q_cons_vf)
Expand Down
6 changes: 3 additions & 3 deletions src/simulation/m_data_output.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ contains
m_MOK = int(m_glb_save + 1, MPI_OFFSET_KIND)
n_MOK = int(n_glb_save + 1, MPI_OFFSET_KIND)
p_MOK = int(p_glb_save + 1, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
str_MOK = int(name_len, MPI_OFFSET_KIND)
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
Expand Down Expand Up @@ -976,7 +976,7 @@ contains
m_MOK = int(m_glb + 1, MPI_OFFSET_KIND)
n_MOK = int(n_glb + 1, MPI_OFFSET_KIND)
p_MOK = int(p_glb + 1, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
str_MOK = int(name_len, MPI_OFFSET_KIND)
NVARS_MOK = int(alt_sys, MPI_OFFSET_KIND)
Expand Down Expand Up @@ -1100,7 +1100,7 @@ contains
m_MOK = int(m_glb + 1, MPI_OFFSET_KIND)
n_MOK = int(n_glb + 1, MPI_OFFSET_KIND)
p_MOK = int(p_glb + 1, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)

write (file_loc, '(A)') 'ib.dat'
Expand Down
2 changes: 1 addition & 1 deletion src/simulation/m_rhs.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,7 +1653,7 @@ contains
call s_compute_viscous_stress_cylindrical_boundary(q_prim_vf, &
dq_prim_dx_vf(mom_idx%beg:mom_idx%end), &
dq_prim_dy_vf(mom_idx%beg:mom_idx%end), &
dq_prim_dy_vf(mom_idx%beg:mom_idx%end), &
dq_prim_dz_vf(mom_idx%beg:mom_idx%end), &
tau_Re_vf, &
idwbuff(1), idwbuff(2), idwbuff(3))
end if
Expand Down
4 changes: 2 additions & 2 deletions src/simulation/m_start_up.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ contains
m_MOK = int(m_glb_read + 1, MPI_OFFSET_KIND)
n_MOK = int(m_glb_read + 1, MPI_OFFSET_KIND)
p_MOK = int(m_glb_read + 1, MPI_OFFSET_KIND)
WP_MOK = int(4._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
str_MOK = int(name_len, MPI_OFFSET_KIND)
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
Expand Down Expand Up @@ -652,7 +652,7 @@ contains
m_MOK = int(m_glb + 1, MPI_OFFSET_KIND)
n_MOK = int(n_glb + 1, MPI_OFFSET_KIND)
p_MOK = int(p_glb + 1, MPI_OFFSET_KIND)
WP_MOK = int(8._wp, MPI_OFFSET_KIND)
WP_MOK = int(storage_size(0._stp)/8, MPI_OFFSET_KIND)
MOK = int(1._wp, MPI_OFFSET_KIND)
str_MOK = int(name_len, MPI_OFFSET_KIND)
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
Expand Down
Loading