Resolved issues from merge conflict

Author: Daniel Vickers

src/pre_process/m_global_parameters.fpp

@@ -89,11 +89,9 @@ module m_global_parameters
 
     !> @name Immersed Boundaries
     !> @{
-    type(ib_patch_parameters), dimension(num_ib_patches_max_namelist) :: patch_ib    !< Immersed boundary patch parameters
-    type(ib_airfoil_parameters), dimension(num_ib_airfoils_max)       :: ib_airfoil  !< Per-airfoil NACA parameters
+    ! patch_ib, ib_airfoil, stl_models: auto-generated in generated_decls.fpp
     !> Per-airfoil computed surface grids (unused in pre_process)
-    type(ib_airfoil_grid), allocatable, dimension(:)       :: ib_airfoil_grids
-    type(ib_stl_parameters), dimension(num_stl_models_max) :: stl_models  !< Per-STL model parameters (namelist)
+    type(ib_airfoil_grid), allocatable, dimension(:) :: ib_airfoil_grids
     !> @}
 
     !> @name Non-polytropic bubble gas compression

src/simulation/m_global_parameters.fpp

@@ -224,7 +224,7 @@ module m_global_parameters
     integer, allocatable, dimension(:,:,:) :: ib_neighbor_ranks  !< MPI ranks of neighborhood domains, indexed (-N:N,-N:N,-N:N)
     type(ib_airfoil_grid), dimension(num_ib_airfoils_max) :: ib_airfoil_grids  !< Per-airfoil computed surface grids
 
-    $:GPU_DECLARE(create='[ib, num_ibs, patch_ib, ib_airfoil, ib_airfoil_grids, stl_models]')
+    $:GPU_DECLARE(create='[ib, num_ibs, ib_airfoil_grids, stl_models]')
     $:GPU_DECLARE(create='[ib_coefficient_of_friction]')
     !> @}