From 7070c98a91cd6831a04399def873b43893ff664a Mon Sep 17 00:00:00 2001 From: Maggie Hendry Date: Wed, 19 Aug 2026 15:40:20 +0100 Subject: [PATCH 1/6] Directory structure split fire -> fire_weather_index and inferno and init_fire renamed init_fire_weather_index. --- ...e_mod.F90 => init_fire_weather_index_mod.F90} | 16 ++++++++-------- src/initialisation/standalone/init_mod.F90 | 4 ++-- .../{ => fire_weather_index}/canadian_mod.F90 | 0 .../{ => fire_weather_index}/fire_allocate.F90 | 0 .../{ => fire_weather_index}/fire_calc_daily.F90 | 0 .../fire/{ => fire_weather_index}/fire_init.F90 | 0 .../fire/{ => fire_weather_index}/fire_mod.F90 | 0 .../fire_timestep_mod.F90 | 0 .../{ => fire_weather_index}/mcarthur_mod.F90 | 0 .../{ => fire_weather_index}/nesterov_mod.F90 | 0 .../fire/{ => inferno}/inferno_io_mod.F90 | 0 src/science/fire/{ => inferno}/inferno_mod.F90 | 0 12 files changed, 10 insertions(+), 10 deletions(-) rename src/initialisation/standalone/{init_fire_mod.F90 => init_fire_weather_index_mod.F90} (88%) rename src/science/fire/{ => fire_weather_index}/canadian_mod.F90 (100%) rename src/science/fire/{ => fire_weather_index}/fire_allocate.F90 (100%) rename src/science/fire/{ => fire_weather_index}/fire_calc_daily.F90 (100%) rename src/science/fire/{ => fire_weather_index}/fire_init.F90 (100%) rename src/science/fire/{ => fire_weather_index}/fire_mod.F90 (100%) rename src/science/fire/{ => fire_weather_index}/fire_timestep_mod.F90 (100%) rename src/science/fire/{ => fire_weather_index}/mcarthur_mod.F90 (100%) rename src/science/fire/{ => fire_weather_index}/nesterov_mod.F90 (100%) rename src/science/fire/{ => inferno}/inferno_io_mod.F90 (100%) rename src/science/fire/{ => inferno}/inferno_mod.F90 (100%) diff --git a/src/initialisation/standalone/init_fire_mod.F90 b/src/initialisation/standalone/init_fire_weather_index_mod.F90 similarity index 88% rename from src/initialisation/standalone/init_fire_mod.F90 rename to src/initialisation/standalone/init_fire_weather_index_mod.F90 index c57a6c1c..84fc67f6 100644 --- a/src/initialisation/standalone/init_fire_mod.F90 +++ b/src/initialisation/standalone/init_fire_weather_index_mod.F90 @@ -5,13 +5,13 @@ ! which you should have received as part of this distribution. ! *****************************COPYRIGHT************************************** -MODULE init_fire_mod +MODULE init_fire_weather_index_mod IMPLICIT NONE CONTAINS -SUBROUTINE init_fire(nml_dir,land_index) +SUBROUTINE init_fire_weather_index(nml_dir,land_index) USE io_constants, ONLY: namelist_unit @@ -64,23 +64,23 @@ SUBROUTINE init_fire(nml_dir,land_index) OPEN(namelist_unit, FILE=(TRIM(nml_dir) // '/' // 'fire.nml'), & STATUS='old', POSITION='rewind', ACTION='read', IOSTAT = ERROR) IF ( ERROR /= 0 ) & - CALL log_fatal("init_fire", & + CALL log_fatal("init_fire_weather_index", & "Error opening namelist file fire.nml " // & "(IOSTAT=" // TRIM(to_string(ERROR)) // ")") ! There is one namelist to read from this file -CALL log_info("init_fire", "Reading FIRE_SWITCHES namelist...") +CALL log_info("init_fire_weather_index", "Reading FIRE_SWITCHES namelist...") READ(namelist_unit, NML = fire_switches, IOSTAT = ERROR) IF ( ERROR /= 0 ) & - CALL log_fatal("init_fire", & + CALL log_fatal("init_fire_weather_index", & "Error reading namelist fire_SWITCHES " // & "(IOSTAT=" // TRIM(to_string(ERROR)) // ")") ! Close the namelist file CLOSE(namelist_unit, IOSTAT = ERROR) IF ( ERROR /= 0 ) & - CALL log_fatal("init_fire", & + CALL log_fatal("init_fire_weather_index", & "Error closing namelist file fire.nml " // & "(IOSTAT=" // TRIM(to_string(ERROR)) // ")") @@ -105,6 +105,6 @@ SUBROUTINE init_fire(nml_dir,land_index) RETURN -END SUBROUTINE init_fire -END MODULE init_fire_mod +END SUBROUTINE init_fire_weather_index +END MODULE init_fire_weather_index_mod #endif diff --git a/src/initialisation/standalone/init_mod.F90 b/src/initialisation/standalone/init_mod.F90 index f94cdc16..b7850e9f 100644 --- a/src/initialisation/standalone/init_mod.F90 +++ b/src/initialisation/standalone/init_mod.F90 @@ -78,7 +78,7 @@ SUBROUTINE init(nml_dir, crop_vars_data, crop_vars, & USE jules_science_fixes_mod, ONLY: init_science_fixes USE init_irrigation_mod, ONLY: init_irrigation USE init_urban_mod, ONLY: init_urban -USE init_fire_mod, ONLY: init_fire +USE init_fire_weather_index_mod, ONLY: init_fire_weather_index USE init_imogen_mod, ONLY: init_imogen USE init_prescribed_data_mod, ONLY: init_prescribed_data USE init_vars_tmp_mod, ONLY: init_vars_tmp @@ -372,7 +372,7 @@ SUBROUTINE init(nml_dir, crop_vars_data, crop_vars, & CALL init_params(nml_dir,progs,land_pts,nsurft,nnpft,npft,nmasst,ntype) ! Initialise fire module -CALL init_fire(nml_dir,ainfo%land_index) +CALL init_fire_weather_index(nml_dir,ainfo%land_index) ! Contains allocation of progs_data%seed_rain - hence passing in the data type CALL init_drive(nml_dir,ainfo,progs_data) diff --git a/src/science/fire/canadian_mod.F90 b/src/science/fire/fire_weather_index/canadian_mod.F90 similarity index 100% rename from src/science/fire/canadian_mod.F90 rename to src/science/fire/fire_weather_index/canadian_mod.F90 diff --git a/src/science/fire/fire_allocate.F90 b/src/science/fire/fire_weather_index/fire_allocate.F90 similarity index 100% rename from src/science/fire/fire_allocate.F90 rename to src/science/fire/fire_weather_index/fire_allocate.F90 diff --git a/src/science/fire/fire_calc_daily.F90 b/src/science/fire/fire_weather_index/fire_calc_daily.F90 similarity index 100% rename from src/science/fire/fire_calc_daily.F90 rename to src/science/fire/fire_weather_index/fire_calc_daily.F90 diff --git a/src/science/fire/fire_init.F90 b/src/science/fire/fire_weather_index/fire_init.F90 similarity index 100% rename from src/science/fire/fire_init.F90 rename to src/science/fire/fire_weather_index/fire_init.F90 diff --git a/src/science/fire/fire_mod.F90 b/src/science/fire/fire_weather_index/fire_mod.F90 similarity index 100% rename from src/science/fire/fire_mod.F90 rename to src/science/fire/fire_weather_index/fire_mod.F90 diff --git a/src/science/fire/fire_timestep_mod.F90 b/src/science/fire/fire_weather_index/fire_timestep_mod.F90 similarity index 100% rename from src/science/fire/fire_timestep_mod.F90 rename to src/science/fire/fire_weather_index/fire_timestep_mod.F90 diff --git a/src/science/fire/mcarthur_mod.F90 b/src/science/fire/fire_weather_index/mcarthur_mod.F90 similarity index 100% rename from src/science/fire/mcarthur_mod.F90 rename to src/science/fire/fire_weather_index/mcarthur_mod.F90 diff --git a/src/science/fire/nesterov_mod.F90 b/src/science/fire/fire_weather_index/nesterov_mod.F90 similarity index 100% rename from src/science/fire/nesterov_mod.F90 rename to src/science/fire/fire_weather_index/nesterov_mod.F90 diff --git a/src/science/fire/inferno_io_mod.F90 b/src/science/fire/inferno/inferno_io_mod.F90 similarity index 100% rename from src/science/fire/inferno_io_mod.F90 rename to src/science/fire/inferno/inferno_io_mod.F90 diff --git a/src/science/fire/inferno_mod.F90 b/src/science/fire/inferno/inferno_mod.F90 similarity index 100% rename from src/science/fire/inferno_mod.F90 rename to src/science/fire/inferno/inferno_mod.F90 From 3e1d3bb7a97e1b7f49653c013bfbddc739745a2a Mon Sep 17 00:00:00 2001 From: Maggie Hendry Date: Wed, 19 Aug 2026 18:45:58 +0100 Subject: [PATCH 2/6] fire_switches renamed fire_weather_index & l_fire to l_fire_weather_index --- doc/source/namelists/fire.nml.rst | 8 ++-- .../jules-standalone/HEAD/rose-meta.conf | 44 +++++++++---------- rose-meta/jules-standalone/versions.py | 21 ++++++--- src/control/shared/surf_couple_extra_mod.F90 | 4 +- .../init_fire_weather_index_mod.F90 | 27 ++++++------ .../required_vars_for_configuration_mod.F90 | 4 +- .../fire/fire_weather_index/fire_init.F90 | 6 +-- .../fire/fire_weather_index/fire_mod.F90 | 2 +- 8 files changed, 64 insertions(+), 52 deletions(-) diff --git a/doc/source/namelists/fire.nml.rst b/doc/source/namelists/fire.nml.rst index 96c8f492..ad2d7572 100644 --- a/doc/source/namelists/fire.nml.rst +++ b/doc/source/namelists/fire.nml.rst @@ -1,14 +1,14 @@ ``fire.nml`` =================== -This file contains a single namelist called :nml:lst:`FIRE_SWITCHES` that sets time-invariant parameters for performing wildfire-related calculations. +This file contains a single namelist called :nml:lst:`JULES_FIRE_WEATHER_INDEX` that sets time-invariant parameters for performing wildfire-related calculations. -``FIRE_SWITCHES`` namelist members +``JULES_FIRE_WEATHER_INDEX`` namelist members ----------------------------------- -.. nml:namelist:: FIRE_SWITCHES +.. nml:namelist:: JULES_FIRE_WEATHER_INDEX -.. nml:member:: l_fire +.. nml:member:: l_fire_weather_index :type: logical :default: F diff --git a/rose-meta/jules-standalone/HEAD/rose-meta.conf b/rose-meta/jules-standalone/HEAD/rose-meta.conf index e30a27c5..3e523385 100644 --- a/rose-meta/jules-standalone/HEAD/rose-meta.conf +++ b/rose-meta/jules-standalone/HEAD/rose-meta.conf @@ -665,63 +665,63 @@ length=: type=integer url=https://metoffice.github.io/jules/latest/namelists/cable_surface_types.nml.html#CABLE_SURFACE_TYPES::urban_cable -[namelist:fire_switches] +[namelist:jules_fire_weather_index] compulsory=true description=Switches for controlling activation of the fire module -ns=namelist/JULES Science Settings/fire_switches +ns=namelist/JULES Science Settings/jules_fire_weather_index sort-key=16 -title=Fire options -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#namelist-FIRE_SWITCHES +title=Fire Weather Index options +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#namelist-JULES_FIRE_WEATHER_INDEX -[namelist:fire_switches=canadian_flag] +[namelist:jules_fire_weather_index=canadian_flag] compulsory=true description=Switch for Canadian Fire Weather Index (FWI) sort-key=04 -trigger=namelist:fire_switches=canadian_hemi_opt: .true.; +trigger=namelist:jules_fire_weather_index=canadian_hemi_opt: .true.; type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#FIRE_SWITCHES::canadian_flag +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::canadian_flag -[namelist:fire_switches=canadian_hemi_opt] +[namelist:jules_fire_weather_index=canadian_hemi_opt] compulsory=true description=If TRUE, apply 6-month offset to S-hemisphere month-dependent parameters sort-key=05 type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#FIRE_SWITCHES::canadian_hemi_opt +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::canadian_hemi_opt -[namelist:fire_switches=l_fire] +[namelist:jules_fire_weather_index=l_fire_weather_index] compulsory=true description=Switch to enable the fire module sort-key=01 -trigger=namelist:fire_switches=mcarthur_flag: .true.; - =namelist:fire_switches=mcarthur_opt: .true.; - =namelist:fire_switches=canadian_flag: .true.; - =namelist:fire_switches=nesterov_flag: .true.; +trigger=namelist:jules_fire_weather_index=mcarthur_flag: .true.; + =namelist:jules_fire_weather_index=mcarthur_opt: .true.; + =namelist:jules_fire_weather_index=canadian_flag: .true.; + =namelist:jules_fire_weather_index=nesterov_flag: .true.; type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#FIRE_SWITCHES::l_fire +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::l_fire_weather_index -[namelist:fire_switches=mcarthur_flag] +[namelist:jules_fire_weather_index=mcarthur_flag] compulsory=true description=Switch for McArthur Forest Fire Danger Index (FFDI) sort-key=02 -trigger=namelist:fire_switches=mcarthur_opt: .true.; +trigger=namelist:jules_fire_weather_index=mcarthur_opt: .true.; type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#FIRE_SWITCHES::mcarthur_flag +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::mcarthur_flag -[namelist:fire_switches=mcarthur_opt] +[namelist:jules_fire_weather_index=mcarthur_opt] compulsory=true description=Method for soil moisture deficit in McArthur FFDI sort-key=03 -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#FIRE_SWITCHES::mcarthur_opt +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::mcarthur_opt value-titles=Model value,Fixed at 120 mm values=1,2 widget[rose-config-edit]=cylc8_compat.ComboBoxValueWidget -[namelist:fire_switches=nesterov_flag] +[namelist:jules_fire_weather_index=nesterov_flag] compulsory=true description=Switch for Nesterov Index sort-key=06 type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#FIRE_SWITCHES::nesterov_flag +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::nesterov_flag [namelist:imogen_anlg_vals_list] compulsory=true diff --git a/rose-meta/jules-standalone/versions.py b/rose-meta/jules-standalone/versions.py index 1d4c41a9..fe0f4c7a 100644 --- a/rose-meta/jules-standalone/versions.py +++ b/rose-meta/jules-standalone/versions.py @@ -45,15 +45,26 @@ from .version81_82 import * -class vnYY_txxxx(MacroUpgrade): +class vn82_t119(MacroUpgrade): - """Upgrade macro from JULES by Author""" + """Upgrade macro from JULES by Maggie Hendry""" - BEFORE_TAG = "vnY.Y" - AFTER_TAG = "vnY.Y_txxxx" + BEFORE_TAG = "vn8.2" + AFTER_TAG = "vn8.2_t119" def upgrade(self, config, meta_config=None): """Upgrade a JULES runtime app configuration.""" - # Add settings + self.rename_setting(config, ["namelist:fire_switches"], + ["namelist:jules_fire_weather_index"]) + self.rename_setting(config, ["namelist:jules_fire_weather_index", + "l_fire"], + ["namelist:jules_fire_weather_index", + "l_fire_weather_index"]) + + source = self.get_setting_value(config, ["file:fire.nml","source"]) + source = source.replace("namelist:fire_switches", + "namelist:jules_fire_weather_index") + self.change_setting_value(config, ["file:fire.nml","source"], source) + return config, self.reports diff --git a/src/control/shared/surf_couple_extra_mod.F90 b/src/control/shared/surf_couple_extra_mod.F90 index 4b52d3c1..76d4d279 100644 --- a/src/control/shared/surf_couple_extra_mod.F90 +++ b/src/control/shared/surf_couple_extra_mod.F90 @@ -259,7 +259,7 @@ SUBROUTINE surf_couple_extra( & USE atm_step_local, ONLY: dim_cs1 #else !Modules specific to JULES -USE fire_mod, ONLY: fire_prog, fire_diag, l_fire +USE fire_mod, ONLY: fire_prog, fire_diag, l_fire_weather_index USE metstats_mod, ONLY: metstats_prog, l_metstats @@ -1027,7 +1027,7 @@ SUBROUTINE surf_couple_extra( & END IF !Fire (standalone only) - IF ( l_fire ) THEN + IF ( l_fire_weather_index ) THEN !Calculate the gridbox mean soil moisture smc_gb = soiltiles_to_gbm(progs%smc_soilt, ainfo) CALL fire_timestep(metstats_prog, smc_gb, fire_prog, fire_diag, & diff --git a/src/initialisation/standalone/init_fire_weather_index_mod.F90 b/src/initialisation/standalone/init_fire_weather_index_mod.F90 index 84fc67f6..7d36750d 100644 --- a/src/initialisation/standalone/init_fire_weather_index_mod.F90 +++ b/src/initialisation/standalone/init_fire_weather_index_mod.F90 @@ -19,7 +19,7 @@ SUBROUTINE init_fire_weather_index(nml_dir,land_index) USE logging_mod, ONLY: log_info,log_fatal -USE fire_mod, ONLY: fire_cntl, l_fire +USE fire_mod, ONLY: fire_cntl, l_fire_weather_index USE fire_allocate_mod,ONLY: fire_allocate @@ -48,11 +48,13 @@ SUBROUTINE init_fire_weather_index(nml_dir,land_index) LOGICAL :: canadian_hemi_opt = .FALSE. INTEGER :: mcarthur_opt = imdi +CHARACTER(LEN=*), PARAMETER :: RoutineName='INIT_FIRE_WEATHER_INDEX' + !----------------------------------------------------------------------------- -! Definition of the fire_Switches namelist +! Definition of the jules_fire_weather_index namelist !----------------------------------------------------------------------------- -NAMELIST / fire_switches/ l_fire, mcarthur_flag, mcarthur_opt, & - canadian_flag, canadian_hemi_opt, & +NAMELIST /jules_fire_weather_index/ l_fire_weather_index, mcarthur_flag, & + mcarthur_opt, canadian_flag, canadian_hemi_opt, & nesterov_flag !----------------------------------------------------------------------------- @@ -60,32 +62,31 @@ SUBROUTINE init_fire_weather_index(nml_dir,land_index) ! Read the namelist !----------------------------------------------------------------------------- - ! Open the fire namelist file +! Open the fire namelist file OPEN(namelist_unit, FILE=(TRIM(nml_dir) // '/' // 'fire.nml'), & STATUS='old', POSITION='rewind', ACTION='read', IOSTAT = ERROR) IF ( ERROR /= 0 ) & - CALL log_fatal("init_fire_weather_index", & - "Error opening namelist file fire.nml " // & + CALL log_fatal(RoutineName, "Error opening namelist file fire.nml " // & "(IOSTAT=" // TRIM(to_string(ERROR)) // ")") ! There is one namelist to read from this file -CALL log_info("init_fire_weather_index", "Reading FIRE_SWITCHES namelist...") -READ(namelist_unit, NML = fire_switches, IOSTAT = ERROR) +CALL log_info(RoutineName, "Reading JULES_FIRE_WEATHER_INDEX namelist...") +READ(namelist_unit, NML = jules_fire_weather_index, IOSTAT = ERROR) IF ( ERROR /= 0 ) & - CALL log_fatal("init_fire_weather_index", & - "Error reading namelist fire_SWITCHES " // & + CALL log_fatal(RoutineName, & + "Error reading namelist jules_fire_weather_index " // & "(IOSTAT=" // TRIM(to_string(ERROR)) // ")") ! Close the namelist file CLOSE(namelist_unit, IOSTAT = ERROR) IF ( ERROR /= 0 ) & - CALL log_fatal("init_fire_weather_index", & + CALL log_fatal(RoutineName, & "Error closing namelist file fire.nml " // & "(IOSTAT=" // TRIM(to_string(ERROR)) // ")") ! If not running fire, we can bail -IF ( .NOT. l_fire ) RETURN +IF ( .NOT. l_fire_weather_index ) RETURN ! Copy across namelist variables to the fire_cntl structure fire_cntl%canadian%flag = canadian_flag diff --git a/src/io/dump/required_vars_for_configuration_mod.F90 b/src/io/dump/required_vars_for_configuration_mod.F90 index 2d4b666d..2bc98a18 100644 --- a/src/io/dump/required_vars_for_configuration_mod.F90 +++ b/src/io/dump/required_vars_for_configuration_mod.F90 @@ -49,7 +49,7 @@ SUBROUTINE required_vars_for_configuration(nvars, identifiers, & USE jules_soil_mod, ONLY: l_bedrock, sm_levels, l_tile_soil -USE fire_mod, ONLY: fire_cntl, l_fire +USE fire_mod, ONLY: fire_cntl, l_fire_weather_index USE metstats_mod, ONLY: metstats_flag, l_metstats @@ -368,7 +368,7 @@ SUBROUTINE required_vars_for_configuration(nvars, identifiers, & !----------------------------------------------------------------------------- ! Add fire prognostic variables if switched on !----------------------------------------------------------------------------- -IF ( l_fire ) THEN +IF ( l_fire_weather_index ) THEN IF (fire_cntl%mcarthur%flag) THEN CALL add_to_list( 'fire_mcarthur_r_dr', nvars, identifiers ) CALL add_to_list( 'fire_mcarthur_n_dr', nvars, identifiers ) diff --git a/src/science/fire/fire_weather_index/fire_init.F90 b/src/science/fire/fire_weather_index/fire_init.F90 index 2007cb9c..0f64dab2 100644 --- a/src/science/fire/fire_weather_index/fire_init.F90 +++ b/src/science/fire/fire_weather_index/fire_init.F90 @@ -10,7 +10,7 @@ SUBROUTINE fire_init() ! < Module imports > USE metstats_mod, ONLY: metstats_flag -USE fire_mod, ONLY: fire_cntl, l_fire +USE fire_mod, ONLY: fire_cntl, l_fire_weather_index USE jules_soil_mod, ONLY: zsmc !Depth of layer for soil moisture diag (m) @@ -50,7 +50,7 @@ SUBROUTINE fire_init() ! ------------------------------------------ ! Activate the required metstats -IF (l_fire) THEN +IF (l_fire_weather_index) THEN IF (fire_cntl%mcarthur%flag .OR. fire_cntl%nesterov%flag) THEN metstats_flag%prec_tot_00h = .TRUE. @@ -89,7 +89,7 @@ SUBROUTINE fire_init() !Nothing to do for nesterov -END IF !l_fire +END IF !l_fire_weather_index IF (lhook) CALL dr_hook(ModuleName//':'//RoutineName,zhook_out,zhook_handle) RETURN diff --git a/src/science/fire/fire_weather_index/fire_mod.F90 b/src/science/fire/fire_weather_index/fire_mod.F90 index 5225c1f8..8e43f8de 100644 --- a/src/science/fire/fire_weather_index/fire_mod.F90 +++ b/src/science/fire/fire_weather_index/fire_mod.F90 @@ -40,7 +40,7 @@ MODULE fire_mod ! Module constants !Switch for if we're using the fire module -LOGICAL :: l_fire = .FALSE. +LOGICAL :: l_fire_weather_index = .FALSE. !Canadian model user defined types for prognostics, diagnotics and control TYPE :: canadian_progs From 52b43e92ef9d2cdcc62b9b0ad77c602ee57e43ca Mon Sep 17 00:00:00 2001 From: Maggie Hendry Date: Wed, 19 Aug 2026 18:47:26 +0100 Subject: [PATCH 3/6] rose config-dump applied. --- .../jules-standalone/HEAD/rose-meta.conf | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/rose-meta/jules-standalone/HEAD/rose-meta.conf b/rose-meta/jules-standalone/HEAD/rose-meta.conf index 3e523385..f93860bc 100644 --- a/rose-meta/jules-standalone/HEAD/rose-meta.conf +++ b/rose-meta/jules-standalone/HEAD/rose-meta.conf @@ -665,64 +665,6 @@ length=: type=integer url=https://metoffice.github.io/jules/latest/namelists/cable_surface_types.nml.html#CABLE_SURFACE_TYPES::urban_cable -[namelist:jules_fire_weather_index] -compulsory=true -description=Switches for controlling activation of the fire module -ns=namelist/JULES Science Settings/jules_fire_weather_index -sort-key=16 -title=Fire Weather Index options -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#namelist-JULES_FIRE_WEATHER_INDEX - -[namelist:jules_fire_weather_index=canadian_flag] -compulsory=true -description=Switch for Canadian Fire Weather Index (FWI) -sort-key=04 -trigger=namelist:jules_fire_weather_index=canadian_hemi_opt: .true.; -type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::canadian_flag - -[namelist:jules_fire_weather_index=canadian_hemi_opt] -compulsory=true -description=If TRUE, apply 6-month offset to S-hemisphere month-dependent parameters -sort-key=05 -type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::canadian_hemi_opt - -[namelist:jules_fire_weather_index=l_fire_weather_index] -compulsory=true -description=Switch to enable the fire module -sort-key=01 -trigger=namelist:jules_fire_weather_index=mcarthur_flag: .true.; - =namelist:jules_fire_weather_index=mcarthur_opt: .true.; - =namelist:jules_fire_weather_index=canadian_flag: .true.; - =namelist:jules_fire_weather_index=nesterov_flag: .true.; -type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::l_fire_weather_index - -[namelist:jules_fire_weather_index=mcarthur_flag] -compulsory=true -description=Switch for McArthur Forest Fire Danger Index (FFDI) -sort-key=02 -trigger=namelist:jules_fire_weather_index=mcarthur_opt: .true.; -type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::mcarthur_flag - -[namelist:jules_fire_weather_index=mcarthur_opt] -compulsory=true -description=Method for soil moisture deficit in McArthur FFDI -sort-key=03 -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::mcarthur_opt -value-titles=Model value,Fixed at 120 mm -values=1,2 -widget[rose-config-edit]=cylc8_compat.ComboBoxValueWidget - -[namelist:jules_fire_weather_index=nesterov_flag] -compulsory=true -description=Switch for Nesterov Index -sort-key=06 -type=logical -url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::nesterov_flag - [namelist:imogen_anlg_vals_list] compulsory=true ns=namelist/IMOGEN/GCM Analogue configuration @@ -2056,6 +1998,64 @@ sort-key=13 type=real url=https://metoffice.github.io/jules/latest/namelists/drive.nml.html#JULES_DRIVE::z1_uv_in +[namelist:jules_fire_weather_index] +compulsory=true +description=Switches for controlling activation of the fire module +ns=namelist/JULES Science Settings/jules_fire_weather_index +sort-key=16 +title=Fire Weather Index options +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#namelist-JULES_FIRE_WEATHER_INDEX + +[namelist:jules_fire_weather_index=canadian_flag] +compulsory=true +description=Switch for Canadian Fire Weather Index (FWI) +sort-key=04 +trigger=namelist:jules_fire_weather_index=canadian_hemi_opt: .true.; +type=logical +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::canadian_flag + +[namelist:jules_fire_weather_index=canadian_hemi_opt] +compulsory=true +description=If TRUE, apply 6-month offset to S-hemisphere month-dependent parameters +sort-key=05 +type=logical +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::canadian_hemi_opt + +[namelist:jules_fire_weather_index=l_fire_weather_index] +compulsory=true +description=Switch to enable the fire module +sort-key=01 +trigger=namelist:jules_fire_weather_index=mcarthur_flag: .true.; + =namelist:jules_fire_weather_index=mcarthur_opt: .true.; + =namelist:jules_fire_weather_index=canadian_flag: .true.; + =namelist:jules_fire_weather_index=nesterov_flag: .true.; +type=logical +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::l_fire_weather_index + +[namelist:jules_fire_weather_index=mcarthur_flag] +compulsory=true +description=Switch for McArthur Forest Fire Danger Index (FFDI) +sort-key=02 +trigger=namelist:jules_fire_weather_index=mcarthur_opt: .true.; +type=logical +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::mcarthur_flag + +[namelist:jules_fire_weather_index=mcarthur_opt] +compulsory=true +description=Method for soil moisture deficit in McArthur FFDI +sort-key=03 +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::mcarthur_opt +value-titles=Model value,Fixed at 120 mm +values=1,2 +widget[rose-config-edit]=cylc8_compat.ComboBoxValueWidget + +[namelist:jules_fire_weather_index=nesterov_flag] +compulsory=true +description=Switch for Nesterov Index +sort-key=06 +type=logical +url=https://metoffice.github.io/jules/latest/namelists/fire.nml.html#JULES_FIRE_WEATHER_INDEX::nesterov_flag + [namelist:jules_flake] compulsory=true description=Configuration of the FLake model, only required if l_flake_model=true From 3a30fcea4194855ea686eed5e546dcd79412e9dd Mon Sep 17 00:00:00 2001 From: Maggie Hendry Date: Fri, 21 Aug 2026 08:11:48 +0100 Subject: [PATCH 4/6] Issue number replaced with PR in upgrade macro. --- rose-meta/jules-standalone/versions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rose-meta/jules-standalone/versions.py b/rose-meta/jules-standalone/versions.py index fe0f4c7a..7b8dca0a 100644 --- a/rose-meta/jules-standalone/versions.py +++ b/rose-meta/jules-standalone/versions.py @@ -45,12 +45,12 @@ from .version81_82 import * -class vn82_t119(MacroUpgrade): +class vn82_t141(MacroUpgrade): """Upgrade macro from JULES by Maggie Hendry""" BEFORE_TAG = "vn8.2" - AFTER_TAG = "vn8.2_t119" + AFTER_TAG = "vn8.2_t141" def upgrade(self, config, meta_config=None): """Upgrade a JULES runtime app configuration.""" From 872a039694791ea1b2187fc144c8c162f614ab28 Mon Sep 17 00:00:00 2001 From: Maggie Hendry Date: Fri, 21 Aug 2026 08:40:48 +0100 Subject: [PATCH 5/6] Change of directory added to make files. --- etc/fcm-make/make-river.cfg | 2 +- rose-stem/app/fab_jules/bin/gfortran_10_plus_rivers.json | 4 ++-- rose-stem/app/fab_jules/bin/intel_rivers.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/fcm-make/make-river.cfg b/etc/fcm-make/make-river.cfg index 81789894..d7ee7f3e 100644 --- a/etc/fcm-make/make-river.cfg +++ b/etc/fcm-make/make-river.cfg @@ -160,7 +160,7 @@ extract.path-incl[river] = $extract_path_incl \ src/control/imogen/imgn_vars_mod.F90 \ src/control/shared/jules_radiation_mod.F90 \ src/params/imogen/imogen_constants.F90 \ - src/science/fire/fire_mod.F90 \ + src/science/fire/fire_weather_index/fire_mod.F90 \ src/util/shared/metstats/metstats_mod.F90 \ #............................................................................... # and allocate_river_arrays diff --git a/rose-stem/app/fab_jules/bin/gfortran_10_plus_rivers.json b/rose-stem/app/fab_jules/bin/gfortran_10_plus_rivers.json index ee11274a..46d62954 100644 --- a/rose-stem/app/fab_jules/bin/gfortran_10_plus_rivers.json +++ b/rose-stem/app/fab_jules/bin/gfortran_10_plus_rivers.json @@ -140,7 +140,7 @@ "/src/science/params/trif_mod.F90", "/src/science/params/pftparm_mod.F90", "/src/science/params/ecosse_param_mod.F90", - "/src/science/fire/fire_mod.F90", + "/src/science/fire/fire_weather_index/fire_mod.F90", "/src/science/surface/sf_diags_mod.F90", "/src/science/params/urban_param_mod.F90", "/src/params/imogen/imogen_time.F90", @@ -241,4 +241,4 @@ "-fopenmp", "-Wl,--rpath=/data/apps/spack/opt/linux-rhel9-zen2/gcc-12.2.0/netcdf-fortran-4.6.1-3bu2pvjyujppdgn446jxste4k7vq6xay/lib" ] -} \ No newline at end of file +} diff --git a/rose-stem/app/fab_jules/bin/intel_rivers.json b/rose-stem/app/fab_jules/bin/intel_rivers.json index 04d24e92..38180141 100644 --- a/rose-stem/app/fab_jules/bin/intel_rivers.json +++ b/rose-stem/app/fab_jules/bin/intel_rivers.json @@ -139,7 +139,7 @@ "/src/science/params/trif_mod.F90", "/src/science/params/pftparm_mod.F90", "/src/science/params/ecosse_param_mod.F90", - "/src/science/fire/fire_mod.F90", + "/src/science/fire/fire_weather_index/fire_mod.F90", "/src/science/surface/sf_diags_mod.F90", "/src/science/params/urban_param_mod.F90", "/src/params/imogen/imogen_time.F90", From d199798b31ca3017b04a96e1ceac2498428ea3d3 Mon Sep 17 00:00:00 2001 From: Maggie Hendry Date: Fri, 21 Aug 2026 08:48:34 +0100 Subject: [PATCH 6/6] CLA signed. --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index db1cc110..1ab5084c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -5,3 +5,4 @@ | 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 |