Skip to content

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

Merged
Mike Hobson (mike-hobson) merged 6 commits into
MetOffice:mainfrom
mo-rickywong:EnforcePartitionRestrictions
Apr 22, 2026
Merged

Mike Hobson (mike-hobson) merged 6 commits into
MetOffice:mainfrom
mo-rickywong:EnforcePartitionRestrictions

Conversation

@mo-rickywong

@mo-rickywong Ricky Wong (mo-rickywong) commented Feb 27, 2026 •

Copy link
Copy Markdown
Contributor

PR Summary

Sci/Tech Reviewer: Juan Manuel Castillo Sanchez (@ukmo-juan-castillo)
Code Reviewer: Mike Hobson (@mike-hobson)

ticket:4630 relocated checks/code-path for constraints on partitions when using MultiGrid within the the partitioners. This is a check that the partitioner (or infrastructure) should not be performing (it's a Gungho Science feature).

The contraints on multigrid are being triggered if the mesh file from which a mesh was read, contained intergrid maps, regardless of whether the application had any interest in multigrid (e.g. Lfric2Lfric re-gridding). This change provides logic for applications to specify whether they are concerned with "Multigrid" constraints.

Ideally, the checks should be relocated to Gungho Science. This change achieves the desired outcome without compounding ticket:4630 complexity.

Linked PRs

Blocking PRs

Code Quality Checklist

  • I have performed a self-review of my own code
  • My code follows the project's style guidelines
  • Comments have been included that aid understanding and enhance the readability of the code
  • My changes generate no new warnings
  • All automated checks in the CI pipeline have completed successfully

Testing

  • I have tested this change locally, using the LFRic Core rose-stem suite
  • If required (e.g. API changes) I have also run the LFRic Apps test suite using this branch
  • If any tests fail (rose-stem or CI) the reason is understood and acceptable (e.g. kgo changes)
  • I have added tests to cover new functionality as appropriate (e.g. system tests, unit tests, etc.)
  • Any new tests have been assigned an appropriate amount of compute resource and have been allocated to an appropriate testing group (i.e. the developer tests are for jobs which use a small amount of compute resource and complete in a matter of minutes)

All rose-stem tests run green. without issue.

Security Considerations

  • I have reviewed my changes for potential security issues
  • Sensitive data is properly handled (if applicable)
  • Authentication and authorisation are properly implemented (if applicable)

Performance Impact

  • Performance of the code has been considered and, if applicable, suitable performance measurements have been conducted

AI Assistance and Attribution

  • Some of the content of this change has been produced with the assistance of Generative AI tool name (e.g., Met Office Github Copilot Enterprise, Github Copilot Personal, ChatGPT GPT-4, etc) and I have followed the Simulation Systems AI policy (including attribution labels)

Documentation

  • Where appropriate I have updated documentation related to this change and confirmed that it builds correctly

PSyclone Approval

  • If you have edited any PSyclone-related code (e.g. PSyKAl-lite, Kernel interface, optimisation scripts, LFRic data structure code) then please contact the TCD Team

Sci/Tech Review

  • I understand this area of code and the changes being added
  • The proposed changes correspond to the pull request description
  • Documentation is sufficient (do documentation papers need updating)
  • Sufficient testing has been completed

(Please alert the code reviewer via a tag when you have approved the SR)

Code Review

  • All dependencies have been resolved
  • Related Issues have been properly linked and addressed
  • CLA compliance has been confirmed
  • Code quality standards have been met
  • Tests are adequate and have passed
  • Documentation is complete and accurate
  • Security considerations have been addressed
  • Performance impact is acceptable

@ukmo-juan-castillo

Copy link
Copy Markdown
Contributor

I run the lfric_core rose stem tests successfully, everything seems in order:

Test Suite Results - lfric_core - EnforcePartitionRestrictions/run1

Suite Information

Item Value
Suite Name EnforcePartitionRestrictions/run1
Suite User juan.m.castillo
Workflow Start 2026-03-05T14:18:13
Groups Run all
Dependency Reference Main Like
lfric_core mo-rickywong/lfric_core@EnforcePartitionRestrictions False
SimSys_Scripts MetOffice/SimSys_Scripts@2025.12.1 True

Task Information

✅ succeeded tasks - 384

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Everything seems in order, just a minor comment

! Equal divisions are only required if there are maps between meshes
if (any_maps) then
if (check_constraints) then
call log_event("Performing partition constraints.", log_level_debug)

Choose a reason for hiding this comment

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

The print line should probably be: 'Checking partition constraints'

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Since the last time I looked at this code, the only thing that has been done has been updating to head of the trunk and addressing my comments. Rose stem tests also pass successfully. I am more than happy to approve.

@mike-hobson Mike Hobson (mike-hobson) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I have just a few comments that need some attention.

!> @param[in] num_cells_y The panel's size in the y direction
!> @param[in] any_maps Whether there exist maps between meshes that
!> must having aligning partitions
!> @param[in] check_constaints Check meshes have aligned partitions

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

"constaint" -> "constraint". But that will mess up the alignment of the other comments - so you may need to sort that, too. A search for "constaint" reveals 6 other mis-spellings in comments that need correcting, along with their associated alignments.

generate_inner_halos, &
partitioner_ptr )
partitioner_ptr, &
enforce_constraints )

Copy link
Copy Markdown
Contributor

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

! Equal divisions are only required if there are maps between meshes
if (any_maps) then
if (check_constraints) then
call log_event("Checking partition constraints.", log_level_debug)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Do we really need another debug log message for this?

max_stencil_depth, &
mapping_factor, &
generate_inner_halos, &
enforce_constraints, &

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

enforce_constraints needs a Doxygen comment.

decomposition, &
max_stencil_depth, &
generate_inner_halos, &
enforce_constraints, &

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Again, enforce_constraints needs a Doxygen comment.

max_stencil_depth, &
mapping_factor, &
generate_inner_halos, &
enforce_constraints, &

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Doxygen comment

@mike-hobson Mike Hobson (mike-hobson) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for those changes. They all look good, now. I'm happy to approve this for merging.

@mike-hobson
Mike Hobson (mike-hobson) merged commit a963e38 into MetOffice:main Apr 22, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants