Skip to content

Commit 633e061

Browse files
mattatmetmattatmet
authored
Merge branch 'MetOffice:main' into profiling-kernels
2 parents 96075aa + f702b26 commit 633e061

468 files changed

Lines changed: 23957 additions & 2465 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.

‎.github/CODEOWNERS‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
**/jedi_lfric_tests @ss421 @matthewrmshin @MetOffice/r2o-systems
1111
**/jules @iboutle # @MetOfficessdtesam
1212
**/lfric2lfric @mo-lottieturner # @mike-hobson
13-
**/lfricinputs @mo-lottieturner # @mike-hobson
1413
**/lfric_atm @iboutle # @BShipway
1514
**/lfric_coupled @HengistPodd # @BShipway
1615
**/lfricinputs @mo-lottieturner # @mike-hobson
@@ -21,6 +20,11 @@
2120
**/solver @christophermaynard # @thomasmelvin
2221
**/transport @tommbendall # @jameskent-metoffice
2322

23+
# Rose-Stem - those that don't have an applications area of the same name
24+
**/lfric2um @mo-lottieturner # @mike-hobson
25+
**/scintelapi @mo-lottieturner # @mike-hobson
26+
**/um2lfric @mo-lottieturner # @mike-hobson
27+
2428
# Science
2529
**/adjoint @DrTVockerodtMO # @mo-joshuacolclough
2630
**/linear @cjohnson-pi @MetOffice/r2o-systems # @tommbendall # Also notifiy jedi team about linear changes.
@@ -66,10 +70,10 @@ rose-stem/lib/ @james-bruten-mo # @je
6670
rose-stem/bin/ @james-bruten-mo # @jennyhickson
6771
rose-stem/site/meto/common/ @james-bruten-mo # @jennyhickson
6872
rose-stem/site/meto/macros/ @james-bruten-mo # @jennyhickson
69-
rose-stem/apps # Mostly updated by macros, no codeowner
73+
rose-stem/app # Mostly updated by macros, no codeowner
7074
**/rose-meta/**/version*.py @james-bruten-mo # @jennyhickson
7175
build/ @MetOffice/ssdteam @hiker
72-
interfaces/build/ @christophermaynard
76+
interfaces/build/ @christophermaynard
7377
**/*Makefile @MatthewHambley @hiker
7478
**/*.mk @MatthewHambley @hiker
7579
**/optimisation @christophermaynard # HPC Optimisation Team
@@ -79,3 +83,6 @@ documentation # @MetOffice/ssdteam
7983
.github/ @MetOffice/ssdteam
8084
LICENSE @yaswant
8185
README.md @MetOffice/ssdteam
86+
87+
# Owners of specific documentation sections
88+
documentation/source/science_guide/cloud_schemes @paul-barrett

‎CONTRIBUTORS.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,8 @@
3939
| DrTVockerodtMO | Terence Vockerodt | Met Office | 2026-01-08 |
4040
| mattatmet | Matthew Walker | Met Office | 2026-04-21 |
4141
| MetBenjaminWent | Benjamin Went | Met Office | 2026-01-15 |
42-
| mo-rickywong | Ricky Wong | Met Office | 2026-24-02 |
42+
| mo-rickywong | Ricky Wong | Met Office | 2026-02-24 |
43+
| ericaneininger | Erica Neininger | Met Office | 2026-03-02 |
4344
| theabro | Nathan Luke Abraham | NCAS & University of Cambridge | 2026-04-15 |
45+
| ss421 | Steven Sandbach | Met Office | 2026-04-20 |
46+
| MichaelWhitall | Michael Whitall | Met Office | 2026-04-22 |

‎applications/adjoint_tests/example/configuration.nml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ start_dump_filename='final_pert',
8181
&finite_element
8282
cellshape='quadrilateral',
8383
coord_order=1,
84+
coord_order_nonprime=1,
85+
coord_space='Wchi',
8486
coord_system='native',
8587
element_order_h=0,
8688
element_order_v=0,

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,41 @@ def upgrade(self, config, meta_config=None):
110110
)
111111

112112
return config, self.reports
113+
114+
115+
class vn31_t368(MacroUpgrade):
116+
"""Upgrade macro for ticket #368 by Ian Boutle."""
117+
118+
BEFORE_TAG = "vn3.1_t348"
119+
AFTER_TAG = "vn3.1_t368"
120+
121+
def upgrade(self, config, meta_config=None):
122+
# Commands From: rose-meta/um-convection
123+
self.add_setting(
124+
config, ["namelist:convection", "llcs_first_outer"], ".false."
125+
)
126+
127+
return config, self.reports
128+
129+
130+
class vn31_t238(MacroUpgrade):
131+
"""Upgrade macro for ticket #238 by Thomas Bendall."""
132+
133+
BEFORE_TAG = "vn3.1_t368"
134+
AFTER_TAG = "vn3.1_t238"
135+
136+
def upgrade(self, config, meta_config=None):
137+
# Commands From: rose-meta/lfric-driver
138+
self.add_setting(
139+
config, ["namelist:finite_element", "coord_space"], "'Wchi'"
140+
)
141+
coord_order = self.get_setting_value(
142+
config, ["namelist:finite_element", "coord_order"]
143+
)
144+
self.add_setting(
145+
config,
146+
["namelist:finite_element", "coord_order_nonprime"],
147+
coord_order,
148+
)
149+
150+
return config, self.reports

‎applications/adjoint_tests/source/algorithm/solver/adjt_mixed_operator_alg_mod.x90‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ module adjt_mixed_operator_alg_mod
3232
use finite_element_config_mod, only: element_order_h, element_order_v
3333
use function_space_collection_mod, only: function_space_collection
3434
use moist_dyn_mod, only: num_moist_factors
35-
use copy_field_alg_mod, only: copy_field
3635
use fs_continuity_mod, only: W2, W3, Wtheta
3736
use si_operators_alg_mod, only: compute_si_operators
3837
use sci_enforce_bc_kernel_mod, only: enforce_bc_kernel_type
@@ -129,10 +128,10 @@ contains
129128

130129
call invoke( enforce_bc_kernel_type(rhs(igh_u)) ) ! Needed for adjoint test
131130

132-
call copy_field( rhs(igh_u), rhs_rsol(igh_u) )
133-
call copy_field( rhs(igh_t), rhs_rsol(igh_t) )
134-
call copy_field( rhs(igh_d), rhs_rsol(igh_d) )
135-
call copy_field( rhs(igh_p), rhs_rsol(igh_p) )
131+
call invoke( real_to_real_x( rhs_rsol(igh_u), rhs(igh_u) ), &
132+
real_to_real_x( rhs_rsol(igh_t), rhs(igh_t) ), &
133+
real_to_real_x( rhs_rsol(igh_d), rhs(igh_d) ), &
134+
real_to_real_x( rhs_rsol(igh_p), rhs(igh_p) ) )
136135

137136
! --------------------------------------------------------------------------
138137
! Solve the semi-implicit operator (i.e., forward code)

‎applications/adjoint_tests/source/algorithm/solver/adjt_mixed_schur_preconditioner_alg_mod.x90‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module adjt_mixed_schur_preconditioner_alg_mod
2727
tik, LPROF
2828
use finite_element_config_mod, only: element_order_h, element_order_v
2929
use function_space_collection_mod, only: function_space_collection
30-
use copy_field_alg_mod, only: copy_field
3130
use driver_modeldb_mod, only: modeldb_type
3231
use fs_continuity_mod, only: W2, W3, Wtheta
3332
use si_operators_alg_mod, only: compute_si_operators
@@ -142,10 +141,10 @@ contains
142141
! This is required to put sensible data in the halo so there is something
143142
! for enforce_bc_kernel to work with
144143

145-
call copy_field( rhs(igh_u), rhs_rsol(igh_u) )
146-
call copy_field( rhs(igh_t), rhs_rsol(igh_t) )
147-
call copy_field( rhs(igh_d), rhs_rsol(igh_d) )
148-
call copy_field( rhs(igh_p), rhs_rsol(igh_p) )
144+
call invoke( real_to_real_x( rhs_rsol(igh_u), rhs(igh_u) ), &
145+
real_to_real_x( rhs_rsol(igh_t), rhs(igh_t) ), &
146+
real_to_real_x( rhs_rsol(igh_d), rhs(igh_d) ), &
147+
real_to_real_x( rhs_rsol(igh_p), rhs(igh_p) ) )
149148

150149
call invoke(enforce_bc_kernel_type(rhs(igh_u)))
151150

‎applications/adjoint_tests/source/algorithm/solver/adjt_mixed_solver_alg_mod.x90‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ module adjt_mixed_solver_alg_mod
3131
tik, LPROF
3232
use finite_element_config_mod, only: element_order_h, element_order_v
3333
use function_space_collection_mod, only: function_space_collection
34-
use copy_field_alg_mod, only: copy_field
3534
use driver_modeldb_mod, only: modeldb_type
3635
use solver_constants_mod, only: get_normalisation
3736
use fs_continuity_mod, only: W2, W3, Wtheta
@@ -173,10 +172,10 @@ contains
173172
! This is required to put sensible data in the halo so there is something
174173
! for enforce_bc_kernel to work with
175174

176-
call copy_field( rhs(igh_u), rhs_rsol(igh_u) )
177-
call copy_field( rhs(igh_t), rhs_rsol(igh_t) )
178-
call copy_field( rhs(igh_d), rhs_rsol(igh_d) )
179-
call copy_field( rhs(igh_p), rhs_rsol(igh_p) )
175+
call invoke( real_to_real_x( rhs_rsol(igh_u), rhs(igh_u) ), &
176+
real_to_real_x( rhs_rsol(igh_t), rhs(igh_t) ), &
177+
real_to_real_x( rhs_rsol(igh_d), rhs(igh_d) ), &
178+
real_to_real_x( rhs_rsol(igh_p), rhs(igh_p) ) )
180179

181180
! LS
182181

‎applications/adjoint_tests/source/algorithm/solver/adjt_pressure_precon_alg_mod.x90‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module adjt_pressure_precon_alg_mod
2525
tik, LPROF
2626
use finite_element_config_mod, only: element_order_h, element_order_v
2727
use function_space_collection_mod, only: function_space_collection
28-
use copy_field_alg_mod, only: copy_field
2928
use driver_modeldb_mod, only: modeldb_type
3029
use fs_continuity_mod, only: W2, W3, Wtheta
3130
use si_operators_alg_mod, only: compute_si_operators
@@ -131,10 +130,10 @@ contains
131130
! This is required to put sensible data in the halo so there is something
132131
! for enforce_bc_kernel to work with
133132

134-
call copy_field( rhs(igh_u), rhs_rsol(igh_u) )
135-
call copy_field( rhs(igh_t), rhs_rsol(igh_t) )
136-
call copy_field( rhs(igh_d), rhs_rsol(igh_d) )
137-
call copy_field( rhs(igh_p), rhs_rsol(igh_p) )
133+
call invoke( real_to_real_x( rhs_rsol(igh_u), rhs(igh_u) ), &
134+
real_to_real_x( rhs_rsol(igh_t), rhs(igh_t) ), &
135+
real_to_real_x( rhs_rsol(igh_d), rhs(igh_d) ), &
136+
real_to_real_x( rhs_rsol(igh_p), rhs(igh_p) ) )
138137

139138
call invoke(enforce_bc_kernel_type(rhs(igh_u)))
140139

‎applications/adjoint_tests/source/algorithm/transport/mol/atlt_mol_conservative_alg_mod.x90‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ module atlt_mol_conservative_alg_mod
1111
use field_mod, only : field_type
1212
use function_space_mod, only : function_space_type
1313
use constants_mod, only : r_def, i_def, l_def, EPS
14-
use copy_field_alg_mod, only : copy_field
1514
use log_mod, only : log_event, &
1615
log_scratch_space, &
1716
LOG_LEVEL_INFO, &

‎applications/gravity_wave/example/configuration.nml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ start_dump_filename = ''
3232
&finite_element
3333
cellshape = 'quadrilateral'
3434
coord_order = 1
35+
coord_order_nonprime = 1,
36+
coord_space = 'Wchi',
3537
coord_system = 'native'
3638
element_order_h = 0
3739
element_order_v = 0

0 commit comments

Comments
 (0)