From 553cea04cccf7c29e71db995dcd9108ef2bc727b Mon Sep 17 00:00:00 2001 From: Douglas Clark Date: Tue, 13 Oct 2026 12:53:41 +0100 Subject: [PATCH 1/4] Updated arguments to water_resources_alloc --- .../source/kernel/jules_extra_kernel_mod.F90 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/interfaces/jules_interface/source/kernel/jules_extra_kernel_mod.F90 b/interfaces/jules_interface/source/kernel/jules_extra_kernel_mod.F90 index 171092e907..6b10278c50 100644 --- a/interfaces/jules_interface/source/kernel/jules_extra_kernel_mod.F90 +++ b/interfaces/jules_interface/source/kernel/jules_extra_kernel_mod.F90 @@ -300,7 +300,7 @@ subroutine jules_extra_code( & l_water_industry, l_water_irrigation, & l_water_livestock, l_water_resources, & l_water_transfers, n_sw_source, & - nwater_use + nwater_use, sw_river_source use jules_water_tracers_mod, only: l_wtrac_jls, n_wtrac_jls, n_evap_srce use crop_vars_mod, only: crop_vars_type, crop_vars_data_type, & @@ -351,7 +351,8 @@ subroutine jules_extra_code( & fluxes_nullify, fluxes_dealloc use jules_rivers_mod, only: rivers_type, rivers_data_type, & rivers_assoc, jules_rivers_alloc, & - rivers_nullify, rivers_dealloc + rivers_nullify, rivers_dealloc, & + l_minor_reservoirs use cable_fields_mod, only: work_vars_cbl use jules_chemvars_mod, only: chemvars_type, chemvars_data_type, & chemvars_alloc, chemvars_assoc, & @@ -556,12 +557,15 @@ subroutine jules_extra_code( & ! Variables for dry deposition type(chemvars_type) :: chemvars type(chemvars_data_type) :: chemvars_data + integer(i_um) :: ndry_dep_species ! Dummy variable for now + type(water_resources_type) :: water_resources type(water_resources_data_type) :: water_resources_data + integer(i_um) :: global_land_pts ! Unused argument for now + logical :: l_is_master_task ! Unused argument for now type(jls_wtrac_type) :: wtrac_jls type(jls_wtrac_data_type) :: wtrac_jls_data type( coastal_type ) :: coast - integer(i_um) :: ndry_dep_species ! Dummy variable for now !----------------------------------------------------------------------- ! Initialisation of JULES data and pointer types @@ -671,8 +675,14 @@ subroutine jules_extra_code( & l_deposition, ndry_dep_species, chemvars_data) call chemvars_assoc(chemvars, chemvars_data) - call water_resources_alloc(land_pts, n_sw_source, nwater_use, & + ! Water resources is not currently available. + ! Set some sensible defaults. + global_land_pts = 1 + l_is_master_task = .FALSE. + call water_resources_alloc(global_land_pts, land_pts, n_sw_source, & + nwater_use, sw_river_source, & l_have_groundwater, l_have_surface_water, & + l_is_master_task, l_minor_reservoirs, & l_water_domestic, l_water_industry, & l_water_irrigation, l_water_livestock, & l_water_resources, l_water_transfers, & From a61730c3aa5d7321815cc3627c0ab7358dc9d5e3 Mon Sep 17 00:00:00 2001 From: Douglas Clark Date: Tue, 13 Oct 2026 13:03:26 +0100 Subject: [PATCH 2/4] Signed CONTRIBUTORS file. --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 04151da782..548b2d0369 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -55,3 +55,4 @@ | marcstring | Marc Stringer | NCAS, Reading University | 2026-05-06 | | cameronbateman-mo | Cameron Bateman | Met Office | 2026-05-28 | | davelee2804 | David Lee | Bureau of Meteorology, Australia | 2026-06-02 | +! doucla | Douglas Clark | UKCEH | 2026-10-13 | From 124d423b64b1c58690b00e80bcc5c5da4718a760 Mon Sep 17 00:00:00 2001 From: Douglas Clark Date: Thu, 15 Oct 2026 11:49:48 +0100 Subject: [PATCH 3/4] Declaring values as parameters, as suggesting by reviewer under PR #864 (which is related work; though noting that the previous approach was consistent with what is done for ndry_dep_species!). Also corrected CONTRIBUTORS file. --- CONTRIBUTORS.md | 3 +-- .../source/kernel/jules_extra_kernel_mod.F90 | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c3a0945105..22af1dc911 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -55,11 +55,10 @@ | marcstring | Marc Stringer | NCAS, Reading University | 2026-05-06 | | cameronbateman-mo | Cameron Bateman | Met Office | 2026-05-28 | | davelee2804 | David Lee | Bureau of Meteorology, Australia | 2026-06-02 | -! doucla | Douglas Clark | UKCEH | 2026-10-13 | | bblay-mo | Byron Blay | Met Office | 2026-07-01 | | ickc | Kolen Cheung | University of Exeter | 2026-07-22 | | mo-snishimoto | Shusuke Nishimoto | Met Office | 2026-07-21 | | mo-cjsmith | Chris Smith | Met Office | 2026-09-02 | | mo-joshuacolclough | Joshua Colclough | Met Office | 2026-08-11 | | zmaalick | Zubair Maalick | Met Office | 2026-08-31 | - +| doucla | Douglas Clark | UKCEH | 2026-10-13 | diff --git a/interfaces/jules_interface/source/kernel/jules_extra_kernel_mod.F90 b/interfaces/jules_interface/source/kernel/jules_extra_kernel_mod.F90 index 18c2137516..9e376eb696 100644 --- a/interfaces/jules_interface/source/kernel/jules_extra_kernel_mod.F90 +++ b/interfaces/jules_interface/source/kernel/jules_extra_kernel_mod.F90 @@ -561,8 +561,11 @@ subroutine jules_extra_code( & type(water_resources_type) :: water_resources type(water_resources_data_type) :: water_resources_data - integer(i_um) :: global_land_pts ! Unused argument for now - logical :: l_is_master_task ! Unused argument for now + ! Water resources is not currently available. + ! Set sensible default values for arguments. + integer(i_um), parameter :: global_land_pts = 1 + logical, parameter :: l_is_master_task = .FALSE. + type(jls_wtrac_type) :: wtrac_jls type(jls_wtrac_data_type) :: wtrac_jls_data type( coastal_type ) :: coast @@ -675,10 +678,6 @@ subroutine jules_extra_code( & l_deposition, ndry_dep_species, chemvars_data) call chemvars_assoc(chemvars, chemvars_data) - ! Water resources is not currently available. - ! Set some sensible defaults. - global_land_pts = 1 - l_is_master_task = .FALSE. call water_resources_alloc(global_land_pts, land_pts, n_sw_source, & nwater_use, sw_river_source, & l_have_groundwater, l_have_surface_water, & From 5263bc7052a244d56c456ecb6ada9d813e1c426f Mon Sep 17 00:00:00 2001 From: James Bruten <109733895+james-bruten-mo@users.noreply.github.com> Date: Wed, 4 Nov 2026 14:27:49 +0000 Subject: [PATCH 4/4] update dependencies --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index c75503275e..71e2572514 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -23,7 +23,7 @@ casim: jules: source: git@github.com:MetOffice/jules.git - ref: e34bc36803fd87c8118296bfc8a5c61fc55a42d9 + ref: 1fbe60fd7ca48b4a044966ca313ca633bb943c1d lfric_apps: source: