diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ba5464642a..1872bb0698 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -62,4 +62,5 @@ | 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 | | jerry-liu-jianyu | Liu Jianyu | NEA/MSS/CCRS | 2026-09-25 | 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: 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 2ee476a663..9e376eb696 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,18 @@ 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 + ! 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 - integer(i_um) :: ndry_dep_species ! Dummy variable for now !----------------------------------------------------------------------- ! Initialisation of JULES data and pointer types @@ -671,8 +678,10 @@ 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, & + 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, &