Skip to content

Add support for the test suite on monsoon 3 #248

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

Open
t00sa wants to merge 4 commits into
base: main
Choose a base branch
from
+47 −9
Open

Add support for the test suite on monsoon 3 #248

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a7a746
Add support for the test suite on monsoon 3
t00sa Jan 27, 2026
ba657c6
Sign the CLA
t00sa Jan 27, 2026
bb86b73
Merge branch 'main' into monsoon3-support
james-bruten-mo Jan 28, 2026
a0aa5a0
Remove unnecessary leftovers from testing
t00sa Feb 3, 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 @@ -14,3 +14,4 @@
| harry-shepherd | Harry Shepherd | Met Office | 2026-01-08 |
| EdHone | Ed Hone | Met Office | 2026-01-09 |
| tom-j-h | Tom Hill | Met Office | 2026-01-19 |
| t00sa | Sam Clarke-Green | Met Office | 2026-01-27 |
27 changes: 24 additions & 3 deletions rose-stem/site/meto/common/suite_config_ex1a.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
{# ########################################################################### #}
{% do LOG.debug("Entered site/meto/common/suite_config_ex1a.cylc") %}


{% if site_vars.ex_trustzone == "collab" %}
{% set ex1a_base = 'module use /projects/metoff/spackadmin.mon/releases/2025.12.18/ngms' %}
{% else %}
{% set ex1a_base = 'module use /common/internal/spack/releases/2025.10.1/ngms' %}
{% endif %}

{% set ex1a_compiler_gnu = 'module switch cpe/22.11 cpe/23.05 ; ' ~
'module load PrgEnv-gnu ; '~
Expand Down Expand Up @@ -39,18 +44,27 @@
HYPERTHREADS = 1
CORES_PER_NODE = 128
NUMA_REGIONS_PER_NODE = 2
[[[directives]]]
Copy link
Collaborator

@james-bruten-mo james-bruten-mo Jan 28, 2026

Choose a reason for hiding this comment

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

Get Rid

{% if site_vars.ex_trustzone == "collab" %}
-q=collabshared
{% else %}
-q=shared
{% endif %}


[[EX1A_BUILD]]
[[[environment]]]
USE_TIMING_WRAPPER=true
USE_VERNIER=true
USE_VERNIER=yes
USE_TIMING_WRAPPER=yes
[[[directives]]]
-l tmpsize=12GB

[[EX1A_RUN]]
[[[environment]]]
{# BIG_DATA_DIR holds files for io tests #}
{% if site_vars["host_ex"] == "exz" %}
{% if site_vars["ex_trustzone"] == "collab" %}
BIG_DATA_DIR = '/data/users/lfricadmin.mon/data'
{% elif site_vars["host_ex"] == "exz" %}
BIG_DATA_DIR = '/common/internal/lfricdir/data'
{% else %}
BIG_DATA_DIR = '/data/users/lfricadmin/data'
Expand Down Expand Up @@ -131,6 +145,9 @@
{{ generate_script("pre-script", [ex1a_scitools,
ex1a_tech]) }}

[[EX1A_SCRIPTS]]
inherit=EX1A_TECH

[[EX1A_PLOT]]
inherit=EX1A_TECH_BASE
{{ generate_script("pre-script", [ex1a_scitools]) }}
Expand All @@ -141,8 +158,12 @@
[[EX1A_EXPORT-SOURCE]]
inherit=METO_ORIG
[[[environment]]]
{% if site_vars["ex_trustzone"] == "collab" %}
PLATFORM_SYNC = false
{% else %}
hostname = $(rose host-select {{site_vars.host_ex}})
PLATFORM_SYNC = true
{% endif %}

[[EX1A_HOUSEKEEPING]]
inherit=EX1A_TECH_BASE
Expand Down
4 changes: 2 additions & 2 deletions rose-stem/site/meto/groups/group_lbc_demo.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
}) %}

{# Platform Generic Groups #}
{% if site_vars.launch_platform == "azspice" %}
{# {% if site_vars.launch_platform == "azspice" %} #}
Copy link
Collaborator

@james-bruten-mo james-bruten-mo Jan 28, 2026

Choose a reason for hiding this comment

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

Probably best to just remove this and the endif. Maybe the lines below need unindenting too?

{% do site_groups.update({
"lbc_demo_developer": [
"scripts",
Expand All @@ -98,7 +98,7 @@
"lbc_demo_ex1a_canned",
],
}) %}
{% endif %}
{# {% endif %} #}

{# Platform Generic Extends #}
{% do site_groups.developer.extend(site_groups.lbc_demo_developer) %}
Expand Down
8 changes: 8 additions & 0 deletions rose-stem/site/meto/macros/macros_ex1a.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@
{% set lfric_nodes = possible_nodes %}

{% endif %}
{% if site_vars["ex_trustzone"] == "collab" %}
-q=collabnormal
{% else %}
-q=normal
{% endif %}
-l select={{ lfric_nodes +
ocean_nodes|int +
river_nodes|int +
Expand All @@ -68,7 +72,11 @@


{% macro shared_queue(cores) %}
{% if site_vars["ex_trustzone"] == "collab" %}
-q=collabshared
{% else %}
-q=shared
{% endif %}
-l ncpus={{ cores }}

{% endmacro %}
Expand Down
23 changes: 20 additions & 3 deletions rose-stem/site/meto/variables.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,23 @@
{% do site_vars.update({"site_platforms": ["ex1a",
"azspice"]}) %}

{% do site_vars.update({"launch_platform": "azspice"}) %}
{% do site_vars.update({"scripts_platform": "azspice"}) %}
{# Settings for EX Collab Zone #}
{% from "socket" import getfqdn %}
{% set hostname = getfqdn() %}
{% if "collab.sc" in hostname %}
{% do site_vars.update({"ex_trustzone": "collab"}) %}
{% do site_vars.update({"USE_TOKENS": true}) %}
{% else %}
{% do site_vars.update({"ex_trustzone": "research"}) %}
{% endif %}

{% if site_vars["ex_trustzone"] == "collab" %}
{% do site_vars.update({"launch_platform": "ex1a"}) %}
{% do site_vars.update({"scripts_platform": "ex1a"}) %}
{% else %}
{% do site_vars.update({"launch_platform": "azspice"}) %}
{% do site_vars.update({"scripts_platform": "azspice"}) %}
{% endif %}

{% do site_vars.update({"git_mirror_loc": "/data/users/gitassist/git_mirrors"}) %}

Expand All @@ -31,7 +46,9 @@
"azspice": "gnu_fast-debug-64bit"} }) %}

{# Choose EX Host - default to random ab or cd #}
{% if USE_EXZ is defined and USE_EXZ %}
{% if site_vars["ex_trustzone"] == "collab" %}
{% do site_vars.update({"host_ex" : "ex"}) %}
{% elif USE_EXZ is defined and USE_EXZ %}
{% do site_vars.update({"host_ex" : "exz"}) %}
{% elif USE_EXAB is defined and USE_EXAB %}
{% do site_vars.update({"host_ex": "exab"}) %}
Expand Down
2 changes: 1 addition & 1 deletion rose-stem/templates/runtime/generate_runtime_control.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
ROSE_TASK_APP = extract_source
DEPENDENCIES = {{dependencies}}
USE_MIRRORS = {{USE_MIRRORS}}
USE_TOKENS = {{USE_TOKENS}}
USE_TOKENS = {{site_vars.get("USE_TOKENS", "false")}}
{% if USE_MIRRORS %}
{% if "git_mirror_loc" in site_vars %}
GIT_MIRROR_LOC = {{site_vars.git_mirror_loc}}
Expand Down
Loading