Skip to content

Allow applications partitioning meshes to specify partition constraints (imposed by multigrid) #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mike Hobson (mike-hobson) merged 6 commits into from
Apr 22, 2026
Merged

Allow applications partitioning meshes to specify partition constraints (imposed by multigrid) #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3cf8da1
Commit changes to allow control of partition constraints
mo-rickywong Feb 26, 2026
768d513
Merge branch 'main' into EnforcePartitionRestrictions
mo-rickywong Mar 24, 2026
646940e
Fix merge issue
mo-rickywong Mar 24, 2026
96ce428
Update comment
mo-rickywong Mar 24, 2026
4bc7800
Updates in response to Code review comments
mo-rickywong Apr 20, 2026
0ecacab
Merge branch 'main' into EnforcePartitionRestrictions
mike-hobson Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions applications/coupled/source/driver/coupled_driver_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ subroutine initialise( program_name, modeldb, calendar )
real(r_def) :: domain_bottom
real(r_def) :: domain_height
real(r_def) :: scaled_radius
logical :: apply_partition_check
logical :: check_partitions

integer(i_def) :: i
integer(i_def), parameter :: one_layer = 1_i_def
Expand Down Expand Up @@ -119,12 +119,12 @@ subroutine initialise( program_name, modeldb, calendar )

! Create the required meshes
stencil_depth = 1
apply_partition_check = .false.
check_partitions = .false.
call init_mesh( modeldb%config, &
modeldb%mpi%get_comm_rank(), &
modeldb%mpi%get_comm_size(), &
base_mesh_names, extrusion, &
stencil_depth, apply_partition_check )
stencil_depth, check_partitions )

allocate( twod_names, source=base_mesh_names )
do i=1, size(twod_names)
Expand Down
3 changes: 2 additions & 1 deletion applications/io_demo/source/driver/io_demo_driver_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ module io_demo_driver_mod
use model_clock_mod, only : model_clock_type
use multifile_field_setup_mod, only : create_multifile_io_fields
use multifile_io_mod, only : init_multifile_io, step_multifile_io
use io_benchmark_setup_mod, only : create_io_benchmark_fields, setup_io_benchmark_files
use io_benchmark_setup_mod, only : create_io_benchmark_fields, &
setup_io_benchmark_files
use io_benchmark_step_mod, only : step_io_benchmark
use io_demo_alg_mod, only : io_demo_alg
use sci_field_minmax_alg_mod, only : log_field_minmax
Expand Down
6 changes: 3 additions & 3 deletions applications/skeleton/source/driver/skeleton_driver_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ subroutine initialise(program_name, modeldb)
real(r_def) :: domain_bottom
real(r_def) :: domain_height
real(r_def) :: scaled_radius
logical :: apply_partition_check
logical :: check_partitions

integer(i_def) :: i
integer(i_def), parameter :: one_layer = 1_i_def
Expand Down Expand Up @@ -140,12 +140,12 @@ subroutine initialise(program_name, modeldb)
! Create the required meshes
!-----------------------------------------------------------------------
stencil_depth = 1
apply_partition_check = .false.
check_partitions = .false.
call init_mesh( modeldb%config, &
modeldb%mpi%get_comm_rank(), &
modeldb%mpi%get_comm_size(), &
base_mesh_names, extrusion, &
stencil_depth, apply_partition_check )
stencil_depth, check_partitions )

allocate( twod_names, source=base_mesh_names )
do i=1, size(twod_names)
Expand Down
3 changes: 2 additions & 1 deletion components/driver/source/driver_mesh_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,8 @@ subroutine init_mesh( config, &
decomposition, &
stencil_depths, &
generate_inner_halos, &
partitioner_ptr )
partitioner_ptr, &
enforce_constraints=check_partitions )


! 2.2f Read in the global intergrid mesh mappings,
Expand Down
31 changes: 23 additions & 8 deletions components/driver/source/mesh/runtime_partition_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,15 @@ end subroutine get_partition_strategy
!> @param[in] stencil_depths Depth of cells outside the base cell
!! of stencil for each mesh.
!> @param[in] partitioner_ptr Mesh partitioning strategy
!> @param[in] enforce_constraints Apply defensive checking for multigrid
!> configurations (Optional).
subroutine create_local_mesh( mesh_names, &
local_rank, total_ranks, &
decomposition, &
stencil_depths, &
generate_inner_halos, &
partitioner_ptr )
partitioner_ptr, &
enforce_constraints )
Copy link
Copy Markdown
Contributor

@mike-hobson Mike Hobson (mike-hobson) Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no Doxygen comments for the new argument: enforce_constraints. Please can you add some


implicit none

Expand All @@ -133,6 +136,8 @@ subroutine create_local_mesh( mesh_names, &

logical(l_def), intent(in) :: generate_inner_halos

logical(l_def), intent(in), optional :: enforce_constraints

procedure(partitioner_interface), intent(in), pointer :: partitioner_ptr

type(global_mesh_type), pointer :: global_mesh_ptr
Expand All @@ -142,21 +147,31 @@ subroutine create_local_mesh( mesh_names, &
integer(i_def) :: local_mesh_id, i
integer(i_def) :: mapping_factor

logical(l_def) :: enforce_constraints_choice

if (present(enforce_constraints)) then
enforce_constraints_choice = enforce_constraints
else
enforce_constraints_choice = .true.
end if

do i=1, size(mesh_names)

global_mesh_ptr => global_mesh_collection%get_global_mesh( mesh_names(i) )

mapping_factor = calc_mapping_factor( global_mesh_collection, global_mesh_ptr )

! Create partition
partition = partition_type( global_mesh_ptr, &
partitioner_ptr, &
decomposition, &
stencil_depths(i), &
generate_inner_halos, &
local_rank, &
total_ranks, &
partition = partition_type( global_mesh_ptr, &
partitioner_ptr, &
decomposition, &
stencil_depths(i), &
generate_inner_halos, &
enforce_constraints_choice, &
local_rank, &
total_ranks, &
mapping_factor )

! Create local_mesh
call local_mesh%initialise( global_mesh_ptr, partition )

Expand Down
4 changes: 4 additions & 0 deletions components/driver/unit-test/mesh/create_mesh_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ contains
logical(l_def), intent(in) :: generate_inner_halos
integer(i_def), intent(in) :: local_rank
integer(i_def), intent(in) :: total_ranks

! Local variables
type(ugrid_mesh_data_type) :: ugrid_mesh_data
type(global_mesh_type) :: global_mesh
Expand All @@ -107,6 +108,8 @@ contains
procedure(partitioner_interface), pointer :: partitioner_ptr
integer(i_def) :: local_mesh_id

logical(l_def), parameter :: enforce_constraints = .true.

! Reset in case of repeated initialisation
call mesh_collection%clear()
call global_mesh_collection%clear()
Expand All @@ -129,6 +132,7 @@ contains
decomposition, &
max_stencil_depth, &
generate_inner_halos, &
enforce_constraints, &
local_rank, &
total_ranks )

Expand Down
Loading
Loading