Skip to content

Inferno macro hotfix #147

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
Sam Clarke-Green (t00sa) merged 10 commits into from
Aug 26, 2026
Merged

Inferno macro hotfix #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7070c98
Directory structure split fire -> fire_weather_index and inferno and …
maggiehendry Aug 19, 2026
3e1d3bb
fire_switches renamed fire_weather_index & l_fire to l_fire_weather_i…
maggiehendry Aug 19, 2026
52b43e9
rose config-dump applied.
maggiehendry Aug 19, 2026
3a30fce
Issue number replaced with PR in upgrade macro.
maggiehendry Aug 21, 2026
872a039
Change of directory added to make files.
maggiehendry Aug 21, 2026
d199798
CLA signed.
maggiehendry Aug 21, 2026
017976e
Apply #141 inferno macro
Pierre-siddall Aug 26, 2026
9826403
Merge branch 'main' into inferno-macro-hotfix
Pierre-siddall Aug 26, 2026
a721982
sign CLA
Pierre-siddall Aug 26, 2026
a6bf26f
fix CLA typo
Pierre-siddall Aug 26, 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
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
| 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 |
| Pierre-siddall | Pierre Siddall | Met Office | 2026-08-26 |
20 changes: 10 additions & 10 deletions rose-stem/app/eraint_rfm_2ddata/rose-app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2
meta=jules-standalone/vn8.2_t141

[command]
default=rose-run jules.exe
Expand All @@ -23,7 +23,7 @@ source=(namelist:jules_cropparm)
source=namelist:jules_drive

[file:fire.nml]
source=namelist:fire_switches
source=namelist:jules_fire_weather_index

[file:imogen.nml]
source=(namelist:imogen_onoff_switch) (namelist:imogen_run_list) (namelist:imogen_anlg_vals_list)
Expand Down Expand Up @@ -253,14 +253,6 @@ source=(namelist:jules_urban)
!!npft_cable=13
!!urban_cable=15

[namelist:fire_switches]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:imogen_anlg_vals_list]
diff_frac_const_imogen=0.4
f_ocean=0.711
Expand Down Expand Up @@ -433,6 +425,14 @@ z1_tq_in=2.0
z1_tq_vary=.false.
z1_uv_in=10.0

[namelist:jules_fire_weather_index]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire_weather_index=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:jules_flake]
!!const_val=0
!!file=''
Expand Down
20 changes: 10 additions & 10 deletions rose-stem/app/eraint_trip_2ddata/rose-app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2
meta=jules-standalone/vn8.2_t141

[command]
default=rose-run jules.exe
Expand All @@ -23,7 +23,7 @@ source=(namelist:jules_cropparm)
source=namelist:jules_drive

[file:fire.nml]
source=namelist:fire_switches
source=namelist:jules_fire_weather_index

[file:imogen.nml]
source=(namelist:imogen_onoff_switch) (namelist:imogen_run_list) (namelist:imogen_anlg_vals_list)
Expand Down Expand Up @@ -253,14 +253,6 @@ source=(namelist:jules_urban)
!!npft_cable=13
!!urban_cable=15

[namelist:fire_switches]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:imogen_anlg_vals_list]
diff_frac_const_imogen=0.4
f_ocean=0.711
Expand Down Expand Up @@ -433,6 +425,14 @@ z1_tq_in=2.0
z1_tq_vary=.false.
z1_uv_in=10.0

[namelist:jules_fire_weather_index]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire_weather_index=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:jules_flake]
!!const_val=0
!!file=''
Expand Down
20 changes: 10 additions & 10 deletions rose-stem/app/gswp2_closures/rose-app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2
meta=jules-standalone/vn8.2_t141

[command]
default=rose-run jules.exe
Expand All @@ -23,7 +23,7 @@ source=(namelist:jules_cropparm)
source=namelist:jules_drive

[file:fire.nml]
source=namelist:fire_switches
source=namelist:jules_fire_weather_index

[file:imogen.nml]
source=(namelist:imogen_onoff_switch) (namelist:imogen_run_list) (namelist:imogen_anlg_vals_list)
Expand Down Expand Up @@ -253,14 +253,6 @@ source=(namelist:jules_urban)
!!npft_cable=13
!!urban_cable=15

[namelist:fire_switches]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:imogen_anlg_vals_list]
diff_frac_const_imogen=0.4
f_ocean=0.711
Expand Down Expand Up @@ -430,6 +422,14 @@ z1_tq_in=2.0
z1_tq_vary=.false.
z1_uv_in=10.0

[namelist:jules_fire_weather_index]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire_weather_index=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:jules_flake]
!!const_val=0
!!file=''
Expand Down
20 changes: 10 additions & 10 deletions rose-stem/app/gswp2_es_1p1/rose-app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2
meta=jules-standalone/vn8.2_t141

[command]
default=rose-run jules.exe
Expand All @@ -23,7 +23,7 @@ source=(namelist:jules_cropparm)
source=namelist:jules_drive

[file:fire.nml]
source=namelist:fire_switches
source=namelist:jules_fire_weather_index

[file:imogen.nml]
source=(namelist:imogen_onoff_switch) (namelist:imogen_run_list) (namelist:imogen_anlg_vals_list)
Expand Down Expand Up @@ -253,14 +253,6 @@ source=(namelist:jules_urban)
!!npft_cable=13
!!urban_cable=15

[namelist:fire_switches]
!!canadian_flag=.true.
!!canadian_hemi_opt=.false.
l_fire=.false.
!!mcarthur_flag=.true.
!!mcarthur_opt=1
!!nesterov_flag=.true.

[!!namelist:imogen_anlg_vals_list]
diff_frac_const_imogen=0.4
f_ocean=0.711
Expand Down Expand Up @@ -431,6 +423,14 @@ z1_tq_in=2.0
z1_tq_vary=.false.
z1_uv_in=10.0

[namelist:jules_fire_weather_index]
!!canadian_flag=.true.
!!canadian_hemi_opt=.false.
l_fire_weather_index=.false.
!!mcarthur_flag=.true.
!!mcarthur_opt=1
!!nesterov_flag=.true.

[!!namelist:jules_flake]
!!const_val=5.0
!!file=''
Expand Down
20 changes: 10 additions & 10 deletions rose-stem/app/gswp2_euro4/rose-app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2
meta=jules-standalone/vn8.2_t141

[command]
default=rose-run jules.exe
Expand All @@ -23,7 +23,7 @@ source=(namelist:jules_cropparm)
source=namelist:jules_drive

[file:fire.nml]
source=namelist:fire_switches
source=namelist:jules_fire_weather_index

[file:imogen.nml]
source=(namelist:imogen_onoff_switch) (namelist:imogen_run_list) (namelist:imogen_anlg_vals_list)
Expand Down Expand Up @@ -253,14 +253,6 @@ source=(namelist:jules_urban)
!!npft_cable=13
!!urban_cable=15

[namelist:fire_switches]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:imogen_anlg_vals_list]
diff_frac_const_imogen=0.4
f_ocean=0.711
Expand Down Expand Up @@ -431,6 +423,14 @@ z1_tq_in=2.0
z1_tq_vary=.false.
z1_uv_in=10.0

[namelist:jules_fire_weather_index]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire_weather_index=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:jules_flake]
!!const_val=0
!!file=''
Expand Down
20 changes: 10 additions & 10 deletions rose-stem/app/gswp2_gl4/rose-app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2
meta=jules-standalone/vn8.2_t141

[command]
default=rose-run jules.exe
Expand All @@ -23,7 +23,7 @@ source=(namelist:jules_cropparm)
source=namelist:jules_drive

[file:fire.nml]
source=namelist:fire_switches
source=namelist:jules_fire_weather_index

[file:imogen.nml]
source=(namelist:imogen_onoff_switch) (namelist:imogen_run_list) (namelist:imogen_anlg_vals_list)
Expand Down Expand Up @@ -253,14 +253,6 @@ source=(namelist:jules_urban)
!!npft_cable=13
!!urban_cable=15

[namelist:fire_switches]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:imogen_anlg_vals_list]
diff_frac_const_imogen=0.4
f_ocean=0.711
Expand Down Expand Up @@ -431,6 +423,14 @@ z1_tq_in=2.0
z1_tq_vary=.false.
z1_uv_in=10.0

[namelist:jules_fire_weather_index]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire_weather_index=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:jules_flake]
!!const_val=0
!!file=''
Expand Down
20 changes: 10 additions & 10 deletions rose-stem/app/gswp2_gl7/rose-app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2
meta=jules-standalone/vn8.2_t141

[command]
default=rose-run jules.exe
Expand All @@ -23,7 +23,7 @@ source=(namelist:jules_cropparm)
source=namelist:jules_drive

[file:fire.nml]
source=namelist:fire_switches
source=namelist:jules_fire_weather_index

[file:imogen.nml]
source=(namelist:imogen_onoff_switch) (namelist:imogen_run_list) (namelist:imogen_anlg_vals_list)
Expand Down Expand Up @@ -253,14 +253,6 @@ source=(namelist:jules_urban)
!!npft_cable=13
!!urban_cable=15

[namelist:fire_switches]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:imogen_anlg_vals_list]
diff_frac_const_imogen=0.4
f_ocean=0.711
Expand Down Expand Up @@ -431,6 +423,14 @@ z1_tq_in=2.0
z1_tq_vary=.false.
z1_uv_in=10.0

[namelist:jules_fire_weather_index]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire_weather_index=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:jules_flake]
!!const_val=0
!!file=''
Expand Down
20 changes: 10 additions & 10 deletions rose-stem/app/gswp2_irrig_limit_high_river_storage/rose-app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meta=jules-standalone/vn8.2
meta=jules-standalone/vn8.2_t141

[command]
default=rose-run jules.exe
Expand All @@ -23,7 +23,7 @@ source=(namelist:jules_cropparm)
source=namelist:jules_drive

[file:fire.nml]
source=namelist:fire_switches
source=namelist:jules_fire_weather_index

[file:imogen.nml]
source=(namelist:imogen_onoff_switch) (namelist:imogen_run_list) (namelist:imogen_anlg_vals_list)
Expand Down Expand Up @@ -253,14 +253,6 @@ source=(namelist:jules_urban)
!!npft_cable=13
!!urban_cable=15

[namelist:fire_switches]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:imogen_anlg_vals_list]
diff_frac_const_imogen=0.4
f_ocean=0.711
Expand Down Expand Up @@ -430,6 +422,14 @@ z1_tq_in=2.0
z1_tq_vary=.false.
z1_uv_in=10.0

[namelist:jules_fire_weather_index]
!!canadian_flag=.false.
!!canadian_hemi_opt=.false.
l_fire_weather_index=.false.
!!mcarthur_flag=.false.
!!mcarthur_opt=1
!!nesterov_flag=.false.

[!!namelist:jules_flake]
!!const_val=0
!!file=''
Expand Down
Loading