Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
42b595b
added all the extra variables definitions and passed to most/all rout…
nicgedney Aug 20, 2026
34f29cc
fix compiler bug
nicgedney Aug 20, 2026
ff47832
more bug fixes
nicgedney Aug 20, 2026
91429bf
correcting one typo
nicgedney Aug 20, 2026
26f839e
OMP typo fixed
nicgedney Aug 20, 2026
7d95d7c
OMP typo fixed
nicgedney Aug 20, 2026
4fe1ce2
added first attempt of code additions to physiol
nicgedney Aug 21, 2026
985b90a
basic code passes rose stem tests
nicgedney Aug 21, 2026
50ba4db
add variable descriptions
nicgedney Aug 24, 2026
90e7ffc
rose-meta info added
nicgedney Aug 24, 2026
8884cf6
attempt to remove ashtf_nir and ashtf_irr
nicgedney Aug 24, 2026
ac7b60d
remove inconsistent variables in calls to fcdch
nicgedney Aug 24, 2026
0984379
added text to documentation
nicgedney Aug 25, 2026
07a9935
ran umdp3_fixer.py
nicgedney Aug 25, 2026
4dd9e4e
comment out additional code fro sthu_nir calc in physiol
nicgedney Aug 25, 2026
2d26472
remove comments from physiol
nicgedney Aug 26, 2026
f0969a4
typo and namelist checks
nicgedney Sep 1, 2026
3b1fe31
deal with John Edwards's comments
nicgedney Sep 1, 2026
cae1b4f
added a comment
nicgedney Sep 1, 2026
4b8814e
add some of copilot suggested changes
nicgedney Sep 1, 2026
b75bb9b
fix bug copilot found
nicgedney Sep 1, 2026
8dfe983
omp fixes
nicgedney Sep 1, 2026
6ef67ee
tidy up
nicgedney Sep 1, 2026
4e3cdc0
nml.rst updated
nicgedney Sep 1, 2026
0134f31
add name to contributors list
nicgedney Sep 1, 2026
c613116
remove trailing space
nicgedney Sep 2, 2026
77ddb9a
changes required from Maggie's review
nicgedney Sep 11, 2026
9537e94
required to deal with conflicts
nicgedney Sep 11, 2026
04d2ecc
versions.py changed to deal with conflict
nicgedney Sep 11, 2026
c877990
deal with rose-meta data conflicts
nicgedney Sep 11, 2026
d4ef237
jules-shared changes
nicgedney Sep 14, 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
4 changes: 4 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@
| yaswant | Yaswant Pradhan | Met Office | 2026-06-30 |
| doucla | Douglas Clark | UKCEH | 2026-07-03 |
| james-bruten-mo | James Bruten | Met Office | 2026-07-09 |
| maggiehendry | Maggie Hendry | Met Office | 2026-08-21 |
| DanCopsey | Dan Copsey | Met Office | 2026-08-24 |
| Pierre-siddall | Pierre Siddall | Met Office | 2026-08-26 |
| nicgedney | Nic Gedney | Met Office | 2026-09-01 |
20 changes: 19 additions & 1 deletion doc/source/namelists/jules_irrig.nml.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ This namelist specifies the different options available for setting up the irrig
1. Not available yet. In a future release this will replace :nml:mem:`l_irrig_dmd`.
2. Apply irrigation to irrigated surface types C3_irrig and/or C4_irrig. This option requires :nml:mem:`JULES_IRRIG::l_irrig_dmd` = FALSE and :nml:mem:`JULES_PFTPARM::irrig_pft_io` = 0 or 1.

When :nml:mem:`JULES_IRRIG::l_irrig_dmd` = TRUE, :nml:mem:`JULES_IRRIG::irrig_option` is not available.
When :nml:mem:`JULES_IRRIG::l_irrig_dmd` = TRUE, :nml:mem:`JULES_IRRIG::irrig_option` is not available.

.. nml:member:: l_irrig_limit

Expand Down Expand Up @@ -148,6 +148,24 @@ This namelist specifies the different options available for setting up the irrig
:nml:mem:`nstep_irrig` = NINT(frequency of irrigation update (in sec)) / :nml:mem:`JULES_TIME::timestep_len`


.. nml:member:: l_soil_evap_irrig_separate

:type: logical
:default: F

Switch controlling whether the bare soil evaporation from the irrigated and non-irrigated part of the grid-box (or soil tile) is controlled by the mean soil moisture or the separate irrigated and non-irrigated soil moisture columns.

TRUE
Bare soil evaporation is explicitly calculated from the irrigated and non-irrigated soil moisture columns.
Comment thread
nicgedney marked this conversation as resolved.

Only available when :nml:mem:`l_irrig_dmd` = TRUE
FALSE
No effect.

This must be set to FALSE if :nml:mem:`irrig_option` = No irrigation (0) or Surface tile-based irrigation (2).



.. _References_irrig:

``JULES_IRRIG`` references
Expand Down
115 changes: 115 additions & 0 deletions rose-meta/jules-shared/jules-irrig/HEAD/rose-meta.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
[namelist:jules_irrig]
compulsory=true
description=Configuration of irrigation demand code
ns=namelist/JULES Science Settings/jules_irrig
sort-key=21
title=Irrigation options
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#namelist-JULES_IRRIG

[namelist:jules_irrig=frac_irrig_all_tiles]
compulsory=true
description=Irrigate all tiles
=NOT AVAILABLE TO UM
fail-if=namelist:jules_irrig=set_irrfrac_on_irrtiles == '.true.' and this == '.true.'; # cannot set both frac_irrig_all_tiles and set_irrfrac_on_irrtiles to TRUE
sort-key=f
trigger=namelist:jules_irrig=nirrtile: .false.;
= namelist:jules_irrig=irrigtiles: .false.;
type=logical
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::frac_irrig_all_tiles

[namelist:jules_irrig=irr_crop]
compulsory=true
description=Switch for how the irrigation model determines when to irrigate.
=0 is the only option available in the UM
sort-key=c
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::irr_crop
values=0,1,2

[namelist:jules_irrig=irrig_option]
compulsory=true
description=Options for applying irrigation
=0: No irrigation
=1: In a future release this will replace l_irrig_dmd (NOT AVAILABLE YET)
=2: Apply irrigation to available irrigated surface types
fail-if=this == 2 and namelist:jules_soil=l_tile_soil == '.true.'; # Tile-based irrigation is not available with soil tiling.
sort-key=b
trigger=namelist:jules_pftparm=irrig_pft_io: 2;
=namelist:jules_surface_types=c3_irrig: 2;
=namelist:jules_surface_types=c4_irrig: 2;
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::irrig_option
value-titles=No Irrigation, Tile based irrigation
values=0,2

[namelist:jules_irrig=irrigtiles]
compulsory=true
description=indices of tiles to be irrigated
fail-if=len(this) != namelist:jules_irrig=nirrtile
length=:
range=1:
sort-key=e
type=integer
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::irrigtiles

[namelist:jules_irrig=l_irrig_dmd]
compulsory=true
description=Use fraction-based irrigation demand code
fail-if=namelist:jules_soil=l_holdwater == '.true.' and this == '.true.'; # Irrigation can't be used with l_holdwater = TRUE
=namelist:jules_water_resources=l_water_irrigation == '.true.' and this == '.false.'; # Irrigation in water resources code requires l_irrig_dmd = TRUE
sort-key=a
trigger=namelist:jules_irrig=irr_crop: .true.;
=namelist:jules_irrig=l_irrig_limit: .true.;
=namelist:jules_irrig=frac_irrig_all_tiles: .true.;
=namelist:jules_irrig=set_irrfrac_on_irrtiles: .true.;
=namelist:jules_irrig=nstep_irrig: .true.;
=namelist:jules_irrig_props: .true.;
=namelist:jules_irrig=irrig_option: .false.;
type=logical
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::l_irrig_dmd

[namelist:jules_irrig=l_irrig_limit]
compulsory=true
description=Limit irrigation supply
=NOT AVAILABLE TO UM
fail-if=namelist:jules_rivers=l_rivers == '.false.' and this == '.true.'; # l_rivers must TRUE if l_irrig_limit = TRUE
=namelist:jules_rivers=i_river_vn != 3 and this == '.true.'; # i_river_vn must be 3 (trip) if l_irrig_limit = TRUE
=namelist:jules_hydrology=l_top == '.false.' and this == '.true.'; # l_top must TRUE if l_irrig_limit = TRUE
=namelist:jules_water_resources=l_water_irrigation == '.true.' and this == '.true.'; # l_irrig_limit must be F if l_water_irrigation=T
=this == '.true.' and namelist:jules_model_environment=l_jules_parent == 1; # Irrigation limitation is not tested in the UM yet.
sort-key=b
type=logical
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::l_irrig_limit

[namelist:jules_irrig=nirrtile]
compulsory=true
description=Number of tile to be irrigated
range=0:
sort-key=d
type=integer
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::nirrtile

[namelist:jules_irrig=nstep_irrig]
compulsory=true
description=Number of model timesteps per irrigation update step
range=1:
sort-key=h
type=integer
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::nstep_irrig

[namelist:jules_irrig=set_irrfrac_on_irrtiles]
compulsory=true
description=Irrigate only irrigated tiles
=NOT AVAILABLE TO UM
fail-if=namelist:jules_irrig=frac_irrig_all_tiles == '.true.' and this == '.true.'; # cannot set both frac_irrig_all_tiles and set_irrfrac_on_irrtiles to TRUE
sort-key=g
type=logical
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::set_irrfrac_on_irrtiles

[namelist:jules_irrig=l_soil_evap_irrig_separate]
compulsory=true
description=logical to decide whether bare soil evaporation is
=calculated over the grid-box mean (false) or
=explicitly irrigated and non-irrigated fractions (true)
fail-if=this == '.true.' and namelist:jules_irrig=l_irrig_dmd == '.false.'
sort-key=h
type=logical
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::l_soil_evap_irrig_separate
6 changes: 6 additions & 0 deletions rose-meta/jules-shared/jules-vegetation/HEAD/rose-meta.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ compulsory=true
description=Vegetation canopy radiation model
!enumeration=true
sort-key=Panel-I13
trigger=namelist:jules_vegetation=ilayers: 4,5,6;
=namelist:jules_pftparm=knl_io: 6;
url=https://metoffice.github.io/jules/latest/namelists/jules_vegetation.nml.html#JULES_VEGETATION::can_rad_mod
value-titles=1: Single canopy layer,
=4: Multi-layer two stream approach,
=5: Multi-layer with Sunfleck penetration and sunlit and shaded leaves,
=6: Multi-layer with exponential decline in leaf N
values=1,4,5,6
widget[rose-config-edit]=cylc8_compat.ComboBoxValueWidget

[namelist:jules_vegetation=l_bvoc_emis]
compulsory=true
Expand Down Expand Up @@ -81,6 +85,8 @@ compulsory=true
description=Logical switch for setting explicit vegetation roughness lengths
!kind=default
sort-key=Panel-I05
trigger=namelist:jules_pftparm=dz0v_dh_io: .false.;
=namelist:jules_pftparm=z0v_io: .true.;
type=logical
url=https://metoffice.github.io/jules/latest/namelists/jules_vegetation.nml.html#JULES_VEGETATION::l_spec_veg_z0

Expand Down
Loading
Loading