From 2cd0baeb2592c55b737ccc9e21a18dae7f597532 Mon Sep 17 00:00:00 2001 From: Brian Ok Date: Mon, 19 May 2025 11:41:42 -0400 Subject: [PATCH 1/2] fix file descriptors with fortran 2023 --- src/post_process/m_start_up.f90 | 6 +++--- src/pre_process/m_start_up.fpp | 2 +- src/simulation/m_start_up.fpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/post_process/m_start_up.f90 b/src/post_process/m_start_up.f90 index 2da0021082..e9b71b1e26 100644 --- a/src/post_process/m_start_up.f90 +++ b/src/post_process/m_start_up.f90 @@ -156,11 +156,11 @@ subroutine s_perform_time_step(t_step) integer, intent(inout) :: t_step if (proc_rank == 0) then if (cfl_dt) then - print '(" ["I3"%] Saving "I8" of "I0"")', & + print '(" [", I3, "%] Saving ", I8, " of ", I0, "")', & int(ceiling(100._wp*(real(t_step - n_start)/(n_save)))), & t_step, n_save else - print '(" ["I3"%] Saving "I8" of "I0" @ t_step = "I0"")', & + print '(" [", I3, "%] Saving ", I8, " of ", I0, " @ t_step = ", I0, "")', & int(ceiling(100._wp*(real(t_step - t_step_start)/(t_step_stop - t_step_start + 1)))), & (t_step - t_step_start)/t_step_save + 1, & (t_step_stop - t_step_start)/t_step_save + 1, & @@ -708,7 +708,7 @@ subroutine s_initialize_mpi_domain call s_read_input_file() call s_check_input_file() - print '(" Post-processing a "I0"x"I0"x"I0" case on "I0" rank(s)")', m, n, p, num_procs + print '(" Post-processing a ", I0, "x", I0, "x", I0, " case on ", I0, " rank(s)")', m, n, p, num_procs end if ! Broadcasting the user inputs to all of the processors and performing the diff --git a/src/pre_process/m_start_up.fpp b/src/pre_process/m_start_up.fpp index 25b42eab52..d48a0929e3 100644 --- a/src/pre_process/m_start_up.fpp +++ b/src/pre_process/m_start_up.fpp @@ -912,7 +912,7 @@ contains call s_read_input_file() call s_check_input_file() - print '(" Pre-processing a "I0"x"I0"x"I0" case on "I0" rank(s)")', m, n, p, num_procs + print '(" Pre-processing a ", I0, "x", I0, "x", I0, " case on ", I0, " rank(s)")', m, n, p, num_procs end if ! Broadcasting the user inputs to all of the processors and performing the diff --git a/src/simulation/m_start_up.fpp b/src/simulation/m_start_up.fpp index 701bcdd396..2ce314b08f 100644 --- a/src/simulation/m_start_up.fpp +++ b/src/simulation/m_start_up.fpp @@ -1287,7 +1287,7 @@ contains end if else if (proc_rank == 0 .and. mod(t_step - t_step_start, t_step_print) == 0) then - print '(" ["I3"%] Time step "I8" of "I0" @ t_step = "I0"")', & + print '(" [", I3, "%] Time step ", I8, " of ", I0, " @ t_step = ", I0, "")', & int(ceiling(100._wp*(real(t_step - t_step_start)/(t_step_stop - t_step_start + 1)))), & t_step - t_step_start + 1, & t_step_stop - t_step_start + 1, & From 0f4c540e18b811115a3ae2b0aaee085924697b83 Mon Sep 17 00:00:00 2001 From: Brian Ok Date: Mon, 19 May 2025 19:43:32 -0400 Subject: [PATCH 2/2] test suite passes --- src/simulation/m_start_up.fpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simulation/m_start_up.fpp b/src/simulation/m_start_up.fpp index 2ce314b08f..a5120c76a1 100644 --- a/src/simulation/m_start_up.fpp +++ b/src/simulation/m_start_up.fpp @@ -1279,7 +1279,7 @@ contains if (cfl_dt) then if (proc_rank == 0 .and. mod(t_step - t_step_start, t_step_print) == 0) then - print '(" ["I3"%] Time "ES16.6" dt = "ES16.6" @ Time Step = "I8"")', & + print '(" [", I3, "%] Time ", ES16.6, " dt = ", ES16.6, " @ Time Step = ", I8, "")', & int(ceiling(100._wp*(mytime/t_stop))), & mytime, & dt, &