Main to Stable 2026.07.1

.github/workflows/lint-fortran.yaml

@@ -0,0 +1,10 @@
+name: Lint Fortran
+
+on:
+  pull_request_target:
+
+jobs:
+  fortitude-lint:
+    uses: MetOffice/growss/.github/workflows/fortran-lint.yaml@main
+    with:
+      runner: 'ubuntu-24.04'

.github/workflows/validate_symlinks.yaml

@@ -0,0 +1,10 @@
+name: Validate Symlinks
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
+
+jobs:
+  validate_symlinks:
+    uses: MetOffice/growss/.github/workflows/validate_symlinks.yaml@main

.gitignore

@@ -57,9 +57,11 @@ __pycache__
 # LFRic CL Builds
 applications/**/bin
 applications/**/working
+applications/**/fab-workspace
 applications/**/test
 applications/**/documents
 applications/**/example*/
+applications/**/fab-workspace/
 mesh_tools/**/bin
 mesh_tools/**/working
 mesh_tools/**/test

CONTRIBUTORS.md

@@ -1,25 +1,36 @@
-# Contributors
-
-| GitHub user      | Real Name              | Affiliation | Date       |
-| ---------------- | ---------------------- | ----------- | ---------- |
-| andrewcoughtrie  | Andrew Coughtrie       | Met Office  | 2025.12.12 |
-| james-bruten-mo  | James Bruten           | Met Office  | 2025-12-09 |
-| jedbakerMO       | Jed Baker              | Met Office  | 2025-12-29 |
-| jennyhickson     | Jenny Hickson          | Met Office  | 2025-12-10 |
-| mo-marqh         | Mark Hedley            | Met Office  | 2025-12-11 |
-| mo-rickywong     | Ricky Wong             | Met Office  | 2025-01-30 |
-| mike-hobson      | Mike Hobson            | Met Office  | 2025-12-17 |
-| MatthewHambley   | Matthew Hambley        | Met Office  | 2025-12-15 |
-| mo-lottieturner  | Lottie Turner          | Met Office  | 2025-12-16 |
-| tommbendall      | Thomas Bendall         | Met Office  | 2026-01-23 |
-| yaswant          | Yaswant Pradhan        | Met Office  | 2025-12-16 |
-| stevemullerworth | Steve Mullerworth      | Met Office  | 2026-01-08 |
-| harry-shepherd   | Harry Shepherd         | Met Office  | 2026-01-08 |
-| EdHone           | Ed Hone                | Met Office  | 2026-01-09 |
-| tom-j-h          | Tom Hill               | Met Office  | 2026-01-19 |
-| mo-alistairp     | Alistair Pirrie        | Met Office  | 2026-01-12 |
-| t00sa            | Sam Clarke-Green       | Met Office  | 2026-01-27 |
-| MetBenjaminWent  | Benjamin Went          | Met Office  | 2026-01-30 |
-| jcsmeto          | James Cunningham-Smith | Met Office  | 2026-02-06 |
-| thomasmelvin     | Thomas Melvin          | Met Office  | 2026-01-15 |
-| ericaneininger   | Erica Neininger        | Met Office  | 2026-03-02 |
+| GitHub user      | Real Name              | Affiliation           | Date       |
+| ---------------- | -----------------      | --------------------- | ---------- |
+| iboutle          | Ian Boutle             | Met Office            | 2026-03-06 |
+| andrewcoughtrie  | Andrew Coughtrie       | Met Office            | 2025.12.12 |
+| james-bruten-mo  | James Bruten           | Met Office            | 2025-12-09 |
+| jedbakerMO       | Jed Baker              | Met Office            | 2025-12-29 |
+| jennyhickson     | Jenny Hickson          | Met Office            | 2025-12-10 |
+| mo-marqh         | Mark Hedley            | Met Office            | 2025-12-11 |
+| mo-rickywong     | Ricky Wong             | Met Office            | 2025-01-30 |
+| mike-hobson      | Mike Hobson            | Met Office            | 2025-12-17 |
+| MatthewHambley   | Matthew Hambley        | Met Office            | 2025-12-15 |
+| mo-lottieturner  | Lottie Turner          | Met Office            | 2025-12-16 |
+| tommbendall      | Thomas Bendall         | Met Office            | 2026-01-23 |
+| yaswant          | Yaswant Pradhan        | Met Office            | 2025-12-16 |
+| stevemullerworth | Steve Mullerworth      | Met Office            | 2026-01-08 |
+| harry-shepherd   | Harry Shepherd         | Met Office            | 2026-01-08 |
+| Pierre-siddall   | Pierre Siddall         | Met Office            | 2026-01-29 |
+| EdHone           | Ed Hone                | Met Office            | 2026-01-09 |
+| tom-j-h          | Tom Hill               | Met Office            | 2026-01-19 |
+| mo-alistairp     | Alistair Pirrie        | Met Office            | 2026-01-12 |
+| t00sa            | Sam Clarke-Green       | Met Office            | 2026-01-27 |
+| MetBenjaminWent  | Benjamin Went          | Met Office            | 2026-01-30 |
+| jcsmeto          | James Cunningham-Smith | Met Office            | 2026-02-06 |
+| thomasmelvin     | Thomas Melvin          | Met Office            | 2026-01-15 |
+| ericaneininger   | Erica Neininger        | Met Office            | 2026-03-02 |
+| mo-lucy-gordon   | Lucy Gordon            | Met Office            | 2026-03-18 |
+| shreybh1         | Shrey Bhardwaj         | Met Office            | 2026-03-26 |
+| hiker            | Joerg Henrichs         | Bureau of Meteorology | 2026-02-11 |
+| sergisiso        | Sergi Siso             | UKRI-STFC             | 2026-04-20 |
+| mattatmet        | Matthew Walker         | Met Office            | 2026-04-21 |
+| timgraham-Met    | Tim Graham             | Met Office            | 2026-05-20 |
+| tinyendian       | Wolfgang Hayek         | Earth Sciences New Zealand | 2026-05-04 |
+| Adrian-Lock      | Adrian Lock            | Met Office            | 2026-05-21 |
+| ukmo-juan-castillo  | Juan M. Castillo    | Met Office            | 2026-03-24 |
+| mcdalvi          | Mohit Dalvi            | Met Office            | 2026-06-19 |
+| cjohnson-pi      | Christine Johnson      | Met Office            | 2026-06-29 |

Makefile

@@ -22,6 +22,7 @@ OPERATE_ON ?= infrastructure                \
               mesh_tools                    \
               applications/skeleton         \
               applications/simple_diffusion \
+              applications/coupled          \
               applications/lbc_demo         \
               applications/io_demo
 

applications/coupled/documentation/mainpage.md

@@ -26,6 +26,6 @@ operations which can be specified within an invoke call in the algorithm layer b
 directly by the infrastructure.
 
 For more up-to-date information about the <b>LFRic-specific Built-ins</b> functionality (e.g. names, argument order) please refer to the 
-<a href="https://github.com/stfc/PSyclone/blob/master/doc/dynamo0p3.rst#built-ins">dynamo 0.3 API Built-ins documentation</a>.
+<a href="https://github.com/stfc/PSyclone/blob/master/doc/user_guide/lfric.rst#built-ins">dynamo 0.3 API Built-ins documentation</a>.
 
 

applications/coupled/example/configuration_glo.nml

@@ -21,6 +21,8 @@ element_order_h=0,
 element_order_v=0,
 rehabilitate=.true.,
 coord_order=1
+coord_order_nonprime=1
+coord_space='Wchi'
 coord_system='native'
 /
 
@@ -58,6 +60,9 @@ coord_system='native'
 &partitioning
   partitioner='cubedsphere',
   panel_decomposition = 'auto',
+  tile_size_x=1,
+  tile_size_y=1,
+  inner_halo_tiles=.false.
 /
 
 &planet

applications/coupled/example/configuration_lam.nml

@@ -20,6 +20,8 @@ element_order_h=0,
 element_order_v=0,
 rehabilitate=.true.,
 coord_order=1
+coord_order_nonprime=1
+coord_space='Wchi'
 coord_system='native'
 /
 
@@ -57,6 +59,9 @@ coord_system='native'
 &partitioning
   partitioner='planar',
   panel_decomposition = 'auto',
+  tile_size_x=1,
+  tile_size_y=1,
+  inner_halo_tiles=.false.
 /
 
 &planet

applications/coupled/example/iodef.xml

@@ -59,7 +59,6 @@
     <variable_definition>
       <variable_group id = "buffer">
         <variable id = "optimal_buffer_size" type = "string" >performance</variable>
-        <variable id = "buffer_factor_size" type = "double" >1.0</variable>
       </variable_group>
 
       <variable_group id = "parameters" >

applications/coupled/rose-meta/lfric-coupled/version31_32.py

@@ -0,0 +1,100 @@
+import re
+import sys
+
+from metomi.rose.upgrade import MacroUpgrade  # noqa: F401
+
+from .version30_31 import *
+
+
+class UpgradeError(Exception):
+    """Exception created when an upgrade fails."""
+
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __repr__(self):
+        sys.tracebacklimit = 0
+        return self.msg
+
+    __str__ = __repr__
+
+
+"""
+Copy this template and complete to add your macro
+class vnXX_txxx(MacroUpgrade):
+    # Upgrade macro for <TICKET> by <Author>
+    BEFORE_TAG = "vnX.X"
+    AFTER_TAG = "vnX.X_txxx"
+    def upgrade(self, config, meta_config=None):
+        # Add settings
+        return config, self.reports
+"""
+
+
+class vn31_t238(MacroUpgrade):
+    """Upgrade macro for ticket #238 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t238"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-driver
+        self.add_setting(
+            config, ["namelist:finite_element", "coord_space"], "'Wchi'"
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        self.add_setting(
+            config,
+            ["namelist:finite_element", "coord_order_nonprime"],
+            coord_order,
+        )
+        return config, self.reports
+
+
+class vn31_t324(MacroUpgrade):
+    """Upgrade macro for ticket #324 by Ricky Wong."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t324"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-driver
+        # Only add in new configuration settings if the namelists
+        # are already present
+        #
+        if config.get(["namelist:partitioning"]) is not None:
+            self.add_setting(
+                config, ["namelist:partitioning", "inner_halo_tiles"], ".false."
+            )
+            self.add_setting(
+                config, ["namelist:partitioning", "tile_size_x"], "1"
+            )
+            self.add_setting(
+                config, ["namelist:partitioning", "tile_size_y"], "1"
+            )
+        if config.get(["namelist:multigrid"]) is not None:
+            self.add_setting(
+                config,
+                ["namelist:multigrid", "coarsen_multigrid_tiles"],
+                ".false.",
+            )
+            self.add_setting(
+                config, ["namelist:multigrid", "max_tiled_multigrid_level"], "1"
+            )
+        return config, self.reports
+
+
+class vn31_t611(MacroUpgrade):
+    """Upgrade macro for ticket TTTT by Unknown."""
+
+    BEFORE_TAG = "vn3.1_t324"
+    AFTER_TAG = "vn3.2"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-driver
+        # Blank Upgrade Macro
+        # Commands From: rose-meta/lfric-coupled
+        # Blank Upgrade Macro
+        return config, self.reports

applications/coupled/rose-meta/lfric-coupled/versions.py

@@ -2,7 +2,7 @@
 
 from metomi.rose.upgrade import MacroUpgrade  # noqa: F401
 
-from .version30_31 import *
+from .version31_32 import *
 
 
 class UpgradeError(Exception):

applications/coupled/rose-meta/lfric-coupled/vn3.2/rose-meta.conf

@@ -0,0 +1 @@
+import=lfric-driver/vn3.2

applications/coupled/source/coupled.f90

@@ -41,27 +41,24 @@ program coupled
   call parse_command_line( filename, component_name=cpl_component_name )
 
   call modeldb%values%initialise( 'values', 5 )
-
-  call modeldb%configuration%initialise( program_name, table_len=10 )
   call modeldb%config%initialise( program_name )
-
-  write(log_scratch_space,'(A)')                          &
-      'Application built with '// trim(precision_real) // &
-      '-bit real numbers.'
-  call log_event( log_scratch_space, log_level_trace )
+  call modeldb%values%add_key_value('cpl_name', cpl_component_name)
 
   modeldb%mpi => global_mpi
 
-  call modeldb%values%add_key_value('cpl_name', cpl_component_name)
   call init_comm( "coupled", modeldb )
-
-  call init_config( filename,                            &
-                    coupled_required_namelists,          &
-                    configuration=modeldb%configuration, &
+  call init_config( filename, coupled_required_namelists, &
                     config=modeldb%config )
 
-  call init_logger( modeldb%mpi%get_comm(), &
+  call init_logger( modeldb%config, &
+                    modeldb%mpi%get_comm(), &
                     program_name//"_"//cpl_component_name )
+
+  write(log_scratch_space,'(A)')                          &
+      'Application built with '// trim(precision_real) // &
+      '-bit real numbers.'
+  call log_event( log_scratch_space, log_level_trace )
+
   call init_collections()
   call init_time( modeldb )
   deallocate( filename )

applications/coupled/source/driver/coupled_driver_mod.f90

@@ -75,11 +75,17 @@ subroutine initialise( program_name, modeldb, calendar )
     integer(i_def) :: geometry
     integer(i_def) :: method
     integer(i_def) :: number_of_layers
+    integer(i_def) :: tile_size_x
+    integer(i_def) :: tile_size_y
     real(r_def)    :: domain_bottom
     real(r_def)    :: domain_height
     real(r_def)    :: scaled_radius
-    logical        :: apply_partition_check
+    logical        :: check_partitions
 
+    logical :: inner_halo_tiles
+    logical :: prepartitioned
+
+    integer(i_def), allocatable :: tile_size(:,:)
     integer(i_def) :: i
     integer(i_def), parameter :: one_layer = 1_i_def
 
@@ -91,6 +97,17 @@ subroutine initialise( program_name, modeldb, calendar )
     domain_height    = modeldb%config%extrusion%domain_height()
     number_of_layers = modeldb%config%extrusion%number_of_layers()
     scaled_radius    = modeldb%config%planet%scaled_radius()
+    prepartitioned   = modeldb%config%base_mesh%prepartitioned()
+
+    if (prepartitioned) then
+      tile_size_x = 1
+      tile_size_y = 1
+      inner_halo_tiles = .false.
+    else
+      tile_size_x = maxval([1,modeldb%config%partitioning%tile_size_x()])
+      tile_size_y = maxval([1,modeldb%config%partitioning%tile_size_y()])
+      inner_halo_tiles = modeldb%config%partitioning%inner_halo_tiles()
+    end if
 
     ! Initialise mesh
     ! Determine the required meshes
@@ -119,24 +136,30 @@ subroutine initialise( program_name, modeldb, calendar )
 
     ! Create the required meshes
     stencil_depth = 1
-    apply_partition_check = .false.
-    call init_mesh( modeldb%configuration,       &
+    check_partitions = .false.
+    allocate(tile_size(2,size(base_mesh_names)))
+    tile_size(1,:) = tile_size_x
+    tile_size(2,:) = tile_size_y
+    call init_mesh( modeldb%config,              &
                     modeldb%mpi%get_comm_rank(), &
                     modeldb%mpi%get_comm_size(), &
                     base_mesh_names, extrusion,  &
-                    stencil_depth, apply_partition_check )
+                    inner_halo_tiles, tile_size, &
+                    stencil_depth, check_partitions )
 
     allocate( twod_names, source=base_mesh_names )
     do i=1, size(twod_names)
       twod_names(i) = trim(twod_names(i))//'_2d'
     end do
+
     call create_mesh( base_mesh_names, extrusion_2d, &
+                      inner_halo_tiles, tile_size,   &
                       alt_name=twod_names )
     call assign_mesh_maps( twod_names )
 
 
     ! Build the FEM function spaces and coordinate fields
-    call init_fem( mesh_collection, chi_inventory, panel_id_inventory )
+    call init_fem( modeldb%config, chi_inventory, panel_id_inventory )
 
     ! Create and initialise prognostic fields
     mesh => mesh_collection%get_mesh(prime_mesh_name)
@@ -188,7 +211,7 @@ subroutine finalise( program_name, modeldb )
     depository => modeldb%fields%get_field_collection("depository")
     call depository%get_field("field_2", field_2)
 
-    ! Write checksum of coupled field (on incoming component) to file 
+    ! Write checksum of coupled field (on incoming component) to file
     call modeldb%values%get_value("cpl_name", cpl_component_name)
     if (trim(cpl_component_name) == "lfric_i") then
       call checksum_alg(program_name, field_2, 'coupled_field_2')