refactor(tests): standardise MPI lifecycle and reporting

- adopt shared MPI initialisation and test finalisation helpers
- aggregate rank-local test results where required
- make statistics and scalar-output failures update allpass
- remove duplicate success reporting

Author: ia267

tests/performance/perf_omp_tridiag.f90

@@ -7,7 +7,8 @@ program perf_omp_tridiag
   use m_omp_sendrecv, only: sendrecv_fields
   use m_omp_exec_dist, only: exec_dist_tds_compact
   use m_tdsops, only: tdsops_t, tdsops_init
-  use m_test_utils, only: initialise_mpi, write_perf_minmax_metrics
+  use m_test_utils, only: initialise_mpi, finalise_test, &
+                          write_perf_minmax_metrics
 
   implicit none
 
@@ -32,7 +33,7 @@ program perf_omp_tridiag
   call configure_benchmark()
   call allocate_fields()
   call run_case('periodic', dx_per, periodic_bw)
-  call finalise()
+  call finalise_test(.true., nrank)
 
 contains
 
@@ -155,8 +156,4 @@ subroutine stop_timer(t)
     t = omp_get_wtime()
   end subroutine stop_timer
 
-  subroutine finalise()
-    call MPI_Finalize(ierr)
-  end subroutine finalise
-
 end program perf_omp_tridiag

tests/unit/test_ab_checkpoint.f90

@@ -11,6 +11,7 @@ program test_ab_checkpoint
   use m_solver, only: solver_t
   use m_omp_backend, only: omp_backend_t
   use m_omp_common, only: SZ
+  use m_test_utils, only: initialise_mpi, finalise_test, global_all
 
   implicit none
 
@@ -27,7 +28,7 @@ program test_ab_checkpoint
   type(checkpoint_manager_t) :: chk_mgr_write, chk_mgr_restart
   type(flist_t), allocatable :: curr(:)
   type(flist_t), allocatable :: deriv(:)
-  integer :: ierr, irank, nproc
+  integer :: irank, nproc
   integer :: dims_global(3), nproc_dir(3)
   real(dp) :: L_global(3)
   character(len=20) :: BC_x(2), BC_y(2), BC_z(2)
@@ -39,9 +40,7 @@ program test_ab_checkpoint
   logical :: allpass
   real(dp) :: diff
 
-  call MPI_Init(ierr)
-  call MPI_Comm_rank(MPI_COMM_WORLD, irank, ierr)
-  call MPI_Comm_size(MPI_COMM_WORLD, nproc, ierr)
+  call initialise_mpi(irank, nproc)
 
   allpass = .true.
 
@@ -120,15 +119,8 @@ program test_ab_checkpoint
     deallocate (olds_ref)
   end if
 
-  call MPI_Finalize(ierr)
-
-  if (irank == 0) then
-    if (allpass) then
-      write (stderr, '(a)') 'AB checkpoint test passed.'
-    else
-      error stop 'AB checkpoint test failed.'
-    end if
-  end if
+  call global_all(allpass)
+  call finalise_test(allpass, irank)
 
 contains
 

tests/unit/test_adios2_read_write.f90

@@ -4,7 +4,7 @@ program test_adios2
   use m_io_base, only: io_writer_t, io_reader_t, io_file_t, io_mode_write, &
                        io_mode_read
   use m_common, only: dp, i8, is_sp
-  use iso_fortran_env, only: stderr => error_unit
+  use m_test_utils, only: initialise_mpi, finalise_test, global_all
   implicit none
 
   ! ADIOS2 handlers
@@ -24,9 +24,7 @@ program test_adios2
   real(dp) :: expected, tolerance
 
   ! launch MPI
-  call MPI_Init(ierr)
-  call MPI_Comm_rank(MPI_COMM_WORLD, irank, ierr)
-  call MPI_Comm_size(MPI_COMM_WORLD, isize, ierr)
+  call initialise_mpi(irank, isize)
 
   ! data initialisation
   allocate (data_write(inx, iny, inz))
@@ -111,15 +109,7 @@ program test_adios2
 
   ! Cleanup and finalize
   call MPI_Barrier(MPI_COMM_WORLD, ierr)
-  call MPI_Finalize(ierr)
-
-  ! Test result
-  if (irank == 0) then
-    if (allpass) then
-      write (stderr, '(a)') 'ADIOS2 TEST PASSED SUCCESSFULLY.'
-    else
-      error stop 'ADIOS2 TEST FAILED.'
-    end if
-  end if
+  call global_all(allpass)
+  call finalise_test(allpass, irank)
 
 end program test_adios2

tests/unit/test_allocator.f90

@@ -1,11 +1,10 @@
 program test_allocator
-  use mpi
   use iso_fortran_env, only: stderr => error_unit
 
   use m_allocator, only: allocator_t
   use m_field, only: field_t
   use m_common, only: DIR_X, pi, dp
-  use m_test_utils, only: finalise_test
+  use m_test_utils, only: initialise_mpi, finalise_test
 
   implicit none
 
@@ -16,9 +15,9 @@ program test_allocator
   class(allocator_t), allocatable :: allocator
   class(field_t), pointer :: ptr1, ptr2, ptr3
   integer, allocatable :: l(:)
-  integer :: ierr
+  integer :: nrank, nproc
 
-  call MPI_Init(ierr)
+  call initialise_mpi(nrank, nproc)
 
   allocator = allocator_t([8, 8, 8], 8)
 
@@ -77,5 +76,5 @@ program test_allocator
 
   call allocator%destroy()
 
-  call finalise_test(allpass)
+  call finalise_test(allpass, nrank)
 end program test_allocator

tests/unit/test_io_session.f90

@@ -3,7 +3,7 @@ program test_io_session
   use mpi
   use m_common, only: dp, i8
   use m_io_session, only: writer_session_t, reader_session_t
-  use iso_fortran_env, only: stderr => error_unit
+  use m_test_utils, only: initialise_mpi, finalise_test, global_all
   implicit none
 
   integer, parameter, dimension(3) :: local_dims = [8, 6, 1]
@@ -22,9 +22,7 @@ program test_io_session
   logical :: allpass = .true.
   integer :: i, j, k
 
-  call MPI_Init(ierr)
-  call MPI_Comm_rank(MPI_COMM_WORLD, irank, ierr)
-  call MPI_Comm_size(MPI_COMM_WORLD, nproc, ierr)
+  call initialise_mpi(irank, nproc)
 
   ! setup global domain dimensions
   global_dims = [int(local_dims(1), i8), int(local_dims(2), i8), &
@@ -93,19 +91,11 @@ program test_io_session
     if (.not. allpass) exit
   end do
 
-  call MPI_Allreduce(MPI_IN_PLACE, allpass, 1, MPI_LOGICAL, &
-                     MPI_LAND, MPI_COMM_WORLD, ierr)
+  call global_all(allpass)
 
   ! cleanup
   if (irank == 0) call execute_command_line("rm -rf "//test_file)
 
-  call MPI_Finalize(ierr)
-
-  if (allpass) then
-    if (irank == 0) write (stderr, &
-                        '(a)') 'PARALLEL I/O SESSION TEST PASSED SUCCESSFULLY.'
-  else
-    error stop 'PARALLEL I/O SESSION TEST FAILED.'
-  end if
+  call finalise_test(allpass, irank)
 
 end program test_io_session

tests/unit/test_mesh.f90

@@ -1,12 +1,11 @@
 program test_mesh
-  use mpi
   use iso_fortran_env, only: stderr => error_unit
 
   use m_allocator, only: allocator_t
   use m_field, only: field_t
   use m_mesh, only: mesh_t
   use m_common, only: DIR_X, pi, dp, CELL, DIR_C, DIR_Y, DIR_Z, VERT, Z_FACE
-  use m_test_utils, only: finalise_test
+  use m_test_utils, only: initialise_mpi, finalise_test
 
   implicit none
 
@@ -19,15 +18,13 @@ program test_mesh
   class(field_t), pointer :: ptr1, ptr2, ptr3
   integer, dimension(3) :: dims
   integer, dimension(3) :: dims_check
-  integer :: ierr, nrank, nproc
+  integer :: nrank, nproc
   integer :: n_cell, n_vert, n_x_face
   ! -ffast-math reciprocal division can be ~1 ulp off even for exactly
   ! representable results, so the tolerance must scale with the precision
   real(dp), parameter :: eps = 1000*epsilon(1._dp)
 
-  call MPI_Init(ierr)
-  call MPI_Comm_rank(MPI_COMM_WORLD, nrank, ierr)
-  call MPI_Comm_size(MPI_COMM_WORLD, nproc, ierr)
+  call initialise_mpi(nrank, nproc)
 
   allpass = .true.
 

tests/unit/test_omptgt_allocator.f90

@@ -5,6 +5,7 @@ program test_allocator_omptgt
   use m_common, only: dp, pi, DIR_X
 
   use m_omptgt_allocator, only: omptgt_allocator_t
+  use m_test_utils, only: initialise_mpi, finalise_test
 
   implicit none
 
@@ -15,9 +16,9 @@ program test_allocator_omptgt
   class(allocator_t), allocatable :: allocator
   class(field_t), pointer :: ptr1, ptr2, ptr3
   integer, allocatable :: l(:)
-  integer :: ierr
+  integer :: nrank, nproc
 
-  call MPI_Init(ierr)
+  call initialise_mpi(nrank, nproc)
 
   dims = [8, 8, 8]
   nproc_dir = [1, 1, 1]
@@ -88,5 +89,5 @@ program test_allocator_omptgt
 
   call allocator%destroy()
 
-  call MPI_Finalize(ierr)
+  call finalise_test(allpass, nrank)
 end program test_allocator_omptgt