Skip to content

Minor reservoirs - maintaining consistency with JULES. #859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
James Bruten (james-bruten-mo) merged 6 commits into from
Nov 4, 2026
Merged

Minor reservoirs - maintaining consistency with JULES. #859

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
553cea0
Updated arguments to water_resources_alloc
doucla Oct 13, 2026
a61730c
Signed CONTRIBUTORS file.
doucla Oct 13, 2026
4087e1c
Merge branch 'main' into minor_reservoirs
doucla Oct 13, 2026
124d423
Declaring values as parameters, as suggesting by reviewer under PR #8…
doucla Oct 15, 2026
4d137aa
Merge branch 'main' into minor_reservoirs
james-bruten-mo Nov 4, 2026
5263bc7
update dependencies
james-bruten-mo Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@
| 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 |
17 changes: 13 additions & 4 deletions interfaces/jules_interface/source/kernel/jules_extra_kernel_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, &
Expand Down Expand Up @@ -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, &
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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, &
Expand Down
Loading