The namelist refactor modified the merge and made the particle beds invalid. Also additional allocation protection

Author: Daniel Vickers

src/common/m_model.fpp

@@ -983,7 +983,12 @@ contains
         dx_local = minval(dx); dy_local = minval(dy)
         if (p /= 0) dz_local = minval(dz)
 
-        @:ALLOCATE(models(num_ibs))
+        ! AMD HSA rejects zero-size GPU allocations; only create GPU mapping when there are actual models.
+        if (num_ibs > 0) then
+            @:ALLOCATE(models(num_ibs))
+        else
+            allocate (models(0))
+        end if
         allocate (stl_bounding_boxes(num_ibs,1:3,1:3))
 
         do patch_id = 1, num_ibs

src/simulation/m_global_parameters.fpp

@@ -166,7 +166,7 @@ module m_global_parameters
 #endif
     type(bounds_info) :: x_domain, y_domain, z_domain
     type(bounds_info) :: neighbor_domain_x, neighbor_domain_y, neighbor_domain_z
-    integer           :: ib_neighborhood_radius, num_gbl_ibs, num_local_ibs
+    integer           :: num_gbl_ibs, num_local_ibs
     $:GPU_DECLARE(create='[x_domain, y_domain, z_domain, neighbor_domain_x, neighbor_domain_y, neighbor_domain_z]')
     $:GPU_DECLARE(create='[down_sample]')
 
@@ -263,7 +263,6 @@ module m_global_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
     integer, allocatable, dimension(:,:,:) :: ib_neighbor_ranks  !< MPI ranks of neighborhood domains, indexed (-N:N,-N:N,-N:N)
     type(vec3_dt), allocatable, dimension(:) :: airfoil_grid_u, airfoil_grid_l

src/simulation/m_ibm.fpp

@@ -1537,7 +1537,11 @@ contains
         end if
 
         if (allocated(models)) then
-            @:DEALLOCATE(models)
+            if (size(models) > 0) then
+                @:DEALLOCATE(models)
+            else
+                deallocate (models)
+            end if
         end if
 
         if (collision_model > 0) call s_finalize_collisions_module()

src/simulation/m_start_up.fpp

@@ -1184,7 +1184,11 @@ contains
         integer                                             :: num_namelist_ibs, num_bed_ibs
 
         num_namelist_ibs = num_ibs
-        num_bed_ibs = size(particle_bed_ibs)
+        num_bed_ibs = 0
+        do i = 1, num_particle_beds
+            num_bed_ibs = num_bed_ibs + particle_bed(i)%num_particles
+        end do
+        print *, "num_bed_ibs", num_bed_ibs
 
         ! Check for moving IBs across both namelist and particle bed patches.
         moving_immersed_boundary_flag = .false.
@@ -1207,6 +1211,7 @@ contains
         call s_compute_ib_neighbor_ranks()
 
         num_gbl_ibs = num_namelist_ibs + num_bed_ibs
+        print *, "num_gbl_ibs", num_gbl_ibs
 
 #ifdef MFC_MPI
         if (num_procs == 1) then

toolchain/mfc/params/definitions.py

@@ -1221,6 +1221,9 @@ def _nv(targets: set, *names: str) -> None:
     "coefficient_of_restitution",
     "collision_time",
     "ib_coefficient_of_friction",
+    "num_particle_beds",
+    "ib_neighborhood_radius",
+    "particle_bed",
     "tau_star",
     "cont_damage_s",
     "alpha_bar",