moved domain_glb to global_parameters

Author: conraddelgado

src/common/m_mpi_common.fpp

@@ -45,10 +45,6 @@ module m_mpi_common
     integer(kind=8) :: halo_size
     $:GPU_DECLARE(create='[halo_size]')
 
-    real(wp), allocatable, dimension(:, :), public :: domain_glb
-    $:GPU_DECLARE(create='[domain_glb]')
-    !! This variable holds the physical locations of the global domain bounds
-
 contains
 
     !> The computation of parameters, the allocation of memory,
@@ -1892,45 +1888,11 @@ contains
     end subroutine s_mpi_sendrecv_grid_variables_buffers
 #endif
 
-    !> The goal of this subroutine is to determine the physical global domain bounds
-#ifndef MFC_POST_PROCESS
-    impure subroutine s_mpi_global_domain_bounds
-        @:ALLOCATE(domain_glb(num_dims, 2))
-#ifdef MFC_MPI
-        call s_mpi_allreduce_min(x_domain%beg, domain_glb(1, 1))
-        call s_mpi_allreduce_max(x_domain%end, domain_glb(1, 2))
-        if (n > 0) then ! 2D
-            call s_mpi_allreduce_min(y_domain%beg, domain_glb(2, 1))
-            call s_mpi_allreduce_max(y_domain%end, domain_glb(2, 2))
-            if (p > 0) then ! 3D
-                call s_mpi_allreduce_min(z_domain%beg, domain_glb(3, 1))
-                call s_mpi_allreduce_max(z_domain%end, domain_glb(3, 2))
-            end if
-        end if
-#else
-        domain_glb(1, 1) = x_domain%beg
-        domain_glb(1, 2) = x_domain%end
-        if (n > 0) then ! 2D
-            domain_glb(2, 1) = y_domain%beg
-            domain_glb(2, 2) = y_domain%end
-            if (p > 0) then ! 3D
-                domain_glb(3, 1) = z_domain%beg
-                domain_glb(3, 2) = z_domain%end
-            end if
-        end if
-#endif
-        $:GPU_UPDATE(device='[domain_glb]')
-    end subroutine s_mpi_global_domain_bounds
-#endif
-
     !> Module deallocation and/or disassociation procedures
     impure subroutine s_finalize_mpi_common_module
 
 #ifdef MFC_MPI
         deallocate (buff_send, buff_recv)
-#ifndef MFC_POST_PROCESS
-        @:DEALLOCATE(domain_glb)
-#endif
 #endif
 
     end subroutine s_finalize_mpi_common_module

src/pre_process/m_global_parameters.fpp

@@ -303,6 +303,9 @@ module m_global_parameters
     logical :: fft_wrt
     logical :: dummy  !< AMDFlang workaround: keep a dummy logical to avoid a compiler case-optimization bug when a parameter+GPU-kernel conditional is false
 
+    !< global domain bounds
+    real(wp), allocatable, dimension(:, :) :: domain_glb
+
 contains
 
     !>  Assigns default values to user inputs prior to reading
@@ -973,6 +976,18 @@ contains
             allocate (logic_grid(0:m, 0:n, 0:p))
         end if
 
+        allocate (domain_glb(num_dims, 2))
+        domain_glb(1, 1) = x_domain%beg
+        domain_glb(1, 2) = x_domain%end
+        if (n > 0) then ! 2D
+            domain_glb(2, 1) = y_domain%beg
+            domain_glb(2, 2) = y_domain%end
+            if (p > 0) then ! 3D
+                domain_glb(3, 1) = z_domain%beg
+                domain_glb(3, 2) = z_domain%end
+            end if
+        end if
+
     end subroutine s_initialize_global_parameters_module
 
     impure subroutine s_initialize_parallel_io
@@ -1028,6 +1043,8 @@ contains
 
         deallocate (proc_coords)
 
+        deallocate (domain_glb)
+
 #ifdef MFC_MPI
 
         if (parallel_io) then

src/pre_process/m_start_up.fpp

@@ -820,8 +820,6 @@ contains
             end if
         end if
 
-        call s_mpi_global_domain_bounds()
-
     end subroutine s_read_grid
 
     impure subroutine s_apply_initial_condition(start, finish)

src/simulation/m_global_parameters.fpp

@@ -554,6 +554,10 @@ module m_global_parameters
     $:GPU_DECLARE(create='[tau_star,cont_damage_s,alpha_bar]')
     !> @}
 
+    !< global domain bounds
+    real(wp), allocatable, dimension(:, :) :: domain_glb
+    $:GPU_DECLARE(create='[domain_glb]')
+
 contains
 
     !> Assigns default values to the user inputs before reading
@@ -1301,6 +1305,19 @@ contains
 
         $:GPU_UPDATE(device='[relax,relax_model,palpha_eps,ptgalpha_eps]')
 
+        @:ALLOCATE(domain_glb(num_dims, 2))
+        domain_glb(1, 1) = x_domain%beg
+        domain_glb(1, 2) = x_domain%end
+        if (n > 0) then ! 2D
+            domain_glb(2, 1) = y_domain%beg
+            domain_glb(2, 2) = y_domain%end
+            if (p > 0) then ! 3D
+                domain_glb(3, 1) = z_domain%beg
+                domain_glb(3, 2) = z_domain%end
+            end if
+        end if
+        $:GPU_UPDATE(device='[domain_glb]')
+
         ! Allocating grid variables for the x-, y- and z-directions
         @:ALLOCATE(x_cb(-1 - buff_size:m + buff_size))
         @:ALLOCATE(x_cc(-buff_size:m + buff_size))
@@ -1409,6 +1426,8 @@ contains
         if (p == 0) return; 
         @:DEALLOCATE(z_cb, z_cc, dz)
 
+        @:DEALLOCATE(domain_glb)
+
     end subroutine s_finalize_global_parameters_module
 
 end module m_global_parameters

src/simulation/m_start_up.fpp

@@ -1366,8 +1366,6 @@ contains
             call s_read_data_files(q_cons_ts(1)%vf)
         end if
 
-        call s_mpi_global_domain_bounds()
-
         ! Populating the buffers of the grid variables using the boundary conditions
         call s_populate_grid_variables_buffers()