Set patch_ib back to being statically allocated array, for optimization and cleanliness

Author: danieljvickers

src/common/m_constants.fpp

@@ -16,17 +16,18 @@ module m_constants
     real(wp), parameter  :: verysmall = 1.e-12_wp       !< Very small number
     !> Radius cutoff to avoid division by zero for 3D spherical harmonic patch (geometry 14)
     real(wp), parameter :: small_radius = 1.e-32_wp
-    integer, parameter  :: num_stcls_min = 5             !< Minimum # of stencils
-    integer, parameter  :: path_len = 400                !< Maximum path length
-    integer, parameter  :: name_len = 50                 !< Maximum name length
-    integer, parameter  :: dflt_int = -100               !< Default integer value
-    integer, parameter  :: fourier_rings = 5             !< Fourier filter ring limit
-    integer, parameter  :: num_fluids_max = 10           !< Maximum number of fluids in the simulation
-    integer, parameter  :: num_probes_max = 10           !< Maximum number of flow probes in the simulation
-    integer, parameter  :: num_patches_max = 10          !< Maximum number of IC patches
-    integer, parameter  :: num_ib_patches_max = 2050000  !< Maximum number of immersed boundary patches (patch_ib)
-    !> Max patches readable from the namelist; patch_ib grows to num_ib_patches_max only when particle beds are used
-    integer, parameter  :: num_ib_patches_max_namelist = 50000
+    integer, parameter  :: num_stcls_min = 5     !< Minimum # of stencils
+    integer, parameter  :: path_len = 400        !< Maximum path length
+    integer, parameter  :: name_len = 50         !< Maximum name length
+    integer, parameter  :: dflt_int = -100       !< Default integer value
+    integer, parameter  :: fourier_rings = 5     !< Fourier filter ring limit
+    integer, parameter  :: num_fluids_max = 10   !< Maximum number of fluids in the simulation
+    integer, parameter  :: num_probes_max = 10   !< Maximum number of flow probes in the simulation
+    integer, parameter  :: num_patches_max = 10  !< Maximum number of IC patches
+    !> Maximum number of immersed boundary patches (legacy, not used for patch_ib sizing)
+    integer, parameter :: num_ib_patches_max = 2050000
+    !> Fixed capacity of patch_ib (namelist patches + local particle bed subset after reduction)
+    integer, parameter  :: num_ib_patches_max_namelist = 54000
     integer, parameter  :: num_local_ibs_max = 2000            !< Maximum number of immersed boundary patches (patch_ib)
     integer, parameter  :: num_particle_beds_max = 10          !< Maximum number of particle bed patch specifications
     integer, parameter  :: num_bc_patches_max = 10             !< Maximum number of boundary condition patches

src/simulation/m_global_parameters.fpp

@@ -261,7 +261,7 @@ module m_global_parameters
 
     !> @name Immersed Boundaries
     !> @{
-    type(ib_patch_parameters), allocatable, dimension(:) :: patch_ib  !< Immersed boundary patch parameters
+    type(ib_patch_parameters), dimension(num_ib_patches_max_namelist) :: patch_ib  !< Immersed boundary patch parameters
     integer, dimension(num_local_ibs_max) :: local_ib_patch_ids  !< lookup table of IBs in the local compute domain
     integer :: num_particle_beds  !< Number of particle bed specifications
     type(particle_bed_parameters), dimension(num_particle_beds_max) :: particle_bed  !< Particle bed specifications
@@ -697,7 +697,6 @@ contains
             particle_bed(i)%seed = 0
         end do
 
-        allocate (patch_ib(num_ib_patches_max_namelist))
         do i = 1, num_ib_patches_max_namelist
             patch_ib(i)%gbl_patch_id = i
             patch_ib(i)%geometry = dflt_int

src/simulation/m_start_up.fpp

@@ -889,7 +889,7 @@ contains
         if (ib) then
             block
                 type(ib_patch_parameters), allocatable :: particle_bed_ibs(:)
-                
+
                 if (cfl_dt .and. n_start > 0) then
                     call s_read_ib_restart_data(n_start)
                     allocate (particle_bed_ibs(0))
@@ -998,8 +998,6 @@ contains
 #else
             "on CPUs"
 #endif
-        else
-            allocate (patch_ib(num_ib_patches_max_namelist))
         end if
 
         call s_mpi_bcast_user_inputs()
@@ -1274,7 +1272,6 @@ contains
         end do
 #endif
 
-        $:GPU_ENTER_DATA(create='[patch_ib]')
         @:ALLOCATE(ib_gbl_idx_lookup(1:num_gbl_ibs))
 
     end subroutine s_reduce_ib_patch_array