Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
| 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 parts of the grid-box (or soil tile) is controlled by the mean soil moisture or the separate irrigated and non-irrigated soil moisture columns.

Only available when :nml:mem:`l_irrig_dmd` = TRUE (:nml:mem:`irrig_option` = 1 in future release).

TRUE
Bare soil evaporation is explicitly calculated from the irrigated and non-irrigated soil moisture columns.

FALSE
No effect.
Comment thread
nicgedney marked this conversation as resolved.

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


.. _References_irrig:

``JULES_IRRIG`` references
Expand Down
12 changes: 11 additions & 1 deletion rose-meta/jules-shared/jules-irrig/HEAD/rose-meta.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[namelist:jules_irrig]
namelist:jules_irrig]
compulsory=true
description=Configuration of irrigation demand code
ns=namelist/JULES Science Settings/jules_irrig
Expand Down Expand Up @@ -63,6 +63,7 @@ trigger=namelist:jules_irrig=irr_crop: .true.;
=namelist:jules_irrig=nstep_irrig: .true.;
=namelist:jules_irrig_props: .true.;
=namelist:jules_irrig=irrig_option: .false.;
=namelist:jules_irrig=l_soil_evap_irrig_separate: .true.;
type=logical
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::l_irrig_dmd

Expand Down Expand Up @@ -103,3 +104,12 @@ fail-if=namelist:jules_irrig=frac_irrig_all_tiles == '.true.' and this == '.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)
Comment thread
nicgedney marked this conversation as resolved.
sort-key=h
type=logical
url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::l_soil_evap_irrig_separate
12 changes: 7 additions & 5 deletions rose-meta/jules-standalone/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,17 @@ def upgrade(self, config, meta_config=None):
return config, self.reports


class vn82_t155(MacroUpgrade):
class vn82_t139(MacroUpgrade):

"""Upgrade macro from JULES by Author"""
"""Upgrade macro from JULES by Nic Gedney"""

BEFORE_TAG = "vn8.2_t141"
AFTER_TAG = "vn8.2_t155"
BEFORE_TAG = "vn8.2_t155"
AFTER_TAG = "vn8.2_t139"

def upgrade(self, config, meta_config=None):
"""Upgrade a JULES runtime app configuration."""

# Bump tag to pick up metadata changes
# Add l_soil_evap_irrig_separate to namelist jules_irrig
self.add_setting(config, ["namelist:jules_irrig","l_soil_evap_irrig_separate"], ".false.")

return config, self.reports
4 changes: 3 additions & 1 deletion rose-stem/app/eraint_rfm_2ddata/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -498,6 +498,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
!!l_soil_evap_irrig_expl=.false.

Same for all other rose stem tests. But I think this is probably an accidental commit with upgrade macro applied so I suspect you'll be removing them soon anyway. But just to note to check that a clean application of the upgrade macro wouldn't still have the old l_soil_evap_irrig_expl, even if commented out.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm waiting to here back from Erica as to the cleanest way to remove these... I think it happened due to partial renaming of variable

l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/eraint_trip_2ddata/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -497,6 +497,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_closures/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -492,6 +492,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_es_1p1/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -492,6 +492,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_euro4/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -493,6 +493,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_gl4/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -493,6 +493,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_gl7/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -493,6 +493,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -493,6 +493,8 @@ irr_crop=0
!!irrigtiles=0
l_irrig_dmd=.true.
l_irrig_limit=.true.
l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
nstep_irrig=24
set_irrfrac_on_irrtiles=.false.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -493,6 +493,8 @@ irr_crop=0
!!irrigtiles=0
l_irrig_dmd=.true.
l_irrig_limit=.true.
l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
nstep_irrig=24
set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_rivers/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -492,6 +492,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_rivers_restart/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -494,6 +494,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_rivers_spinup/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -492,6 +492,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_trip/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -492,6 +492,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_trip_restart/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -493,6 +493,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_trip_spinup/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -492,6 +492,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/gswp2_ukv/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -493,6 +493,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/imogen_layeredc/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -486,6 +486,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/imogen_layeredc_spinup/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -487,6 +487,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=24
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/loobos_crm1_traitF/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -492,6 +492,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=48
!!set_irrfrac_on_irrtiles=.false.
Expand Down
4 changes: 3 additions & 1 deletion rose-stem/app/loobos_crm4_traitF/rose-app.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2_t155
meta=jules-standalone/vn8.2_t139

[command]
default=rose-run jules.exe
Expand Down Expand Up @@ -492,6 +492,8 @@ irrig_option=0
!!irrigtiles=0
l_irrig_dmd=.false.
!!l_irrig_limit=.false.
!!l_soil_evap_irrig_expl=.false.
l_soil_evap_irrig_separate=.false.
!!nirrtile=0
!!nstep_irrig=48
!!set_irrfrac_on_irrtiles=.false.
Expand Down
Loading
Loading