Skip to content

post_process: extract shared Lagrangian-bubble restart-header read (and name the 5x disp offset) #1525

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
lvupupui wants to merge 1 commit into from
+53 −60
Closed

post_process: extract shared Lagrangian-bubble restart-header read (and name the 5x disp offset) #1525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
113 changes: 53 additions & 60 deletions src/post_process/m_data_output.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,55 @@ contains

end subroutine s_write_variable_to_formatted_database_file

!> Read the shared Lagrangian-bubble restart header: file metadata and per-proc bubble counts.
!> Extracted from duplicate blocks in s_write_lag_bubbles_results_to_text and
!> s_write_lag_bubbles_to_formatted_database_file.
impure subroutine s_read_lag_restart_header(file_loc, file_tot_part, file_time, file_dt, &
file_num_procs, proc_bubble_counts)

character(len=*), intent(in) :: file_loc
integer, intent(out) :: file_tot_part
real(wp), intent(out) :: file_time, file_dt
integer, intent(out) :: file_num_procs
integer, dimension(:), allocatable, intent(out) :: proc_bubble_counts
integer(KIND=MPI_OFFSET_KIND) :: disp
integer, dimension(MPI_STATUS_SIZE) :: status
integer :: ifile, ierr

if (proc_rank == 0) then
call MPI_FILE_OPEN(MPI_COMM_SELF, file_loc, MPI_MODE_RDONLY, mpi_info_int, ifile, ierr)

call MPI_FILE_READ(ifile, file_tot_part, 1, MPI_INTEGER, status, ierr)
call MPI_FILE_READ(ifile, file_time, 1, mpi_p, status, ierr)
call MPI_FILE_READ(ifile, file_dt, 1, mpi_p, status, ierr)
call MPI_FILE_READ(ifile, file_num_procs, 1, MPI_INTEGER, status, ierr)

call MPI_FILE_CLOSE(ifile, ierr)
end if

call MPI_BCAST(file_tot_part, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(file_time, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(file_dt, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(file_num_procs, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)

allocate (proc_bubble_counts(file_num_procs))

if (proc_rank == 0) then
call MPI_FILE_OPEN(MPI_COMM_SELF, file_loc, MPI_MODE_RDONLY, mpi_info_int, ifile, ierr)

! Skip to processor counts position
disp = int(sizeof(file_tot_part) + 2*sizeof(file_time) + sizeof(file_num_procs), MPI_OFFSET_KIND)
call MPI_FILE_SEEK(ifile, disp, MPI_SEEK_SET, ierr)

call MPI_FILE_READ(ifile, proc_bubble_counts, file_num_procs, MPI_INTEGER, status, ierr)

call MPI_FILE_CLOSE(ifile, ierr)
end if

call MPI_BCAST(proc_bubble_counts, file_num_procs, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)

end subroutine s_read_lag_restart_header

!> Write the post-processed results in the folder 'lag_bubbles_data'
impure subroutine s_write_lag_bubbles_results_to_text(t_step)

Expand Down Expand Up @@ -744,38 +793,10 @@ contains

if (.not. parallel_io) return

if (proc_rank == 0) then
call MPI_FILE_OPEN(MPI_COMM_SELF, file_loc, MPI_MODE_RDONLY, mpi_info_int, ifile, ierr)

call MPI_FILE_READ(ifile, file_tot_part, 1, MPI_INTEGER, status, ierr)
call MPI_FILE_READ(ifile, file_time, 1, mpi_p, status, ierr)
call MPI_FILE_READ(ifile, file_dt, 1, mpi_p, status, ierr)
call MPI_FILE_READ(ifile, file_num_procs, 1, MPI_INTEGER, status, ierr)

call MPI_FILE_CLOSE(ifile, ierr)
end if

call MPI_BCAST(file_tot_part, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(file_time, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(file_dt, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(file_num_procs, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
call s_read_lag_restart_header(file_loc, file_tot_part, file_time, file_dt, &
file_num_procs, proc_bubble_counts)
time_real = file_time

allocate (proc_bubble_counts(file_num_procs))

if (proc_rank == 0) then
call MPI_FILE_OPEN(MPI_COMM_SELF, file_loc, MPI_MODE_RDONLY, mpi_info_int, ifile, ierr)

! Skip to processor counts position
disp = int(sizeof(file_tot_part) + 2*sizeof(file_time) + sizeof(file_num_procs), MPI_OFFSET_KIND)
call MPI_FILE_SEEK(ifile, disp, MPI_SEEK_SET, ierr)
call MPI_FILE_READ(ifile, proc_bubble_counts, file_num_procs, MPI_INTEGER, status, ierr)

call MPI_FILE_CLOSE(ifile, ierr)
end if

call MPI_BCAST(proc_bubble_counts, file_num_procs, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)

gsizes(1) = file_tot_part
gsizes(2) = lag_io_vars
lsizes(1) = file_tot_part
Expand Down Expand Up @@ -903,38 +924,10 @@ contains

if (.not. parallel_io) return

if (proc_rank == 0) then
call MPI_FILE_OPEN(MPI_COMM_SELF, file_loc, MPI_MODE_RDONLY, mpi_info_int, ifile, ierr)

call MPI_FILE_READ(ifile, file_tot_part, 1, MPI_INTEGER, status, ierr)
call MPI_FILE_READ(ifile, file_time, 1, mpi_p, status, ierr)
call MPI_FILE_READ(ifile, file_dt, 1, mpi_p, status, ierr)
call MPI_FILE_READ(ifile, file_num_procs, 1, MPI_INTEGER, status, ierr)

call MPI_FILE_CLOSE(ifile, ierr)
end if

call MPI_BCAST(file_tot_part, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(file_time, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(file_dt, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
call MPI_BCAST(file_num_procs, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
call s_read_lag_restart_header(file_loc, file_tot_part, file_time, file_dt, &
file_num_procs, proc_bubble_counts)
time_real = file_time

allocate (proc_bubble_counts(file_num_procs))

if (proc_rank == 0) then
call MPI_FILE_OPEN(MPI_COMM_SELF, file_loc, MPI_MODE_RDONLY, mpi_info_int, ifile, ierr)

! Skip to processor counts position
disp = int(sizeof(file_tot_part) + 2*sizeof(file_time) + sizeof(file_num_procs), MPI_OFFSET_KIND)
call MPI_FILE_SEEK(ifile, disp, MPI_SEEK_SET, ierr)
call MPI_FILE_READ(ifile, proc_bubble_counts, file_num_procs, MPI_INTEGER, status, ierr)

call MPI_FILE_CLOSE(ifile, ierr)
end if

call MPI_BCAST(proc_bubble_counts, file_num_procs, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)

! Set time variables from file

nBub = proc_bubble_counts(proc_rank + 1)
Expand Down
Loading