Skip to content
Open
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
37 changes: 19 additions & 18 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# Contributors
| GitHub user | Real Name | Affiliation | Date |
| --------------- | ------------------ | -------------------------------- | ---------- |
| james-bruten-mo | James Bruten | Met Office | 2025-12-09 |
| jedbakerMO | Jed Baker | Met Office | 2025-12-29 |
| jennyhickson | Jenny Hickson | Met Office | 2025-12-10 |
| mike-hobson | Mike Hobson | Met Office | 2025-12-17 |
| mo-marqh | mark Hedley | Met Office | 2025-12-11 |
| yaswant | Yaswant Pradhan | Met Office | 2025-12-16 |
| oakleybrunt | Oakley Brunt | Met Office | 2025-12-19 |
| harry-shepherd | Harry Shepherd | Met Office | 2026-01-08 |
| DrTVockerodtMO | Terence Vockerodt | Met Office | 2026-01-08 |
| ricky-lv426 | Ricky Olivier | University of Exeter | 2026-01-12 |
| MetBenjaminWent | Benjamin Went | Met Office | 2026-01-15 |
| timgraham-Met | Tim Graham | Met Office | 2026-01-15 |
| mo-alistairp | Alistair Pirrie | Met Office | 2026-01-19 |
| jasonjunweilyu | Junwei (Jason) Lyu | Bureau of Meteorology, Australia | 2025-12-17 |
| EdHone | Ed Hone | Met Office | 2026-01-26 |
| alanjhewitt | Alan J Hewitt | Met Office | 2026-01-28 |
| GitHub user | Real Name | Affiliation | Date |
| --------------- | ------------------ | -------------------------------- | ---------- |
| james-bruten-mo | James Bruten | Met Office | 2025-12-09 |
| jedbakerMO | Jed Baker | Met Office | 2025-12-29 |
| jennyhickson | Jenny Hickson | Met Office | 2025-12-10 |
| mike-hobson | Mike Hobson | Met Office | 2025-12-17 |
| mo-marqh | mark Hedley | Met Office | 2025-12-11 |
| yaswant | Yaswant Pradhan | Met Office | 2025-12-16 |
| oakleybrunt | Oakley Brunt | Met Office | 2025-12-19 |
| harry-shepherd | Harry Shepherd | Met Office | 2026-01-08 |
| DrTVockerodtMO | Terence Vockerodt | Met Office | 2026-01-08 |
| ricky-lv426 | Ricky Olivier | University of Exeter | 2026-01-12 |
| MetBenjaminWent | Benjamin Went | Met Office | 2026-01-15 |
| timgraham-Met | Tim Graham | Met Office | 2026-01-15 |
| mo-alistairp | Alistair Pirrie | Met Office | 2026-01-19 |
| jasonjunweilyu | Junwei (Jason) Lyu | Bureau of Meteorology, Australia | 2025-12-17 |
| EdHone | Ed Hone | Met Office | 2026-01-26 |
| alanjhewitt | Alan J Hewitt | Met Office | 2026-01-28 |
| ukmo-juan-castillo | Juan M Castillo | Met Office | 2026-01-30 |
4 changes: 2 additions & 2 deletions applications/lfric2lfric/example/configuration.nml
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ coord_order = 1,
/

&partitioning
mesh_type = 'destination',
mesh_target = 'destination',
partitioner = 'cubedsphere',
panel_decomposition = 'auto',
/

&partitioning
mesh_type = 'source',
mesh_target = 'source',
partitioner = 'cubedsphere',
panel_decomposition = 'auto',
/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,17 @@ type=character

[namelist:partitioning]
duplicate=true
!instance_key_member=mesh_type
!instance_key_member=mesh_target

[namelist:partitioning=mesh_type]
[namelist:partitioning=mesh_target]
compulsory=true
description=The purpose of the mesh
!enumeration=true
help=The mesh can be used to perform a LFRic forecast (Dynamics),
=or to describe the source and the destination grids in
=the lfric2lfric regridding program.
help=The designation of the mesh to which this
=partitioning profile is to be applied.
=
=Recognised designations are:
= * 'source'
= * 'destination'
ns=namelist/lfric2lfric/configuration
value-titles=Dynamics, Source, Destination
values='dynamics', 'source', 'destination'
!string_length=default
type=character
24 changes: 21 additions & 3 deletions applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,10 @@ def __repr__(self):

"""
Copy this template and complete to add your macro

class vnXX_txxx(MacroUpgrade):
# Upgrade macro for <TICKET> by <Author>

BEFORE_TAG = "vnX.X"
AFTER_TAG = "vnX.X_txxx"

def upgrade(self, config, meta_config=None):
# Add settings
return config, self.reports
Expand All @@ -43,5 +40,26 @@ def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-lfric_atm
"""Set segmentation size for Gregory-Rowntree convection kernel"""
self.add_setting(config, ["namelist:physics", "conv_gr_segment"], "16")
return config, self.reports


class vn30_t192(MacroUpgrade):
"""Upgrade macro for ticket #192 by Juan M. Castillo."""

BEFORE_TAG = "vn3.0_t99"
AFTER_TAG = "vn3.0_t192"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-lfric2lfric
self.rename_setting(
config,
["namelist:partitioning(source)", "mesh_type"],
["namelist:partitioning(source)", "mesh_target"],
)
self.rename_setting(
config,
["namelist:partitioning(destination)", "mesh_type"],
["namelist:partitioning(destination)", "mesh_target"],
)

return config, self.reports
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,21 @@ subroutine init_mesh( configuration, &
! Extract and check configuration variables
!============================================================================
! Read partitioning namelist for source and destination meshes
if (.not. configuration%namelist_exists('partitioning', 'source')) then
write( log_scratch_space, '(A)' ) &
'Source mesh partitioning namelist (partitioning:source) not found.'
call log_event(log_scratch_space, log_level_error)
end if
src_partitioning_nml => configuration%get_namelist('partitioning', &
'source')
call src_partitioning_nml%get_value( 'generate_inner_halos', &
generate_inner_halos(src) )

if (.not. configuration%namelist_exists('partitioning', 'destination')) then
write( log_scratch_space, '(A)' ) &
'Destination mesh partitioning namelist (partitioning:destination) not found.'
call log_event(log_scratch_space, log_level_error)
end if
dst_partitioning_nml => configuration%get_namelist('partitioning', &
'destination')
call dst_partitioning_nml%get_value( 'generate_inner_halos', &
Expand Down
4 changes: 2 additions & 2 deletions rose-stem/app/lfric2lfric/rose-app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -808,15 +808,15 @@ wavelength=0

[namelist:partitioning(destination)]
generate_inner_halos=.false.
mesh_type='destination'
mesh_target='destination'
panel_decomposition='auto'
!!panel_xproc=0
!!panel_yproc=0
partitioner='cubedsphere'

[namelist:partitioning(source)]
generate_inner_halos=.false.
mesh_type='source'
mesh_target='source'
panel_decomposition='auto'
!!panel_xproc=0
!!panel_yproc=0
Expand Down
3 changes: 3 additions & 0 deletions rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"src_mesh": "",
"src_name": "",
"src_type": "",
"mpi_parts": 4,
}) %}
Comment on lines 17 to 20
Copy link
Contributor

Choose a reason for hiding this comment

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

Revert


{% elif task_ns.conf_name == "oasis_ral_seuk-C32_lam_MG" %}
Expand Down Expand Up @@ -81,6 +82,7 @@
"src_mesh": "",
"src_name": "",
"src_type": "",
"mpi_parts": 6,
}) %}
Comment on lines 83 to 86
Copy link
Contributor

Choose a reason for hiding this comment

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

Revert


{% elif task_ns.conf_name == "oasis_clim_gal9-C24_C12" %}
Expand All @@ -94,6 +96,7 @@
"src_mesh": "C24_C12",
"src_name": "C12",
"src_type": "global",
"mpi_parts": 6,
}) %}
Comment on lines 97 to 100
Copy link
Contributor

Choose a reason for hiding this comment

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

Revert


{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam" %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Inner product checksum zh = 41EC942AC03AF332
Inner product checksum rho = 40FA7F5C1F732D71
Inner product checksum theta = 4252B9378905BFA5
Inner product checksum zh = 41EC942AC03AF31C
Inner product checksum rho = 40FA7F5C1F732DD0
Inner product checksum theta = 4252B9378905BF6B
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Inner product checksum zh = 41ECDF73332019EF
Inner product checksum rho = 40FAC5EEBDF23EBB
Inner product checksum theta = 4252EB3465F61645
Inner product checksum zh = 41ECDF7333201A1E
Inner product checksum rho = 40FAC5EEBDF2402D
Inner product checksum theta = 4252EB3465F61725
Loading