Skip to content

Add path to UM physics includes#567

Open
Sam Clarke-Green (t00sa) wants to merge 2 commits into
MetOffice:mainfrom
t00sa:fix-physics-includes
Open

Add path to UM physics includes#567
Sam Clarke-Green (t00sa) wants to merge 2 commits into
MetOffice:mainfrom
t00sa:fix-physics-includes

Conversation

@t00sa

@t00sa Sam Clarke-Green (t00sa) commented Jun 26, 2026

Copy link
Copy Markdown
Collaborator

PR Summary

Sci/Tech Reviewer: Matthew Hambley (@MatthewHambley)
Code Reviewer: James Bruten (@james-bruten-mo)

Update pre-processor directives in former UM physics to add include directories to the paths of the header files.

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 Apps rose-stem suite
  • 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)

Test Suite Results - lfric_apps - Apps567/run1

Suite Information

Item Value
Suite Name Apps567/run1
Suite User sam.clarke
Workflow Start 2026-07-07T06:33:39
Groups Run all
Dependency Reference Main Like
casim MetOffice/casim@2026.03.2 True
jules MetOffice/jules@1ea67b4 True
lfric_apps t00sa/lfric_apps@fix-physics-includes False
lfric_core MetOffice/lfric_core@5d6b2db True
moci MetOffice/moci@2026.03.2 True
SimSys_Scripts MetOffice/SimSys_Scripts@3e2998b True
socrates MetOffice/socrates@2026.03.2 True
socrates-spectral MetOffice/socrates-spectral@2026.03.2 True
ukca MetOffice/ukca@1cdb9c2 True

Task Information

✅ succeeded tasks - 1594

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

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The change itself is fine, but since system testing is the primary route to validation I ask that you perform an "all" test and update the ticket with the result.

For the record, it might be worth mentioning why this change is worthwhile. In the past the UM code was built using the "FCM" tool. This copied anything it found in a directory called include to some central location which was then included on the compilers paths. Hence how these files could be found given the current filename only approach.

Obviously, looking at this change there is no longer any need for this magic as source only ever includes the files right next to them.

@Adrian-Lock Adrian Lock (Adrian-Lock) 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.

Fair enough!

@DanStoneMO DanStoneMO modified the milestone: Summer 2026 Jun 30, 2026
@t00sa

Copy link
Copy Markdown
Collaborator Author

I've merged the head on main into the branch and started a run of the all test group, as requested.

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.

6 participants