Skip to content

Lfric2lfric test multi cpu #367

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

Closed
Juan Manuel Castillo Sanchez (ukmo-juan-castillo) wants to merge 41 commits into from
Closed

Lfric2lfric test multi cpu #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a6a7fbd
Proposed changes: change type of duplicated namelist, add test with
ukmo-juan-castillo Jan 28, 2026
b4df63e
Issue #192: add empty upgrade macro
ukmo-juan-castillo Jan 29, 2026
cdbeaf2
Issue 192: modifications agreed with the lfric team
ukmo-juan-castillo Jan 29, 2026
d7fe894
Issue #192: fix missing brackets; fix update macro
ukmo-juan-castillo Jan 29, 2026
4acd070
Issue #192: add name to contributor list, correct error message
ukmo-juan-castillo Jan 30, 2026
41df24c
Issue #192: changes suggested by the reviewer
ukmo-juan-castillo Jan 30, 2026
cf37023
Issue 192: update partitioning namelist in lfric2lfric
ukmo-juan-castillo Jan 30, 2026
6ea37ae
Revert previous change, intended for another branch
ukmo-juan-castillo Jan 30, 2026
d2f32d2
Minor, aesthetic changes
ukmo-juan-castillo Feb 19, 2026
eb7c0a1
Merge branch 'main' into lfric2lfric_multi_CPU
ukmo-juan-castillo Feb 19, 2026
f0526d2
Update tests and KGOs
ukmo-juan-castillo Feb 19, 2026
792985c
Remove KGOs no longer used
ukmo-juan-castillo Feb 19, 2026
18026b7
Remove more KGOs no longer used
ukmo-juan-castillo Feb 19, 2026
4ee7122
Issue 192: update partitioning namelist in lfric2lfric
ukmo-juan-castillo Jan 30, 2026
e5ac5f5
Revert previous change, intended for another branch
ukmo-juan-castillo Jan 30, 2026
0d6d952
Following reviewer's instructions, remove new rose stem tests
ukmo-juan-castillo Feb 25, 2026
480729d
Merge branch 'main' into lfric2lfric_multi_CPU
ukmo-juan-castillo Feb 25, 2026
532e842
Remove test in nci site as requested by the reviewer
ukmo-juan-castillo Feb 25, 2026
a98a405
Set site tests as recommended by reviewer
ukmo-juan-castillo Feb 25, 2026
780587d
Issue 192: update partitioning namelist in lfric2lfric
ukmo-juan-castillo Jan 30, 2026
55ebdd2
Revert previous change, intended for another branch
ukmo-juan-castillo Jan 30, 2026
ec2a136
Merge remote-tracking branch 'refs/remotes/origin/main'
ukmo-juan-castillo Mar 13, 2026
66cd626
Merge branch 'main' into lfric2lfric_multi_CPU
ukmo-juan-castillo Mar 13, 2026
7b3b0c8
Add multi-cpu tests
ukmo-juan-castillo Mar 13, 2026
8e45397
Fixes to the new tests
ukmo-juan-castillo Mar 13, 2026
6bfb8d2
Allow running with custom decompositions
ukmo-juan-castillo Mar 13, 2026
fe4d3a3
Revert the changes adding multi cpu tests
ukmo-juan-castillo Mar 13, 2026
3f4ccb6
Add lfric2lfric multi CPU tests
ukmo-juan-castillo Mar 13, 2026
2fda9a0
Remove unnecessary file
ukmo-juan-castillo Mar 13, 2026
87da4d0
Add optional file to add custom decomposition of global source mesh in
ukmo-juan-castillo Mar 13, 2026
2aa3304
Issue 192: update partitioning namelist in lfric2lfric
ukmo-juan-castillo Jan 30, 2026
d94a998
Revert previous change, intended for another branch
ukmo-juan-castillo Jan 30, 2026
3e63dfa
Merge branch 'MetOffice:main' into main
ukmo-juan-castillo Mar 23, 2026
ce14f56
Merge branch 'main' into lfric2lfric_multi_CPU
ukmo-juan-castillo Mar 23, 2026
c1079c0
Merge branch 'lfric2lfric_multi_CPU' into lfric2lfric_test_multi_CPU
ukmo-juan-castillo Mar 23, 2026
6c7499a
Pass upgrade macros
ukmo-juan-castillo Mar 23, 2026
985ea8e
Merge branch 'MetOffice:main' into main
ukmo-juan-castillo Mar 24, 2026
3bbc903
Merge branch 'MetOffice:main' into main
ukmo-juan-castillo Mar 26, 2026
2058077
Merge branch 'MetOffice:main' into main
ukmo-juan-castillo Apr 8, 2026
6dd9b2d
Merge branch 'main' into lfric2lfric_test_multi_CPU
ukmo-juan-castillo Apr 10, 2026
cd1f48d
Merge branch 'main' into lfric2lfric_test_multi_CPU
ukmo-juan-castillo Apr 28, 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
4 changes: 4 additions & 0 deletions rose-stem/app/lfric2lfric/opt/rose-app-multi-cpu.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[namelist:partitioning(source)]
panel_decomposition='custom'
panel_xproc=2
panel_yproc=1
5 changes: 0 additions & 5 deletions rose-stem/app/lfric2lfric/opt/rose-app-suite_controlled.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ panel_decomposition='${PANEL_DECOMP}'
panel_xproc=${XPROC}
panel_yproc=${YPROC}

[namelist:partitioning(source)]
panel_decomposition='${PANEL_DECOMP}'
panel_xproc=${XPROC}
panel_yproc=${YPROC}

[namelist:time]
timestep_end='${RESTART_STOP}'
timestep_start='${RESTART_START}'
97 changes: 91 additions & 6 deletions rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{# ########################################################################### #}
{% do LOG.debug("Entered site/common/lfric2lfric/tasks_solver.cylc") %}

{% if task_ns.conf_name == "ral_seuk-C32_lam_MG" %}
{% if task_ns.conf_name == "ral_seuk-C32_lam_MG_1cpu" %}

{% do task_dict.update({
"opt_confs": ["ral_seuk"],
Expand All @@ -18,7 +18,34 @@
"src_type": "",
}) %}

{% elif task_ns.conf_name == "oasis_ral_seuk-C32_lam_MG" %}
{% elif task_ns.conf_name == "ral_seuk-C32_lam_MG_4cpu" %}

{% do task_dict.update({
"opt_confs": ["ral_seuk"],
"resolution": "seuk_MG",
"dst_mesh": "",
"dst_name": "",
"dst_type": "",
"src_mesh": "",
"src_name": "",
"src_type": "",
"mpi_parts": 4,
}) %}

{% elif task_ns.conf_name == "oasis_ral_seuk-C32_lam_MG_1cpu" %}

{% do task_dict.update({
"opt_confs": ["ral_seuk","oasis"],
"resolution": "seuk_MG",
"dst_mesh": "seuk_MG",
"dst_name": "multigrid_l1",
"dst_type": "regional",
"src_mesh": "seuk_MG",
"src_name": "dynamics",
"src_type": "regional",
}) %}

{% elif task_ns.conf_name == "oasis_ral_seuk-C32_lam_MG_4cpu" %}

{% do task_dict.update({
"opt_confs": ["ral_seuk","oasis"],
Expand All @@ -29,6 +56,7 @@
"src_mesh": "seuk_MG",
"src_name": "dynamics",
"src_type": "regional",
"mpi_parts": 4,
}) %}

{% elif task_ns.conf_name == "ral3-seuk" %}
Expand Down Expand Up @@ -70,7 +98,20 @@
"src_type": "",
}) %}

{% elif task_ns.conf_name == "clim_gal9-C24_C12" %}
{% elif task_ns.conf_name == "clim_gal9-C24_C12_1cpu" %}

{% do task_dict.update({
"opt_confs": ["clim_gal9"],
"resolution": "C24_C12",
"dst_mesh": "",
"dst_name": "",
"dst_type": "",
"src_mesh": "",
"src_name": "",
"src_type": "",
}) %}

{% elif task_ns.conf_name == "clim_gal9-C24_C12_6cpu" %}

{% do task_dict.update({
"opt_confs": ["clim_gal9"],
Expand All @@ -81,9 +122,10 @@
"src_mesh": "",
"src_name": "",
"src_type": "",
"mpi_parts": 6,
}) %}

{% elif task_ns.conf_name == "oasis_clim_gal9-C24_C12" %}
{% elif task_ns.conf_name == "oasis_clim_gal9-C24_C12_1cpu" %}

{% do task_dict.update({
"opt_confs": ["clim_gal9","oasis"],
Expand All @@ -96,7 +138,21 @@
"src_type": "global",
}) %}

{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam" %}
{% elif task_ns.conf_name == "oasis_clim_gal9-C24_C12_6cpu" %}

{% do task_dict.update({
"opt_confs": ["clim_gal9","oasis"],
"resolution": "C24_C12",
"dst_mesh": "C24_C12",
"dst_name": "C24",
"dst_type": "global",
"src_mesh": "C24_C12",
"src_name": "C12",
"src_type": "global",
"mpi_parts": 6,
}) %}

{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam_1cpu" %}

{% do task_dict.update({
"opt_confs": ["clim_gal9_ral_seuk","oasis"],
Expand All @@ -109,7 +165,21 @@
"src_type": "global",
}) %}

{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc" %}
{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam_4cpu" %}

{% do task_dict.update({
"opt_confs": ["clim_gal9_ral_seuk","oasis", "multi-cpu"],
"resolution": "C12_C16_lam",
"dst_mesh": "seuk_MG",
"dst_name": "dynamics",
"dst_type": "regional",
"src_mesh": "C24_C12",
"src_name": "C12",
"src_type": "global",
"mpi_parts": 4,
}) %}

{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_1cpu" %}

{# dst_name will need to change to "dynamics-lbc" when lbc meshes can be read #}
{% do task_dict.update({
Expand All @@ -123,6 +193,21 @@
"src_type": "global",
}) %}

{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_4cpu" %}

{# dst_name will need to change to "dynamics-lbc" when lbc meshes can be read #}
{% do task_dict.update({
"opt_confs": ["clim_gal9_ral_seuk","oasis","lbc", "multi-cpu"],
"resolution": "C12_C16_lam",
"dst_mesh": "seuk_MG",
"dst_name": "dynamics-lbc",
"dst_type": "regional",
"src_mesh": "C24_C12",
"src_name": "C12",
"src_type": "global",
"mpi_parts": 4,
}) %}

{% elif task_ns.conf_name == "canned" %}

{% do task_dict.update({
Expand Down
36 changes: 24 additions & 12 deletions rose-stem/site/meto/groups/groups_lfric2lfric.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,19 @@
{# Azspice Groups #}
{% do site_groups.update({
"lfric2lfric_azspice_developer": [
"lfric2lfric_ral_seuk-C32_lam_MG_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_ral_seuk-C32_lam_MG_azspice_gnu_fast-debug-64bit",
"lfric2lfric_ral_seuk-C32_lam_MG_1cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_ral_seuk-C32_lam_MG_4cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_ral_seuk-C32_lam_MG_1cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_ral_seuk-C32_lam_MG_4cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_ral3-seuk_azspice_gnu_fast-debug-64bit",
"lfric2lfric_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_azspice_gnu_fast-debug-64bit",
"lfric2lfric_clim_gal9-C24_C12_1cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_clim_gal9-C24_C12_6cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9-C24_C12_1cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9-C24_C12_6cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_1cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_4cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_1cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_4cpu_azspice_gnu_fast-debug-64bit",
"lfric2lfric_azspice_canned",
],
"lfric2lfric_azspice_extra": [
Expand All @@ -36,13 +42,19 @@
{# EX1A Groups #}
{% do site_groups.update({
"lfric2lfric_ex1a_developer": [
"lfric2lfric_ral_seuk-C32_lam_MG_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_ral_seuk-C32_lam_MG_ex1a_cce_fast-debug-64bit",
"lfric2lfric_ral_seuk-C32_lam_MG_1cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_ral_seuk-C32_lam_MG_4cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_ral_seuk-C32_lam_MG_1cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_ral_seuk-C32_lam_MG_4cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_ral3-seuk_ex1a_cce_fast-debug-64bit",
"lfric2lfric_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_ex1a_cce_fast-debug-64bit",
"lfric2lfric_clim_gal9-C24_C12_1cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_clim_gal9-C24_C12_6cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9-C24_C12_1cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9-C24_C12_6cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_1cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_4cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_1cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_4cpu_ex1a_cce_fast-debug-64bit",
"lfric2lfric_ex1a_canned",
],
"lfric2lfric_ex1a_extra": [
Expand Down
Loading