Merge branch 'main' into format-pr-template

Author: yaswant

.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 -->

.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"]
+  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

CONTRIBUTORS.md

@@ -3,11 +3,13 @@
 | --------------- | ---------------- | ----------- | ---------- |
 | 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 |
 | mike-hobson     | Mike Hobson      | Met Office  | 2025-12-17 |
 | MatthewHambley  | Matthew Hambley  | Met Office  | 2025-12-15 |
 | 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 |

applications/io_demo/source/algorithm/io_demo_constants_mod.x90

@@ -22,11 +22,11 @@ module io_demo_constants_mod
   use fs_continuity_mod,                  only: W2
   use function_space_collection_mod,      only: function_space_collection
   use function_space_mod,                 only: function_space_type
-  use io_config_mod,                      only: subroutine_timers
   use log_mod,                            only: log_event, LOG_LEVEL_TRACE, &
                                                 LOG_LEVEL_ERROR
   use mesh_mod,                           only: mesh_type
-  use timer_mod,                          only: timer
+  use timing_mod,                         only: start_timing, stop_timing, &
+                                                tik, LPROF
 
   ! Kernels
   use sci_calc_dA_at_w2_kernel_mod,           only: calc_dA_at_w2_kernel_type
@@ -61,8 +61,9 @@ contains
     type(mesh_type),    pointer, intent(in) :: mesh
     type(field_type),    target, intent(in) :: chi(:)
     type(field_type),    target, intent(in) :: panel_id
+    integer(tik)                            :: id
 
-    if ( subroutine_timers ) call timer('io_demo_constants_alg')
+    if ( LPROF ) call start_timing( id, 'io_demo_constants_alg' )
     call log_event( "io_demo: creating runtime constants", LOG_LEVEL_TRACE )
 
     !============================= dx_at_w2 setup =============================!
@@ -72,7 +73,7 @@ contains
     call log_event( "io_demo: runtime constants created", LOG_LEVEL_TRACE )
 
 
-    if ( subroutine_timers ) call timer('io_demo_constants_alg')
+    if ( LPROF ) call stop_timing( id, 'io_demo_constants_alg' )
     call log_event( "io_demo: created FEM constants", LOG_LEVEL_TRACE )
 
   end subroutine create_io_demo_constants

applications/io_demo/source/driver/multifile_io/multifile_io_mod.F90

@@ -22,7 +22,7 @@ module multifile_io_mod
   use inventory_by_mesh_mod,   only: inventory_by_mesh_type
   use io_context_collection_mod, only: io_context_collection_type
   use io_context_mod,          only: io_context_type, callback_clock_arg
-  use io_config_mod,           only: use_xios_io, subroutine_timers
+  use io_config_mod,           only: use_xios_io
   use log_mod,                 only: log_event, log_level_error, &
                                      log_level_trace, log_level_info, &
                                      log_scratch_space

applications/io_demo/source/io_demo.f90

@@ -21,16 +21,21 @@ program io_demo
                                           log_level_trace, &
                                           log_scratch_space
   use random_number_generator_mod, only : random_number_generator_type
-  use io_demo_mod,        only : io_demo_required_namelists
-  use io_demo_driver_mod, only : initialise, step, finalise
+  use io_demo_mod,                 only : io_demo_required_namelists
+  use io_demo_driver_mod,          only : initialise, step, finalise
+  use timing_mod,                  only : init_timing, final_timing
+  use io_config_mod,               only : timer_output_path
+  use namelist_mod,                only : namelist_type
 
   implicit none
 
   ! The technical and scientific state
-  type(modeldb_type)        :: modeldb
-  character(*), parameter   :: program_name = "io_demo"
-  character(:), allocatable :: filename
-  integer, parameter        :: default_seed = 123456789
+  type(modeldb_type)           :: modeldb
+  character(*), parameter      :: program_name = "io_demo"
+  character(:), allocatable    :: filename
+  type(namelist_type), pointer :: io_nml
+  logical                      :: lsubroutine_timers
+  integer, parameter           :: default_seed = 123456789
   type(random_number_generator_type), pointer :: rng
 
   call parse_command_line( filename )
@@ -49,6 +54,10 @@ program io_demo
   deallocate( filename )
 
   call init_logger( modeldb%mpi%get_comm(), program_name )
+  io_nml => modeldb%configuration%get_namelist('io')
+  call io_nml%get_value('subroutine_timers', lsubroutine_timers)
+  call init_timing( modeldb%mpi%get_comm(), lsubroutine_timers, program_name, timer_output_path )
+  nullify( io_nml )
   call init_collections()
   call init_time(modeldb)
 
@@ -70,6 +79,7 @@ program io_demo
   call finalise( program_name, modeldb )
   call final_time(modeldb)
   call final_collections()
+  call final_timing( program_name )
   call final_logger( program_name )
   call final_config()
   call final_comm( modeldb )

applications/simple_diffusion/source/algorithm/simple_diffusion_constants_mod.x90

@@ -22,11 +22,11 @@ module simple_diffusion_constants_mod
   use fs_continuity_mod,                  only: W2
   use function_space_collection_mod,      only: function_space_collection
   use function_space_mod,                 only: function_space_type
-  use io_config_mod,                      only: subroutine_timers
   use log_mod,                            only: log_event, LOG_LEVEL_TRACE, &
                                                 LOG_LEVEL_ERROR
   use mesh_mod,                           only: mesh_type
-  use timer_mod,                          only: timer
+  use timing_mod,                         only: start_timing, stop_timing, &
+                                                tik, LPROF
 
   ! Kernels
   use sci_calc_da_at_w2_kernel_mod,       only: calc_dA_at_w2_kernel_type
@@ -61,8 +61,9 @@ contains
     type(mesh_type),    pointer, intent(in) :: mesh
     type(field_type),    target, intent(in) :: chi(:)
     type(field_type),    target, intent(in) :: panel_id
+    integer(tik)                            :: id
 
-    if ( subroutine_timers ) call timer('simple_diffusion_constants_alg')
+    if ( LPROF ) call start_timing( id, 'simple_diffusion_constants_alg' )
     call log_event( "simple_diffusion: creating runtime constants", LOG_LEVEL_TRACE )
 
     !============================= dx_at_w2 setup =============================!
@@ -72,7 +73,7 @@ contains
     call log_event( "simple_diffusion: runtime constants created", LOG_LEVEL_TRACE )
 
 
-    if ( subroutine_timers ) call timer('simple_diffusion_constants_alg')
+    if ( LPROF ) call stop_timing( id, 'simple_diffusion_constants_alg' )
     call log_event( "simple_diffusion: created FEM constants", LOG_LEVEL_TRACE )
 
   end subroutine create_simple_diffusion_constants

applications/skeleton/source/algorithm/skeleton_constants_mod.x90

@@ -22,14 +22,14 @@ module skeleton_constants_mod
   use function_space_collection_mod,      only: function_space_collection
   use function_space_mod,                 only: function_space_type
   use inventory_by_mesh_mod,              only: inventory_by_mesh_type
-  use io_config_mod,                      only: subroutine_timers
   use log_mod,                            only: log_event, LOG_LEVEL_INFO, &
                                                 LOG_LEVEL_ERROR
   use mesh_mod,                           only: mesh_type
   use operator_mod,                       only: operator_type
   use quadrature_xyoz_mod,                only: quadrature_xyoz_type
   use quadrature_rule_gaussian_mod,       only: quadrature_rule_gaussian_type
-  use timer_mod,                          only: timer
+  use timing_mod,                         only: start_timing, stop_timing, &
+                                                tik, LPROF
 
   ! Configuration
   use finite_element_config_mod,          only: element_order_h, &
@@ -109,8 +109,9 @@ contains
     type(function_space_type), pointer :: w2v_fs    => null()
     type(function_space_type), pointer :: w3_fs     => null()
     type(function_space_type), pointer :: wtheta_fs => null()
+    integer(tik)                       :: id
 
-    if ( subroutine_timers ) call timer('skeleton_constants_alg')
+    if ( LPROF ) call start_timing( id, 'skeleton_constants_alg' )
     call log_event( "Skeleton: creating runtime constants", LOG_LEVEL_INFO )
 
     !======================== Create quadrature object ========================!
@@ -178,7 +179,7 @@ contains
              mm_w0, mm_w1, mm_w2, mm_w2b, mm_w3, mm_wtheta, grad, curl, div, &
              broken_div )
 
-    if ( subroutine_timers ) call timer('skeleton_constants_alg')
+    if ( LPROF ) call stop_timing( id, 'skeleton_constants_alg' )
     call log_event( "Skeleton: created FEM constants", LOG_LEVEL_INFO )
 
   end subroutine create_skeleton_constants