Main to Stable 2026.03.1

.gitattributes

@@ -9,16 +9,16 @@
 # Fortran files
 *.f   text diff=fortran
 *.for text diff=fortran
-*.f90 text diff=fortran
-*.F90 text diff=fortran
-*.f95 text diff=fortran
-*.f03 text diff=fortran
-*.x90 text diff=fortran
-*.X90 text diff=fortran
-*.t90 text diff=fortran
-*.T90 text diff=fortran
-*.pf  text diff=fortran
-*.PF  text diff=fortran
+*.f90 text diff=fortran-free-form
+*.F90 text diff=fortran-free-form
+*.f95 text diff=fortran-free-form
+*.f03 text diff=fortran-free-form
+*.x90 text diff=fortran-free-form
+*.X90 text diff=fortran-free-form
+*.t90 text diff=fortran-free-form
+*.T90 text diff=fortran-free-form
+*.pf  text diff=fortran-free-form
+*.PF  text diff=fortran-free-form
 
 # Enable syntax highlighting for files with `.pf` extensions.
 #

.github/CODEOWNERS

@@ -1,3 +1,80 @@
-**/jules_interface/rose-meta @maggiehendry
-**/jedi_lfric* @MetOffice/r2o
-**/linear* @MetOffice/r2o
+# This CODEOWNERS file includes a primary codeowner and a deputy for each section. 
+# Codeowners who are not in a comment will be automatically notified of changes
+# to the listed files. All codeowners listed are valid points of contact
+# for discussing changes and seeking approval for work. 
+
+# Applications
+**/adjoint_tests             @DrTVockerodtMO                     # @mo-joshuacolclough
+**/gravity_wave              @thomasmelvin                       # @cjohnson-pi
+**/gungho_model              @thomasmelvin                       # @BShipway
+**/jedi_lfric_tests          @ss421  @matthewrmshin @MetOffice/r2o-systems
+**/jules                     @iboutle                            # @MetOfficessdtesam
+**/lfric2lfric               @mo-lottieturner                    # @mike-hobson
+**/lfricinputs               @mo-lottieturner                    # @mike-hobson
+**/lfric_atm                 @iboutle                            # @BShipway
+**/lfric_coupled             @HengistPodd                        # @BShipway
+**/lfricinputs               @mo-lottieturner                    # @mike-hobson
+**/linear_model              @cjohnson-pi @MetOffice/r2o-systems  # @tommbendall  # Also notifiy jedi team about linear changes.
+**/name_transport            @jameskent-metoffice                # @tommbendall
+**/ngarch                    @christophermaynard                 # @jcsmeto
+**/shallow_water             @jameskent-metoffice                # @atb1995
+**/solver                    @christophermaynard                 # @thomasmelvin
+**/transport                 @tommbendall                        # @jameskent-metoffice
+
+# Science
+**/adjoint                              @DrTVockerodtMO                     # @mo-joshuacolclough
+**/linear                               @cjohnson-pi  @MetOffice/r2o-systems # @tommbendall # Also notifiy jedi team about linear changes.
+science/shared/source/constants/        @iboutle                            # @BShipway
+
+**/gungho                               @thomasmelvin                       # @iboutle
+science/gungho/**/configuration/        @jameskent-metoffice                # @thomasmelvin
+science/gungho/**/core_dynamics/        @jameskent-metoffice                # @thomasmelvin
+science/gungho/**/diagnostics/          @atb1995                            # @iboutle
+science/gungho/**/diffusion/            @iboutle                            # @tommbendall
+science/gungho/**/driver/               @MetOffice/core-capability-development
+science/gungho/**/external_forcing/     @iboutle                            # @tommbendall
+science/gungho/**/initialisation/       @mo-cjsmith                         # @thomasmelvin
+science/gungho/**/limited_area/         @cjohnson-pi                        # @thomasmelvin
+science/gungho/**/orography/            @atb1995                            # @tommbendall
+science/gungho/**/physics/              @iboutle                            # @tommbendall
+science/gungho/**/psy/                  @thomasmelvin                       # @tommbendall
+science/gungho/**/runtime_constants/    @tommbendall                        # @atb1995
+science/gungho/**/solver/               @thomasmelvin                       # @tommbendall
+science/gungho/**/timestepping/         @thomasmelvin                       # @jameskent-metoffice
+science/gungho/**/transport/            @tommbendall                        # @jameskent-metoffice
+
+**/physics_schemes                                      @iboutle            # @MetOffice/ssdteam
+science/physics_schemes/**/boundary_layer               @Adrian-Lock        # @P-Burns
+science/physics_schemes/**/convection                   @MichaelWhitall
+science/physics_schemes/**/convection/comorph           @MichaelWhitall
+science/physics_schemes/**/large_scale_cloud            @paul-barrett       # @CyrilMorcrette
+science/physics_schemes/**/large_scale_precipitation    @paulfield2024      # @paul-barrett
+science/physics_schemes/**/radiation_control            @mo-jmanners        # @Petzi1
+science/physics_schemes/**/stochastic_physics           @wjtmo              # @annemccabe
+
+# Interfaces
+**/coupled_interface            @mike-hobson                        # @harry-shepherd
+**/jedi_lfric_interface         @ss421  @matthewrmshin @MetOffice/r2o-systems
+**/jules_interface              @iboutle                            # @MetOfficessdteam
+**/jules_interface/rose-meta    @maggiehendry
+**/physics_schemes_interface    @iboutle                            # @MetOfficessdteam
+**/socrates_interface           @mo-jmanners                        # @Petzi1
+
+# System Components
+rose-stem/templates/                   @james-bruten-mo                    # @jennyhickson
+rose-stem/lib/                         @james-bruten-mo                    # @jennyhickson
+rose-stem/bin/                         @james-bruten-mo                    # @jennyhickson
+rose-stem/site/meto/common/            @james-bruten-mo                    # @jennyhickson
+rose-stem/site/meto/macros/            @james-bruten-mo                    # @jennyhickson
+rose-stem/apps                         # Mostly updated by macros, no codeowner
+**/versions.py                         @james-bruten-mo                    # @jennyhickson
+build/                                 @MetOffice/ssdteam @hiker
+**/*Makefile                           @MatthewHambley @hiker
+**/*.mk                                @MatthewHambley @hiker
+**/optimisation                        @christophermaynard                 # HPC Optimisation Team
+
+# Other areas
+documentation                           # @MetOffice/ssdteam
+.github/                                @MetOffice/ssdteam
+LICENSE                                 @yaswant
+README.md                               @MetOffice/ssdteam

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,15 +6,8 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: input
-    id: contact
-    attributes:
-      label: Contact Details
-      description: How can we get in touch with you if we need more info?
-      placeholder: e.g. email@example.com @octocat
-    validations:
-      required: false
+        Thanks for taking the time to fill out this bug report! _If you are planning 
+        to work on this issue, then please assign yourself to it._
   - type: dropdown
     id: version
     attributes:
@@ -24,7 +17,7 @@ body:
         - main
       default: 0
     validations:
-      required: true      
+      required: true
   - type: input
     id: linked-issues
     attributes:

.github/ISSUE_TEMPLATE/custom_issue.yml

@@ -6,15 +6,8 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to help improve LFRic Apps.
-  - type: input
-    id: contact
-    attributes:
-      label: Contact Details
-      description: How can we get in touch with you if we need more info?
-      placeholder: e.g. email@example.com @octocat
-    validations:
-      required: false
+        Thanks for taking the time to help improve LFRic Apps. _If you are planning 
+        to work on this issue, then please assign yourself to it._
   - type: input
     id: linked-issues
     attributes:

.github/ISSUE_TEMPLATE/documentation.yml

@@ -1,20 +1,13 @@
 name: Documentation Issue
-description: Report an issue with the LFRic Apps documentation or suggest an improvement.  
+description: Report an issue with the LFRic Apps documentation or suggest an improvement.
 labels: ["documentation"]
 type: task
 body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to help improve the LFRic Apps documentation.
-  - type: input
-    id: contact
-    attributes:
-      label: Contact Details
-      description: How can we get in touch with you if we need more info?
-      placeholder: e.g. email@example.com @octocat
-    validations:
-      required: false
+        Thanks for taking the time to help improve the LFRic Apps documentation. 
+        _If you are planning to work on this issue, then please assign yourself to it._
   - type: input
     id: linked-issues
     attributes:

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 # PR Summary
 
-Sci/Tech Reviewer: <!-- SR id, filled when known (e.g. @octocat) -->
+Sci/Tech Reviewer: <!-- SR id, filled by author when ready for review (e.g. @octocat) -->
 Code Reviewer: <!-- CR id, filled by SSD/CCD (e.g. @octocat) -->
 
 <!-- To be completed by the developer -->
@@ -22,26 +22,18 @@ Code Reviewer: <!-- CR id, filled by SSD/CCD (e.g. @octocat) -->
 
 ## Code Quality Checklist
 
-(_Some checks are automatically carried out via the CI pipeline_)
-
 - [ ] I have performed a self-review of my own code
-- [ ] My code follows the project's style guidelines
-      [style guidelines](https://metoffice.github.io/lfric_core/how_to_contribute/index.html#how-to-contribute-index)
-- [ ] Comments have been included that aid undertanding and enhance the
-      readability of the code
+- [ ] My code follows the project's [style guidelines](https://metoffice.github.io/lfric_core/how_to_contribute/index.html#how-to-contribute-index)
+- [ ] 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 (eg. kgo changes)
-- [ ] I have added tests to cover new functionality as appropriate (eg. system
-      tests, unit tests, etc.)
-- [ ] Any new tests have been assigned an appropriate amount of compute resource
-      and have tests 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)
+- [ ] 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)
 
 <!-- Describe other testing performed (if applicable) -->
 
@@ -57,30 +49,21 @@ Code Reviewer: <!-- CR id, filled by SSD/CCD (e.g. @octocat) -->
 
 ## Performance Impact
 
-- [ ] Performance of the code has been considered and, if applicable, suitable
-      performance measurements have been conducted
+- [ ] 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](https://metoffice.github.io/simulation-systems/FurtherDetails/ai.html)
-      (including attribution labels)
+- [ ] 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](https://metoffice.github.io/simulation-systems/FurtherDetails/ai.html) (including attribution labels)
 
 <!-- If AI has been used, please provide more details here -->
 
 ## Documentation
 
-- [ ] Where appropriate I have updated documentation related to this change and
-      confirmed that it builds correctly
+- [ ] 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 (eg. PsyKAl-lite, Kernal
-      inteface, optimisation scripts, LFRic data structure code) then please
-      contact the
-      [tooscollabdevteam@metoffice.gov.uk](tooscollabdevteam@metoffice.gov.uk)
+- [ ] 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](mailto:ToolsCollabDevTeam@metoffice.gov.uk)
 
 # Sci/Tech Review
 
@@ -92,7 +75,7 @@ Code Reviewer: <!-- CR id, filled by SSD/CCD (e.g. @octocat) -->
 - [ ] 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_
+(_Please alert the code reviewer via a tag when you have approved the SR_)
 
 # Code Review
 

.github/workflows/block-stable-base.yaml

@@ -0,0 +1,25 @@
+# -----------------------------------------------------------------------------
+# (C) Crown copyright Met Office. All rights reserved.
+# The file LICENCE, distributed with this code, contains details of the terms
+# under which the code may be used.
+# -----------------------------------------------------------------------------
+
+# Block merges to the stable branch via pull requests
+
+name: Block PR to Stable
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+      - stable
+
+jobs:
+  block-merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Block merge to stable branch
+        run: |
+          echo "::error::Direct merges to the stable branch are not allowed."
+          echo "::error::Please target a different branch for your pull request."
+          exit 1

.github/workflows/ci.yml → .github/workflows/ci_docs.yml

@@ -4,13 +4,16 @@
 #  under which the code may be used.
 # ------------------------------------------------------------------------------
 
-name: ci
-run-name: CI
+name: Documentation
+run-name: Docs Build and Deploy - ${{ github.ref_name }}
 
 on:
   push:
     branches:
       - main
+    paths:
+      - 'documentation/**'
+      - '.github/workflows/**'       
 
 concurrency:
   group: ${{ github.workflow }}-${{github.ref}}

.github/workflows/pr.yml → .github/workflows/pr_docs.yml

@@ -4,12 +4,15 @@
 #  under which the code may be used.
 # ------------------------------------------------------------------------------
 
-name: pr
-run-name: Pull Request ${{github.event.pull_request.number}}
+name: Docs Build for Pull Requests
+run-name: Docs build PR${{github.event.pull_request.number}}
 on:
   pull_request:
     branches:
       - main
+    paths:
+      - 'documentation/**'
+      - '.github/workflows/**'       
 
 concurrency:
   group: pr-${{github.ref}}-${{github.event.pull_request.number || github.run_number}}

.github/workflows/ru_deploy-docs.yml

@@ -11,6 +11,7 @@ on:
 
 jobs:
   deploy:
+    if: ${{ github.repository == 'MetOffice/lfric_apps' }}
     environment:
       name: github-pages
     permissions:

.github/workflows/track-review-project.yaml

@@ -0,0 +1,17 @@
+name: Track Review Project
+
+on:
+  workflow_run:
+    workflows: [Trigger Review Project]
+    types:
+      - completed
+
+permissions:
+  actions: read
+  contents: read
+  pull-requests: write
+
+jobs:
+  track_review_project:
+    uses: MetOffice/growss/.github/workflows/track-review-project.yaml@main
+    secrets: inherit

.github/workflows/trigger-project-workflow.yaml

@@ -0,0 +1,17 @@
+name: Trigger Review Project
+
+on:
+  pull_request_target:
+    types: ["opened", "synchronize", "reopened", "edited", "review_requested", "review_request_removed", "closed"]
+  pull_request_review:
+  pull_request_review_comment:
+
+permissions:
+  actions: read
+  contents: read
+  pull-requests: write
+
+jobs:
+  trigger_project_workflow:
+    uses: MetOffice/growss/.github/workflows/trigger-project-workflow.yaml@main
+    secrets: inherit

.gitignore

@@ -56,7 +56,15 @@ __pycache__
 
 # LFRic CL Builds
 applications/**/bin
+applications/**/documents
 applications/**/working
+applications/**/test
 applications/**/example*/
 science/**/bin
+science/**/documents
 science/**/working
+science/**/test
+interfaces/**/bin
+interfaces/**/documents
+interfaces/**/working
+interfaces/**/test