fix ierr

Author: sbryngelson

src/common/m_mpi_common.fpp

@@ -24,7 +24,7 @@ module m_mpi_common
 
     implicit none
 
-    integer, private :: ierr, v_size !<
+    integer, private :: v_size
     $:GPU_DECLARE(create='[v_size]')
     !! Generic flags used to identify and report MPI errors
 
@@ -88,6 +88,10 @@ contains
         !!      available for the job and the local processor rank.
     impure subroutine s_mpi_initialize
 
+#ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
+#endif
+
 #ifndef MFC_MPI
 
         ! Serial run only has 1 processor
@@ -136,6 +140,7 @@ contains
 
         ! Generic loop iterator
         integer :: i, j
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         !Altered system size for the lagrangian subgrid bubble model
         integer :: alt_sys
@@ -284,15 +289,16 @@ contains
         integer, intent(in) :: root               ! Rank of the root process
         real(wp), allocatable, intent(out) :: gathered_vector(:) ! Gathered vector on the root process
 
-        integer :: i, local_ierr
+        integer :: i
+        integer :: ierr !< Generic flag used to identify and report MPI errors
         integer, allocatable :: recounts(:), displs(:)
 
 #ifdef MFC_MPI
 
         allocate (recounts(num_procs))
 
         call MPI_GATHER(counts, 1, MPI_INTEGER, recounts, 1, MPI_INTEGER, root, &
-                        MPI_COMM_WORLD, local_ierr)
+                        MPI_COMM_WORLD, ierr)
 
         allocate (displs(size(recounts)))
 
@@ -304,7 +310,7 @@ contains
 
         allocate (gathered_vector(sum(recounts)))
         call MPI_GATHERV(my_vector, counts, mpi_p, gathered_vector, recounts, displs, mpi_p, &
-                         root, MPI_COMM_WORLD, local_ierr)
+                         root, MPI_COMM_WORLD, ierr)
 #endif
     end subroutine s_mpi_gather_data
 
@@ -314,6 +320,7 @@ contains
         real(wp), intent(inout) :: time_avg
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         call MPI_GATHER(time_avg, 1, mpi_p, proc_time(0), 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
 
@@ -365,6 +372,7 @@ contains
 
 #ifdef MFC_SIMULATION
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Reducing local extrema of ICFL, VCFL, CCFL and Rc numbers to their
         ! global extrema and bookkeeping the results on the rank 0 processor
@@ -408,6 +416,7 @@ contains
         real(wp), intent(out) :: var_glb
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Performing the reduction procedure
         call MPI_ALLREDUCE(var_loc, var_glb, 1, mpi_p, &
@@ -430,6 +439,7 @@ contains
         real(wp), intent(out) :: var_glb
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Performing the reduction procedure
         call MPI_ALLREDUCE(var_loc, var_glb, 1, mpi_p, &
@@ -452,6 +462,7 @@ contains
         real(wp), intent(out) :: var_glb
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Performing the reduction procedure
         call MPI_ALLREDUCE(var_loc, var_glb, 1, mpi_p, &
@@ -472,6 +483,7 @@ contains
         real(wp), intent(inout) :: var_loc
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Temporary storage variable that holds the reduced minimum value
         real(wp) :: var_glb
@@ -507,6 +519,7 @@ contains
         real(wp), dimension(2), intent(inout) :: var_loc
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         real(wp), dimension(2) :: var_glb  !<
             !! Temporary storage variable that holds the reduced maximum value
@@ -533,6 +546,10 @@ contains
         character(len=*), intent(in), optional :: prnt
         integer, intent(in), optional :: code
 
+#ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
+#endif
+
         if (present(prnt)) then
             print *, prnt
             call flush (6)
@@ -560,6 +577,7 @@ contains
     impure subroutine s_mpi_barrier
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Calling MPI_BARRIER
         call MPI_BARRIER(MPI_COMM_WORLD, ierr)
@@ -572,6 +590,7 @@ contains
     impure subroutine s_mpi_finalize
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Finalizing the MPI environment
         call MPI_FINALIZE(ierr)
@@ -609,6 +628,7 @@ contains
         integer :: pack_offset, unpack_offset
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         call nvtxStartRange("RHS-COMM-PACKBUF")
 
@@ -1058,6 +1078,7 @@ contains
         integer :: recon_order !< reconstruction order
 
         integer :: i, j !< Generic loop iterators
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         if (num_procs == 1 .and. parallel_io) then
             do i = 1, num_dims
@@ -1532,6 +1553,7 @@ contains
         integer, intent(in) :: pbc_loc
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! MPI Communication in x-direction
         if (mpi_dir == 1) then

src/post_process/m_data_output.fpp

@@ -105,7 +105,7 @@ module m_data_output
 
     ! Generic error flags utilized in the handling, checking and the reporting
     ! of the input and output operations errors with a formatted database file
-    integer, private :: err, ierr
+    integer, private :: err
 
 contains
 
@@ -477,6 +477,8 @@ contains
         ! Generic string used to store the location of a particular file
         character(LEN=len_trim(case_dir) + 3*name_len) :: file_loc
 
+        integer :: ierr !< Generic flag used to identify and report database errors
+
         ! Silo-HDF5 Database Format
 
         if (format == 1) then
@@ -650,6 +652,8 @@ contains
         ! Generic loop iterator
         integer :: i
 
+        integer :: ierr !< Generic flag used to identify and report database errors
+
         ! Silo-HDF5 Database Format
 
         if (format == 1 .and. n > 0) then
@@ -860,6 +864,8 @@ contains
         ! Generic loop iterator
         integer :: i, j, k
 
+        integer :: ierr !< Generic flag used to identify and report database errors
+
         ! Silo-HDF5 Database Format
 
         if (format == 1) then
@@ -1106,7 +1112,8 @@ contains
         logical :: lg_bub_file, file_exist
 
         integer, dimension(2) :: gsizes, lsizes, start_idx_part
-        integer :: ifile, ierr, tot_data
+        integer :: ifile, tot_data
+        integer :: ierr !< Generic flag used to identify and report MPI errors
         integer :: i
 
         write (file_loc, '(A,I0,A)') 'lag_bubbles_mpi_io_', t_step, '.dat'
@@ -1392,6 +1399,8 @@ contains
         !              domain, because one associated with the entire domain is
         !              not generated.
 
+        integer :: ierr !< Generic flag used to identify and report database errors
+
         ! Silo-HDF5 database format
         if (format == 1) then
             ierr = DBCLOSE(dbfile)

src/post_process/m_global_parameters.fpp

@@ -197,8 +197,6 @@ module m_global_parameters
     integer :: mpi_info_int
     !> @}
 
-    integer, private :: ierr
-
     type(physical_parameters), dimension(num_fluids_max) :: fluid_pp !<
     !! Database of the physical parameters of each of the fluids that is present
     !! in the flow. These include the stiffened gas equation of state parameters,
@@ -904,6 +902,10 @@ contains
     !> Subroutine to initialize parallel infrastructure
     impure subroutine s_initialize_parallel_io
 
+#ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
+#endif
+
         num_dims = 1 + min(1, n) + min(1, p)
 
         if (mhd) then

src/post_process/m_mpi_proxy.fpp

@@ -31,11 +31,6 @@ module m_mpi_proxy
     integer, allocatable, dimension(:) :: displs
     !> @}
 
-    !> @name Generic flags used to identify and report MPI errors
-    !> @{
-    integer, private :: ierr
-    !> @}
-
 contains
 
     !>  Computation of parameters, allocation procedures, and/or
@@ -45,6 +40,7 @@ contains
 #ifdef MFC_MPI
 
         integer :: i !< Generic loop iterator
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Allocating and configuring the receive counts and the displacement
         ! vector variables used in variable-gather communication procedures.
@@ -85,6 +81,7 @@ contains
 
 #ifdef MFC_MPI
         integer :: i !< Generic loop iterator
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Logistics
         call MPI_BCAST(case_dir, len(case_dir), MPI_CHARACTER, 0, MPI_COMM_WORLD, ierr)
@@ -150,6 +147,7 @@ contains
         real(wp), dimension(1:, 0:), intent(INOUT) :: spatial_extents
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Simulation is 3D
         if (p > 0) then
@@ -267,6 +265,7 @@ contains
     impure subroutine s_mpi_defragment_1d_grid_variable
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Silo-HDF5 database format
         if (format == 1) then
@@ -306,6 +305,7 @@ contains
         real(wp), dimension(1:2, 0:num_procs - 1), intent(inout) :: data_extents
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Minimum flow variable extent
         call MPI_GATHERV(minval(q_sf), 1, mpi_p, &
@@ -333,6 +333,7 @@ contains
         real(wp), dimension(0:m), intent(inout) :: q_root_sf
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Gathering the sub-domain flow variable data from all the processes
         ! and putting it back together for the entire computational domain

src/pre_process/m_global_parameters.fpp

@@ -188,8 +188,6 @@ module m_global_parameters
 
 #endif
 
-    integer, private :: ierr
-
     ! Initial Condition Parameters
     integer :: num_patches     !< Number of patches composing initial condition
 
@@ -931,6 +929,10 @@ contains
 
     impure subroutine s_initialize_parallel_io
 
+#ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
+#endif
+
         num_dims = 1 + min(1, n) + min(1, p)
 
         if (mhd) then

src/pre_process/m_mpi_proxy.fpp

@@ -23,9 +23,6 @@ module m_mpi_proxy
 
     implicit none
 
-    integer, private :: ierr !<
-    !! Generic flag used to identify and report MPI errors
-
 contains
     !> Since only processor with rank 0 is in charge of reading
             !!       and checking the consistency of the user provided inputs,
@@ -38,6 +35,8 @@ contains
 
         ! Generic loop iterator
         integer :: i
+        ! Generic flag used to identify and report MPI errors
+        integer :: ierr
 
         ! Logistics
         call MPI_BCAST(case_dir, len(case_dir), MPI_CHARACTER, 0, MPI_COMM_WORLD, ierr)

src/simulation/m_fftw.fpp

@@ -58,7 +58,6 @@ module m_fftw
 #else
     type(c_ptr) :: fwd_plan_gpu, bwd_plan_gpu
 #endif
-    integer :: ierr
 
     integer, allocatable :: gpu_fft_size(:), iembed(:), oembed(:)
 
@@ -82,6 +81,7 @@ contains
         batch_size = x_size*sys_size
 
 #if defined(MFC_OpenACC)
+        integer :: ierr !< Generic flag used to identify and report GPU errors
         rank = 1; istride = 1; ostride = 1
 
         allocate (gpu_fft_size(1:rank), iembed(1:rank), oembed(1:rank))
@@ -138,6 +138,7 @@ contains
         ! Restrict filter to processors that have cells adjacent to axis
         if (bc_y%beg >= 0) return
 #if defined(MFC_OpenACC)
+        integer :: ierr !< Generic flag used to identify and report GPU errors
 
         $:GPU_PARALLEL_LOOP(collapse=3)
         do k = 1, sys_size
@@ -302,6 +303,7 @@ contains
     impure subroutine s_finalize_fftw_module
 
 #if defined(MFC_OpenACC)
+        integer :: ierr !< Generic flag used to identify and report GPU errors
         @:DEALLOCATE(data_real_gpu, data_fltr_cmplx_gpu, data_cmplx_gpu)
 #if defined(__PGI)
 

src/simulation/m_global_parameters.fpp

@@ -244,8 +244,6 @@ module m_global_parameters
     integer :: mpi_info_int
     !> @}
 
-    integer, private :: ierr
-
     !> @name Annotations of the structure of the state and flux vectors in terms of the
     !! size and the configuration of the system of equations to which they belong
     !> @{
@@ -1318,6 +1316,10 @@ contains
     !> Initializes parallel infrastructure
     impure subroutine s_initialize_parallel_io
 
+#ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
+#endif
+
         #:if not MFC_CASE_OPTIMIZATION
             num_dims = 1 + min(1, n) + min(1, p)