Skip to content

Commit 96075aa

Browse files
mattatmetmattatmet
committed
Merge branch 'main' into profiling-kernels
2 parents f506758 + 9ee7884 commit 96075aa

89 files changed

Lines changed: 989 additions & 238 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CONTRIBUTORS.md‎

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,43 @@
11
# Contributors
2-
| GitHub user | Real Name | Affiliation | Date |
3-
| ------------------- | ------------------ | -------------------------------- | ---------- |
4-
| james-bruten-mo | James Bruten | Met Office | 2025-12-09 |
5-
| jedbakerMO | Jed Baker | Met Office | 2025-12-29 |
6-
| jennyhickson | Jenny Hickson | Met Office | 2025-12-10 |
7-
| mike-hobson | Mike Hobson | Met Office | 2025-12-17 |
8-
| mo-marqh | mark Hedley | Met Office | 2025-12-11 |
9-
| mo-rickywong | Ricky Wong | Met Office | 2026-24-02 |
10-
| yaswant | Yaswant Pradhan | Met Office | 2025-12-16 |
11-
| oakleybrunt | Oakley Brunt | Met Office | 2025-12-19 |
12-
| harry-shepherd | Harry Shepherd | Met Office | 2026-01-08 |
13-
| DrTVockerodtMO | Terence Vockerodt | Met Office | 2026-01-08 |
14-
| ricky-lv426 | Ricky Olivier | University of Exeter | 2026-01-12 |
15-
| MetBenjaminWent | Benjamin Went | Met Office | 2026-01-15 |
16-
| timgraham-Met | Tim Graham | Met Office | 2026-01-15 |
17-
| mcdalvi | Mohit Dalvi | Met Office | 2026-01-15 |
18-
| mo-alistairp | Alistair Pirrie | Met Office | 2026-01-19 |
19-
| jasonjunweilyu | Junwei (Jason) Lyu | Bureau of Meteorology, Australia | 2025-12-17 |
20-
| EdHone | Ed Hone | Met Office | 2026-01-26 |
21-
| tom-j-h | Tom Hill | Met Office | 2026-01-27 |
22-
| alanjhewitt | Alan J Hewitt | Met Office | 2026-01-28 |
23-
| mo-lottieturner | Lottie Turner | Met Office | 2026-01-27 |
24-
| andrewcoughtrie | Andrew Coughtrie | Met Office | 2026-01-28 |
25-
| tommbendall | Thomas Bendall | Met Office | 2026-01-13 |
26-
| mo-jmanners | James Manners | Met Office | 2026-01-14 |
27-
| maggiehendry | Maggie Hendry | Met Office | 2026-01-29 |
28-
| stevemullerworth | Steve Mullerworth | Met Office | 2026-01-28 |
29-
| jameskent-metoffice | James Kent | Met Office | 2026-01-21 |
30-
| cjohnson-pi | Christine Johnson | Met Office | 2026-01-19 |
31-
| t00sa | Sam Clarke-Green | Met Office | 2026-01-20 |
32-
| ukmo-juan-castillo | Juan M. Castillo | Met Office | 2026-01-23 |
33-
| Adrian-Lock | Adrian Lock | Met Office | 2026-01-09 |
34-
| thomasmelvin | Thomas Melvin | Met Office | 2026-01-15 |
35-
| tinyendian | Wolfgang Hayek | Earth Sciences New Zealand | 2026-02-02 |
36-
| DanStoneMO | Daniel Stone | Met Office | 2026-02-26 |
37-
| ericaneininger | Erica Neininger | Met Office | 2026-03-02 |
38-
| mo-lucy-gordon | Lucy Gordon | Met Office | 2026-03-11 |
39-
| iboutle | Ian Boutle | Met Office | 2026-03-04 |
40-
| Pierre-siddall | Pierre Siddall | Met Office | 2026-03-02 |
2+
| GitHub user | Real Name | Affiliation | Date |
3+
| ------------------- | ------------------ | -------------------------------- | ---------- |
4+
| jedbakerMO | Jed Baker | Met Office | 2025-12-29 |
5+
| tommbendall | Thomas Bendall | Met Office | 2026-01-13 |
6+
| iboutle | Ian Boutle | Met Office | 2026-03-06 |
7+
| ukmo-juan-castillo | Juan M. Castillo | Met Office | 2026-01-23 |
8+
| t00sa | Sam Clarke-Green | Met Office | 2026-01-20 |
9+
| andrewcoughtrie | Andrew Coughtrie | Met Office | 2026-01-28 |
10+
| oakleybrunt | Oakley Brunt | Met Office | 2025-12-19 |
11+
| james-bruten-mo | James Bruten | Met Office | 2025-12-09 |
12+
| mcdalvi | Mohit Dalvi | Met Office | 2026-01-15 |
13+
| mo-lucy-gordon | Lucy Gordon | Met Office | 2026-03-11 |
14+
| timgraham-Met | Tim Graham | Met Office | 2026-01-15 |
15+
| tinyendian | Wolfgang Hayek | Earth Sciences New Zealand | 2026-02-02 |
16+
| mo-marqh | mark Hedley | Met Office | 2025-12-11 |
17+
| maggiehendry | Maggie Hendry | Met Office | 2026-01-29 |
18+
| alanjhewitt | Alan J Hewitt | Met Office | 2026-01-28 |
19+
| jennyhickson | Jenny Hickson | Met Office | 2025-12-10 |
20+
| tom-j-h | Tom Hill | Met Office | 2026-01-27 |
21+
| mike-hobson | Mike Hobson | Met Office | 2025-12-17 |
22+
| EdHone | Ed Hone | Met Office | 2026-01-26 |
4123
| jirudaya | Jaffery Irudayasamy | University of Edinburgh | 2026-03-11 |
42-
| mattatmet | Matthew Walker | Met Office | 2026-04-21 |
24+
| cjohnson-pi | Christine Johnson | Met Office | 2026-01-19 |
25+
| jameskent-metoffice | James Kent | Met Office | 2026-01-21 |
26+
| Adrian-Lock | Adrian Lock | Met Office | 2026-01-09 |
27+
| jasonjunweilyu | Junwei (Jason) Lyu | Bureau of Meteorology, Australia | 2025-12-17 |
28+
| mo-jmanners | James Manners | Met Office | 2026-01-14 |
29+
| thomasmelvin | Thomas Melvin | Met Office | 2026-01-15 |
30+
| stevemullerworth | Steve Mullerworth | Met Office | 2026-01-28 |
31+
| ericaneininger | Erica Neininger | Met Office | 2026-03-02 |
32+
| ricky-lv426 | Ricky Olivier | University of Exeter | 2026-01-12 |
33+
| mo-alistairp | Alistair Pirrie | Met Office | 2026-01-19 |
34+
| yaswant | Yaswant Pradhan | Met Office | 2025-12-16 |
35+
| harry-shepherd | Harry Shepherd | Met Office | 2026-01-08 |
36+
| Pierre-siddall | Pierre Siddall | Met Office | 2026-03-02 |
37+
| DanStoneMO | Daniel Stone | Met Office | 2026-02-26 |
38+
| mo-lottieturner | Lottie Turner | Met Office | 2026-01-27 |
39+
| DrTVockerodtMO | Terence Vockerodt | Met Office | 2026-01-08 |
40+
| mattatmet | Matthew Walker | Met Office | 2026-04-21 |
41+
| MetBenjaminWent | Benjamin Went | Met Office | 2026-01-15 |
42+
| mo-rickywong | Ricky Wong | Met Office | 2026-24-02 |
43+
| theabro | Nathan Luke Abraham | NCAS & University of Cambridge | 2026-04-15 |

‎applications/adjoint_tests/Makefile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ export PSYCLONE_CONFIG_FILE := $(PROJECT_DIR)/build/psyclone.cfg
2525
export BUILD_ADJ_TESTS := TRUE
2626
export PSYAD_CONFIG_FILE := $(PSYCLONE_CONFIG_FILE)
2727

28+
export EXTRA_ROSE_META = jules
29+
export META_DIR = $(WORKING_DIR)/../rose-meta
30+
export ROSE_META_DIRS = $(APPS_ROOT_DIR)/rose-meta $(META_DIR)
31+
2832
export INTERNAL_DEPENDENCIES = $(CORE_ROOT_DIR)/infrastructure \
2933
$(CORE_ROOT_DIR)/components/driver \
3034
$(CORE_ROOT_DIR)/components/science \
@@ -123,6 +127,10 @@ build: ALWAYS
123127
$(call MESSAGE,========================================)
124128
$Q$(MAKE) $(QUIET_ARG) -f $(LFRIC_BUILD)/extract.mk \
125129
SOURCE_DIR=source
130+
$(call MESSAGE,========================================)
131+
$(call MESSAGE,Extracting External Rose Metadata)
132+
$(call MESSAGE,========================================)
133+
$Q$(MAKE) $(QUIET_ARG) -f $(APPS_ROOT_DIR)/build/extract/extract_meta.mk
126134
$(call MESSAGE,=========================================================)
127135
$(call MESSAGE,Generating $(PROJECT) namelist loaders)
128136
$(call MESSAGE,=========================================================)

‎applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,19 @@ def upgrade(self, config, meta_config=None):
9494
self.add_setting(config, ["namelist:physics", "lw_segment_limit"], "32")
9595

9696
return config, self.reports
97+
98+
99+
class vn31_t348(MacroUpgrade):
100+
"""Upgrade macro for ticket #348 by Ian Boutle."""
101+
102+
BEFORE_TAG = "vn3.1_t363"
103+
AFTER_TAG = "vn3.1_t348"
104+
105+
def upgrade(self, config, meta_config=None):
106+
# Commands From: rose-meta/lfric-gungho
107+
# Use PMSL halo calculations by default
108+
self.add_setting(
109+
config, ["namelist:physics", "pmsl_halo_calcs"], ".true."
110+
)
111+
112+
return config, self.reports

‎applications/gravity_wave/Makefile‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ export PSYCLONE_TRANSFORMATION ?= minimum
2020

2121
export PROJECT_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
2222

23+
export EXTRA_ROSE_META = jules
24+
export META_DIR = $(WORKING_DIR)/../rose-meta
25+
export ROSE_META_DIRS = $(APPS_ROOT_DIR)/rose-meta $(META_DIR)
26+
2327
export INTERNAL_DEPENDENCIES = $(CORE_ROOT_DIR)/infrastructure \
2428
$(CORE_ROOT_DIR)/components/driver \
2529
$(CORE_ROOT_DIR)/components/science \
@@ -46,6 +50,7 @@ default: build unit-tests integration-tests
4650
documentation doc docs: document-uml document-latex document-api
4751
$(Q)echo > /dev/null
4852

53+
include $(APPS_ROOT_DIR)/build/extract/extract_meta.mk
4954
include $(CORE_ROOT_DIR)/infrastructure/build/lfric.mk
5055
include $(INTERNAL_DEPENDENCIES:=/build/import.mk)
5156

@@ -116,6 +121,10 @@ build: ALWAYS
116121
$(call MESSAGE,========================================)
117122
$Q$(MAKE) $(QUIET_ARG) -f $(LFRIC_BUILD)/extract.mk \
118123
SOURCE_DIR=source
124+
$(call MESSAGE,========================================)
125+
$(call MESSAGE,Extracting External Rose Metadata)
126+
$(call MESSAGE,========================================)
127+
$Q$(MAKE) $(QUIET_ARG) -f $(APPS_ROOT_DIR)/build/extract/extract_meta.mk
119128
$(call MESSAGE,=========================================================)
120129
$(call MESSAGE,Generating namelist loaders for $(PROJECT))
121130
$(call MESSAGE,=========================================================)
@@ -157,8 +166,8 @@ unit-tests/%: export PROJECT = $(PROJECT_NAME)
157166
unit-tests/%: export SOURCE_DIR = source
158167
unit-tests/%: export TEST_DIR = unit-test
159168
unit-tests/%: export WORKING_DIR := $(WORKING_DIR)/unit-test
160-
unit-tests: unit-tests/run
161-
169+
unit-tests: extract_meta unit-tests/run
170+
unit-tests/build: extract_meta unit-tests/build
162171

163172
##############################################################################
164173
# Integration tests

‎applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,19 @@ def upgrade(self, config, meta_config=None):
5959
self.add_setting(config, ["namelist:physics", "lw_segment_limit"], "32")
6060

6161
return config, self.reports
62+
63+
64+
class vn31_t348(MacroUpgrade):
65+
"""Upgrade macro for ticket #348 by Ian Boutle."""
66+
67+
BEFORE_TAG = "vn3.1_t363"
68+
AFTER_TAG = "vn3.1_t348"
69+
70+
def upgrade(self, config, meta_config=None):
71+
# Commands From: rose-meta/lfric-gungho
72+
# Use PMSL halo calculations by default
73+
self.add_setting(
74+
config, ["namelist:physics", "pmsl_halo_calcs"], ".true."
75+
)
76+
77+
return config, self.reports

‎applications/gungho_model/Makefile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ export PSYCLONE_TRANSFORMATION ?= minimum
1919

2020
export PROJECT_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
2121

22+
export EXTRA_ROSE_META = jules
23+
export META_DIR = $(WORKING_DIR)/../rose-meta
24+
export ROSE_META_DIRS = $(APPS_ROOT_DIR)/rose-meta $(META_DIR)
25+
2226
export INTERNAL_DEPENDENCIES = $(CORE_ROOT_DIR)/infrastructure \
2327
$(CORE_ROOT_DIR)/components/driver \
2428
$(CORE_ROOT_DIR)/components/science \
@@ -87,6 +91,10 @@ build: ALWAYS
8791
$(call MESSAGE,========================================)
8892
$Q$(MAKE) $(QUIET_ARG) -f $(LFRIC_BUILD)/extract.mk \
8993
SOURCE_DIR=source
94+
$(call MESSAGE,========================================)
95+
$(call MESSAGE,Extracting External Rose Metadata)
96+
$(call MESSAGE,========================================)
97+
$Q$(MAKE) $(QUIET_ARG) -f $(APPS_ROOT_DIR)/build/extract/extract_meta.mk
9098
$(call MESSAGE,=========================================================)
9199
$(call MESSAGE,Generating $(PROJECT) namelist loaders)
92100
$(call MESSAGE,=========================================================)

‎applications/gungho_model/rose-meta/lfric-gungho_model/versions.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,19 @@ def upgrade(self, config, meta_config=None):
5959
self.add_setting(config, ["namelist:physics", "lw_segment_limit"], "32")
6060

6161
return config, self.reports
62+
63+
64+
class vn31_t348(MacroUpgrade):
65+
"""Upgrade macro for ticket #348 by Ian Boutle."""
66+
67+
BEFORE_TAG = "vn3.1_t363"
68+
AFTER_TAG = "vn3.1_t348"
69+
70+
def upgrade(self, config, meta_config=None):
71+
# Commands From: rose-meta/lfric-gungho
72+
# Use PMSL halo calculations by default
73+
self.add_setting(
74+
config, ["namelist:physics", "pmsl_halo_calcs"], ".true."
75+
)
76+
77+
return config, self.reports

‎applications/jedi_lfric_tests/Makefile‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ export PSYCLONE_TRANSFORMATION ?= minimum
2020

2121
export PROJECT_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
2222

23+
export EXTRA_ROSE_META = jules
24+
export META_DIR = $(WORKING_DIR)/../rose-meta
25+
export ROSE_META_DIRS = $(APPS_ROOT_DIR)/rose-meta $(META_DIR)
26+
2327
export INTERNAL_DEPENDENCIES = $(CORE_ROOT_DIR)/infrastructure \
2428
$(CORE_ROOT_DIR)/components/driver \
2529
$(CORE_ROOT_DIR)/components/science \
@@ -49,6 +53,7 @@ default: build integration-tests
4953
documentation doc docs: document-uml document-latex document-api
5054
$(Q)echo > /dev/null
5155

56+
include $(APPS_ROOT_DIR)/build/extract/extract_meta.mk
5257
include $(CORE_ROOT_DIR)/infrastructure/build/lfric.mk
5358
include $(INTERNAL_DEPENDENCIES:=/build/import.mk)
5459
-include $(PROJECT_DIR)/build/project.mk
@@ -123,6 +128,10 @@ build: ALWAYS
123128
$Q$(MAKE) $(QUIET_ARG) -f $(LFRIC_BUILD)/extract.mk \
124129
SOURCE_DIR=source \
125130
WORKING_DIR=$(WORKING_DIR)
131+
$(call MESSAGE,========================================)
132+
$(call MESSAGE,Extracting External Rose Metadata)
133+
$(call MESSAGE,========================================)
134+
$Q$(MAKE) $(QUIET_ARG) -f $(APPS_ROOT_DIR)/build/extract/extract_meta.mk
126135
$(call MESSAGE,=========================================================)
127136
$(call MESSAGE,Generating $(PROJECT) namelist loaders)
128137
$(call MESSAGE,=========================================================)
@@ -175,8 +184,8 @@ unit-tests/%: export PROJECT = $(PROJECT_NAME)
175184
unit-tests/%: export SOURCE_DIR = source
176185
unit-tests/%: export TEST_DIR = unit-test
177186
unit-tests/%: export WORKING_DIR := $(WORKING_DIR)/unit-test
178-
unit-tests: unit-tests/run
179-
187+
unit-tests: extract_meta unit-tests/run
188+
unit-tests/build: extract_meta unit-tests/build
180189

181190
##############################################################################
182191
# Integration tests
@@ -197,8 +206,8 @@ integration-tests/%: export PROJECT = $(PROJECT_NAME)
197206
integration-tests/%: export SOURCE_DIR = source
198207
integration-tests/%: export TEST_DIR = integration-test
199208
integration-tests/%: export WORKING_DIR := $(WORKING_DIR)/integration-tests
200-
integration-tests: integration-tests/run
201-
209+
integration-tests: extract_meta integration-tests/run
210+
integration-tests/build: extract_meta integration-tests/build
202211

203212
##############################################################################
204213
# Clean

‎applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,19 @@ def upgrade(self, config, meta_config=None):
9494
self.add_setting(config, ["namelist:physics", "lw_segment_limit"], "32")
9595

9696
return config, self.reports
97+
98+
99+
class vn31_t348(MacroUpgrade):
100+
"""Upgrade macro for ticket #348 by Ian Boutle."""
101+
102+
BEFORE_TAG = "vn3.1_t363"
103+
AFTER_TAG = "vn3.1_t348"
104+
105+
def upgrade(self, config, meta_config=None):
106+
# Commands From: rose-meta/lfric-gungho
107+
# Use PMSL halo calculations by default
108+
self.add_setting(
109+
config, ["namelist:physics", "pmsl_halo_calcs"], ".true."
110+
)
111+
112+
return config, self.reports

‎applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,19 @@ def upgrade(self, config, meta_config=None):
9494
self.add_setting(config, ["namelist:physics", "lw_segment_limit"], "32")
9595

9696
return config, self.reports
97+
98+
99+
class vn31_t348(MacroUpgrade):
100+
"""Upgrade macro for ticket #348 by Ian Boutle."""
101+
102+
BEFORE_TAG = "vn3.1_t363"
103+
AFTER_TAG = "vn3.1_t348"
104+
105+
def upgrade(self, config, meta_config=None):
106+
# Commands From: rose-meta/lfric-gungho
107+
# Use PMSL halo calculations by default
108+
self.add_setting(
109+
config, ["namelist:physics", "pmsl_halo_calcs"], ".true."
110+
)
111+
112+
return config, self.reports

0 commit comments

Comments
 (0)