From 0ec2417403627c0b4b31517c754057b4f44ec9a3 Mon Sep 17 00:00:00 2001 From: Paul Earnshaw <2195185+pdearnshaw@users.noreply.github.com> Date: Wed, 7 Jan 2026 13:28:21 +0000 Subject: [PATCH 1/4] Copied in changes from head of final subversion branch. --- applications/lfric_atm/Makefile | 9 +++++++++ .../lfric_atm/source/{lfric_atm.f90 => lfric_atm.F90} | 6 ++++++ 2 files changed, 15 insertions(+) rename applications/lfric_atm/source/{lfric_atm.f90 => lfric_atm.F90} (97%) diff --git a/applications/lfric_atm/Makefile b/applications/lfric_atm/Makefile index 98f689dee..953d89651 100644 --- a/applications/lfric_atm/Makefile +++ b/applications/lfric_atm/Makefile @@ -43,6 +43,15 @@ export INTERNAL_DEPENDENCIES = $(CORE_ROOT_DIR)/infrastructure \ $(APPS_ROOT_DIR)/interfaces/jules_interface \ $(APPS_ROOT_DIR)/interfaces/physics_schemes_interface +# If the COUPLED compiler directive has been set then add appropriate +# coupled model settings +ifdef COUPLED + ifeq ("$(COUPLED)","True") + export INTERNAL_DEPENDENCIES += $(CORE_ROOT_DIR)/components/coupling + export PRE_PROCESS_MACROS += MCT COUPLED + endif +endif + META_VN ?= HEAD export META_FILE_DIR = $(PROJECT_DIR)/rose-meta/lfric-$(PROJECT_NAME)/$(META_VN) diff --git a/applications/lfric_atm/source/lfric_atm.f90 b/applications/lfric_atm/source/lfric_atm.F90 similarity index 97% rename from applications/lfric_atm/source/lfric_atm.f90 rename to applications/lfric_atm/source/lfric_atm.F90 index e9b74a91a..6b301fad4 100644 --- a/applications/lfric_atm/source/lfric_atm.f90 +++ b/applications/lfric_atm/source/lfric_atm.F90 @@ -17,6 +17,9 @@ program lfric_atm use cli_mod, only: get_initial_filename +#ifdef MCT + use coupler_mod, only: set_cpl_name +#endif use driver_collections_mod, only: init_collections, final_collections use driver_comm_mod, only: init_comm, final_comm use driver_config_mod, only: init_config, final_config @@ -66,6 +69,9 @@ program lfric_atm call modeldb%io_contexts%initialise(application_name, 100) +#ifdef MCT + call set_cpl_name(modeldb, cpl_component_name) +#endif call init_comm( application_name, modeldb ) call get_initial_filename( filename ) call init_config( filename, gungho_required_namelists, & From d53ad328a28e36b8f7536cec7d314ee7c90e8501 Mon Sep 17 00:00:00 2001 From: Paul Earnshaw <2195185+pdearnshaw@users.noreply.github.com> Date: Tue, 20 Jan 2026 09:21:48 +0000 Subject: [PATCH 2/4] Added missing variable for coupled model configurations. --- applications/lfric_atm/source/lfric_atm.F90 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/applications/lfric_atm/source/lfric_atm.F90 b/applications/lfric_atm/source/lfric_atm.F90 index 6b301fad4..84f58ee5d 100644 --- a/applications/lfric_atm/source/lfric_atm.F90 +++ b/applications/lfric_atm/source/lfric_atm.F90 @@ -41,6 +41,9 @@ program lfric_atm type(modeldb_type) :: modeldb character(*), parameter :: application_name = "lfric_atm" +#ifdef MCT + character(*), parameter :: cpl_component_name = "lfric" +#endif character(:), allocatable :: filename integer(tik) :: timing_handle_global type(namelist_type), pointer :: io_nml From ffd66a8eba30c0be1386acae5b1b84242ea8f508 Mon Sep 17 00:00:00 2001 From: Paul Earnshaw <2195185+pdearnshaw@users.noreply.github.com> Date: Tue, 21 Apr 2026 11:32:28 +0100 Subject: [PATCH 3/4] #92. Fixed some changes from attempt to merge in stable, which actually turned out to be main. --- applications/lfric_atm/source/lfric_atm.F90 | 29 +++++++++------------ 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/applications/lfric_atm/source/lfric_atm.F90 b/applications/lfric_atm/source/lfric_atm.F90 index 0f1b29a90..1fd52c6c6 100644 --- a/applications/lfric_atm/source/lfric_atm.F90 +++ b/applications/lfric_atm/source/lfric_atm.F90 @@ -17,7 +17,6 @@ program lfric_atm use cli_mod, only: parse_command_line - use constants_mod, only: l_def, str_max_filename #ifdef MCT use coupler_mod, only: set_cpl_name #endif @@ -31,9 +30,11 @@ program lfric_atm use driver_modeldb_mod, only: modeldb_type use gungho_driver_mod, only: initialise, step, finalise use lfric_mpi_mod, only: global_mpi + use namelist_mod, only: namelist_type use timing_mod, only: init_timing, final_timing, & start_timing, stop_timing, & tik, LPROF + use io_config_mod, only: timer_output_path implicit none @@ -46,15 +47,16 @@ program lfric_atm #endif character(:), allocatable :: filename integer(tik) :: id_setup + type(namelist_type), pointer :: io_nml - character(str_max_filename) :: timer_output_path - logical(l_def) :: subroutine_timers + logical :: lsubroutine_timers call parse_command_line( filename ) modeldb%mpi => global_mpi - call modeldb%config%initialise( application_name ) + call modeldb%configuration%initialise( application_name, & + table_len=10 ) call modeldb%values%initialise( 'values', 5 ) ! Create the depository, prognostics and diagnostics field collections @@ -81,31 +83,26 @@ program lfric_atm call init_comm( application_name, modeldb ) call init_config( filename, gungho_required_namelists, & - config=modeldb%config ) - + modeldb%configuration ) call init_logger( modeldb%mpi%get_comm(), application_name ) - subroutine_timers = modeldb%config%io%subroutine_timers() - timer_output_path = modeldb%config%io%timer_output_path() - - call init_timing( modeldb%mpi%get_comm(), subroutine_timers, & - application_name, timer_output_path ) + 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, application_name, timer_output_path ) + nullify( io_nml ) + if ( LPROF ) call start_timing( id_setup, '__setup__' ) - if ( LPROF ) call start_timing( id_setup, '__setup__ ') call init_collections() call init_time( modeldb ) call init_counters( application_name ) - call initialise( application_name, modeldb ) - deallocate( filename ) + call initialise( application_name, modeldb ) if ( LPROF ) call stop_timing( id_setup, '__setup__' ) - do while (modeldb%clock%tick()) call step( modeldb ) end do - call finalise( application_name, modeldb ) call final_counters( application_name ) From 919fa0ade4dcfabac3c7f4f4a609580ad7a6ecdd Mon Sep 17 00:00:00 2001 From: Paul Earnshaw <2195185+pdearnshaw@users.noreply.github.com> Date: Thu, 7 May 2026 12:57:44 +0100 Subject: [PATCH 4/4] #92. Added name to contributors file. --- CONTRIBUTORS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 00c6e6edb..4eb7297a2 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -34,4 +34,5 @@ | thomasmelvin | Thomas Melvin | Met Office | 2026-01-15 | | tinyendian | Wolfgang Hayek | Earth Sciences New Zealand | 2026-02-02 | | DanStoneMO | Daniel Stone | Met Office | 2026-02-26 | -| ericaneininger | Erica Neininger | Met Office | 2026-03-02 | \ No newline at end of file +| ericaneininger | Erica Neininger | Met Office | 2026-03-02 | +| pdearnshaw | Paul Earnshaw | Met Office | 2026-05-07 |