From ba43e5b81cde89a727cb3605df6ac5451044f69b Mon Sep 17 00:00:00 2001 From: James Bruten <109733895+james-bruten-mo@users.noreply.github.com> Date: Mon, 1 Dec 2025 14:08:35 +0000 Subject: [PATCH 1/8] Lfric core git test (#161) --- dependencies.yaml | 26 ++++++++ rose-stem/Jinja2Filters/determine_source.py | 60 ----------------- rose-stem/app/check_config_dump/rose-app.conf | 2 +- .../app/check_global_variables/rose-app.conf | 2 +- rose-stem/app/check_style/rose-app.conf | 2 +- .../bin/script_updater.sh | 36 ---------- .../app/export_simsys_scripts/rose-app.conf | 2 - rose-stem/app/extract_source/rose-app.conf | 8 +++ .../app/rose-stem_lint_check/rose-app.conf | 2 +- rose-stem/app/site_validator/rose-app.conf | 2 +- .../app/validate_rose_meta/rose-app.conf | 2 +- rose-stem/flow.cylc | 35 ++++++++-- rose-stem/lib/python/read_sources.py | 66 +++++++++++++++++++ rose-stem/lib/python/utils.py | 20 ++++++ rose-stem/rose-suite.conf | 6 +- .../site/common/coupled/tasks_coupled.cylc | 2 +- .../site/common/coupling/tasks_coupling.cylc | 2 +- .../site/common/driver/tasks_driver.cylc | 2 +- .../infrastructure/tasks_infrastructure.cylc | 2 +- .../site/common/io_demo/tasks_io_demo.cylc | 2 +- .../site/common/lbc_demo/tasks_lbc_demo.cylc | 2 +- .../common/lfric_xios/tasks_lfric_xios.cylc | 2 +- .../common/mesh_tools/tasks_mesh_tools.cylc | 2 +- .../site/common/science/tasks_science.cylc | 2 +- .../tasks_simple_diffusion.cylc | 2 +- .../site/common/skeleton/tasks_skeleton.cylc | 2 +- rose-stem/site/meto/variables.cylc | 2 + rose-stem/templates/graph/generate_graph.cylc | 6 -- .../graph/populate_graph_scripts.cylc | 1 - .../templates/populate_task_definitions.cylc | 2 +- .../runtime/generate_runtime_application.cylc | 2 +- .../runtime/generate_runtime_build.cylc | 2 +- .../runtime/generate_runtime_control.cylc | 38 +++++++---- .../runtime/generate_runtime_mesh.cylc | 4 +- .../runtime/generate_runtime_other.cylc | 4 +- .../runtime/generate_runtime_scripts.cylc | 11 +--- .../generate_runtime_technical-tests.cylc | 4 +- 37 files changed, 207 insertions(+), 162 deletions(-) create mode 100644 dependencies.yaml delete mode 100644 rose-stem/Jinja2Filters/determine_source.py delete mode 100755 rose-stem/app/export_simsys_scripts/bin/script_updater.sh delete mode 100644 rose-stem/app/export_simsys_scripts/rose-app.conf create mode 100644 rose-stem/app/extract_source/rose-app.conf create mode 100644 rose-stem/lib/python/read_sources.py create mode 100644 rose-stem/lib/python/utils.py diff --git a/dependencies.yaml b/dependencies.yaml new file mode 100644 index 000000000..f1f4d4668 --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,26 @@ +############################################################################## +# (c) Crown copyright 2024 Met Office. All rights reserved. +# The file LICENCE, distributed with this code, contains details of the terms +# under which the code may be used. +############################################################################## + +# This file contains a list of all linked external repositories containing code +# and data required to build lfric core and run the entire test suite +# +# Each section is the name of the repository +# source: Is either the url to the repository (the upstream or +# a fork) or a path to a local clone with format `host:/path/to/clone` +# ref: Is a valid git reference. This can either be a commit hash, a tag or a +# branch name +# +# The entry for this repository will have blank values for both source and ref +# by default, which will cause the test suite to use the source code from the +# local clone. These can be filled to set a different source if desired. + +lfric_core: + source: + ref: + +SimSys_Scripts: + source: git@github.com:james-bruten-mo/SimSys_Scripts.git + ref: main diff --git a/rose-stem/Jinja2Filters/determine_source.py b/rose-stem/Jinja2Filters/determine_source.py deleted file mode 100644 index a52f4293c..000000000 --- a/rose-stem/Jinja2Filters/determine_source.py +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################## -# (c) Crown copyright 2024 Met Office. All rights reserved. -# The file LICENCE, distributed with this code, contains details of the terms -# under which the code may be used. -############################################################################## -""" -Function to read through the dependencies.sh in an lfric_apps working copy and -determine the specified source for the argument, repo. Uses a subprocess ssh -command as working copy may be remote when this needs to be run by cylc. -Intended as a Jinja2 Custom Filter -""" - -import os -import subprocess - - -def determine_source(wc_loc, repo): - """ - Main function for Jinja2 Custom Filter - Get a source for a particular repo from the dependencies.sh file in the - source for this rose-stem. - """ - # Determine the host and the path to the dependencies file, and populate - # the subprocess command. - # - try: - host, path = wc_loc.split(":") - path = os.path.join(path, "dependencies.sh") - cat_command = f"ssh {host} cat {path}" - except ValueError: - path = os.path.join(wc_loc, "dependencies.sh") - cat_command = f"cat {path}" - # Run the subprocess command and read the stdout - result = subprocess.run( - cat_command.split(), capture_output=True, text=True - ) - dependencies_file = result.stdout.split("\n") - source = "" - rev = "" - - # Read through the dependencies file and populate revision and source - # variables for requested repo - for line in dependencies_file: - line = line.strip() - if line.startswith(f"export {repo}_rev"): - rev = line.split("=")[1] - if line.startswith(f"export {repo}_sources"): - source = line.split("=")[1] - # If source not set then default to trunk - if source == "": - # lfric_core doesn't match the url - if repo == "lfric_core": - source = "fcm:lfric.xm_tr" - else: - source = f"fcm:{repo}.xm_tr" - # If a revision set then append to source - # Defaults to the head of the source - if rev != "": - source = f"{source}@{rev}" - return source diff --git a/rose-stem/app/check_config_dump/rose-app.conf b/rose-stem/app/check_config_dump/rose-app.conf index 998d8c650..dc91ea155 100644 --- a/rose-stem/app/check_config_dump/rose-app.conf +++ b/rose-stem/app/check_config_dump/rose-app.conf @@ -1,2 +1,2 @@ [command] -default=$CYLC_WORKFLOW_RUN_DIR/bin/check_config_dump.py -s $SOURCE_ROOT +default=$CYLC_WORKFLOW_RUN_DIR/bin/check_config_dump.py -s $SOURCE_ROOT/lfric_core diff --git a/rose-stem/app/check_global_variables/rose-app.conf b/rose-stem/app/check_global_variables/rose-app.conf index fba4bf220..255ba3aab 100644 --- a/rose-stem/app/check_global_variables/rose-app.conf +++ b/rose-stem/app/check_global_variables/rose-app.conf @@ -1,2 +1,2 @@ [command] -default=$CYLC_WORKFLOW_RUN_DIR/bin/occupyfortran -directory $SOURCE_ROOT -dirtylist dirtylist.txt source +default=$CYLC_WORKFLOW_RUN_DIR/bin/occupyfortran -directory $SOURCE_ROOT/lfric_core -dirtylist dirtylist.txt source diff --git a/rose-stem/app/check_style/rose-app.conf b/rose-stem/app/check_style/rose-app.conf index abacb530b..7b3990947 100644 --- a/rose-stem/app/check_style/rose-app.conf +++ b/rose-stem/app/check_style/rose-app.conf @@ -1,2 +1,2 @@ [command] -default=$CYLC_WORKFLOW_RUN_DIR/bin/stylist_launcher.py -s $SOURCE_ROOT +default=$CYLC_WORKFLOW_RUN_DIR/bin/stylist_launcher.py -s $SOURCE_ROOT/lfric_core diff --git a/rose-stem/app/export_simsys_scripts/bin/script_updater.sh b/rose-stem/app/export_simsys_scripts/bin/script_updater.sh deleted file mode 100755 index 58080ed9c..000000000 --- a/rose-stem/app/export_simsys_scripts/bin/script_updater.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# *****************************COPYRIGHT******************************* -# (C) Crown copyright 2024 Met Office. All rights reserved. -# For further details please refer to the file COPYRIGHT.txt -# which you should have received as part of this distribution. -# *****************************COPYRIGHT******************************* - -github_url=${github_url:-"https://github.com/MetOffice/SimSys_Scripts.git"} -github_branch=${github_branch:-"main"} - -echo "Git-scripts updater has started running" - -rm -rf "${CYLC_WORKFLOW_SHARE_DIR}/imported_github_scripts" -if [[ $? != 0 ]]; then - echo "Couldn't remove specified folder. Try checking permissions" - exit 1 - else - echo "Successfully removed old SimSys_Scripts git directory" -fi - -git clone -b "$github_branch" --single-branch "$github_url" \ - "${CYLC_WORKFLOW_SHARE_DIR}/imported_github_scripts" 2>&1 -if [[ $? != 0 ]]; then - echo "Unable to clone remote git repo into specified location." - echo "Check git branch, git url, destination path, permissions and git access" - exit 1 - else - echo "Git repo successfully cloned" -fi - -echo "Copying suite_report and fcm_bdiff to cylc-run/bin" -cp "${CYLC_WORKFLOW_SHARE_DIR}/imported_github_scripts/suite_report.py" "${CYLC_WORKFLOW_RUN_DIR}/bin" -cp "${CYLC_WORKFLOW_SHARE_DIR}/imported_github_scripts/fcm_bdiff.py" "${CYLC_WORKFLOW_RUN_DIR}/bin" - -echo "Github scripts updated" diff --git a/rose-stem/app/export_simsys_scripts/rose-app.conf b/rose-stem/app/export_simsys_scripts/rose-app.conf deleted file mode 100644 index 444610436..000000000 --- a/rose-stem/app/export_simsys_scripts/rose-app.conf +++ /dev/null @@ -1,2 +0,0 @@ -[command] -default=script_updater.sh diff --git a/rose-stem/app/extract_source/rose-app.conf b/rose-stem/app/extract_source/rose-app.conf new file mode 100644 index 000000000..90364b5c1 --- /dev/null +++ b/rose-stem/app/extract_source/rose-app.conf @@ -0,0 +1,8 @@ +[command] +default=python rose_stem_extract_source.py + +[file:get_git_sources.py] +source=git:https://github.com/MetOffice/SimSys_Scripts.git::github_scripts/get_git_sources.py::main + +[file:rose_stem_extract_source.py] +source=git:https://github.com/MetOffice/SimSys_Scripts.git::github_scripts/rose_stem_extract_source.py::main diff --git a/rose-stem/app/rose-stem_lint_check/rose-app.conf b/rose-stem/app/rose-stem_lint_check/rose-app.conf index e0ca42d0d..7a197c3f2 100644 --- a/rose-stem/app/rose-stem_lint_check/rose-app.conf +++ b/rose-stem/app/rose-stem_lint_check/rose-app.conf @@ -1,2 +1,2 @@ [command] -default=$CYLC_WORKFLOW_RUN_DIR/bin/rose-stem_lint_check.py -s $SOURCE_ROOT/rose-stem +default=$CYLC_WORKFLOW_RUN_DIR/bin/rose-stem_lint_check.py -s $SOURCE_ROOT/lfric_core/rose-stem diff --git a/rose-stem/app/site_validator/rose-app.conf b/rose-stem/app/site_validator/rose-app.conf index 56ef34454..fef4f06ab 100644 --- a/rose-stem/app/site_validator/rose-app.conf +++ b/rose-stem/app/site_validator/rose-app.conf @@ -1,2 +1,2 @@ [command] -default=$CYLC_WORKFLOW_RUN_DIR/bin/site_validator.py -s $SOURCE_ROOT +default=$CYLC_WORKFLOW_RUN_DIR/bin/site_validator.py -s $SOURCE_ROOT/lfric_core diff --git a/rose-stem/app/validate_rose_meta/rose-app.conf b/rose-stem/app/validate_rose_meta/rose-app.conf index 2149c693a..cf3ef99f0 100644 --- a/rose-stem/app/validate_rose_meta/rose-app.conf +++ b/rose-stem/app/validate_rose_meta/rose-app.conf @@ -1,2 +1,2 @@ [command] -default=python3 $CYLC_WORKFLOW_SHARE_DIR/imported_github_scripts/lfric_macros/validate_rose_meta.py -c $SOURCE_ROOT +default=python3 $SOURCE_ROOT/SimSys_Scripts/lfric_macros/validate_rose_meta.py -c $SOURCE_ROOT/lfric_core diff --git a/rose-stem/flow.cylc b/rose-stem/flow.cylc index 545a51de4..0e910e5ef 100644 --- a/rose-stem/flow.cylc +++ b/rose-stem/flow.cylc @@ -5,6 +5,28 @@ {# under which the code may be used. #} {# ########################################################################### #} {% from "cylc.flow" import LOG %} +{% from "utils" import get_site %} +{% from "read_sources" import read_sources %} + +{% if SITE is not defined %} + {% set SITE = get_site() %} +{% endif %} +{% do LOG.info("Site: " + SITE) %} + +{% set SOURCE_DIRECTORY = ROSE_ORIG_HOST~":"~CYLC_WORKFLOW_SRC_DIR~"/.." %} +{# Include log message for suite_report #} +{% do LOG.info("LFRIC_CORE SOURCE CLONE="~SOURCE_DIRECTORY) %} + +{# Read in groups to run #} +{% if group is defined %} + {% set RUN_NAMES = group %} +{% elif g is defined %} + {% set RUN_NAMES = g %} +{% else %} + {% set RUN_NAMES = ["developer"] %} +{% endif %} +{% do LOG.info("Running groups: "~RUN_NAMES|join(' + ')) %} {# Include the site variables file #} {# Contains some settings used for the workflow #} @@ -32,7 +54,8 @@ {% set site_groups = {} %} {% include "site/"+SITE+"/groups.cylc" %} -{% set lfric_source = SOURCE_LFRIC %} +{# Read the sources of dependencies from the dependencies.yaml file #} +{% set dependencies = read_sources(SOURCE_DIRECTORY, "lfric_core", USE_HEADS) %} {# Generate list of tasks given by --group= #} {# Expand any groups included so list is only tasks #} @@ -42,7 +65,6 @@ {# Generate a list of all scripts - used to determine if a task is a script #} {% set scripts_list = [] %} {{ expand_task_list(site_groups, ["scripts"], false, scripts_list) }} -{% do set_add(scripts_list, "export_simsys_scripts") %} {# Load the task definitions for each application requested at current site #} {% set requested_tasks = {} %} @@ -59,11 +81,11 @@ UTC mode = True install = site/, templates/ [[events]] - mail events = timeout + mail events = stall timeout abort on stall timeout = True stall timeout = PT3H - shutdown handlers = "suite_report.py" - stall handlers = "suite_report.py" + shutdown handlers = "suite_report_git.py -S $CYLC_WORKFLOW_RUN_DIR" + stall handlers = "suite_report_git.py -S $CYLC_WORKFLOW_RUN_DIR" [scheduling] [[graph]] @@ -92,8 +114,7 @@ [[[environment]]] SOURCE_ROOT = $CYLC_WORKFLOW_SHARE_DIR/source OUTPUT_ROOT = $CYLC_WORKFLOW_SHARE_DIR/output - LAUNCH_SCRIPT = $SOURCE_ROOT/rose-stem/site/{{SITE}}/common/bin - INFRASTRUCTURE_ROSESTEM = $SOURCE_ROOT/infrastructure/rose-stem/ + LAUNCH_SCRIPT = $SOURCE_ROOT/lfric_core/rose-stem/site/{{SITE}}/common/bin [[[events]]] submission timeout = PT5H diff --git a/rose-stem/lib/python/read_sources.py b/rose-stem/lib/python/read_sources.py new file mode 100644 index 000000000..50287162a --- /dev/null +++ b/rose-stem/lib/python/read_sources.py @@ -0,0 +1,66 @@ +############################################################################## +# (c) Crown copyright 2025 Met Office. All rights reserved. +# The file LICENCE, distributed with this code, contains details of the terms +# under which the code may be used. +############################################################################## + +import yaml +import tempfile +import os +from subprocess import run +from shutil import rmtree + +def get_dependencies_file(wc_loc): + """ + Copy the dependencies file to a temporary directory on the local machine that can be + read. + """ + + tempdir = tempfile.mkdtemp() + + try: + host, path = wc_loc.split(":", 1) + path = os.path.join(path, "dependencies.yaml") + copy_command = f"scp -o StrictHostKeyChecking=no {host}:" + except ValueError: + path = os.path.join(wc_loc, "dependencies.yaml") + copy_command = "cp " + copy_command += f"{path} {tempdir}" + + result = run( + copy_command.split(), capture_output=True, text=True, timeout=120 + ) + + # Raise an error if the returncode is positive + if result.returncode: + raise RuntimeError( + f"An error occured while running the command '{copy_command}' " + "in order to read the dependencies file. The error message is:\n\n" + f"'{result.stderr}'" + ) + + return tempdir + +def read_sources(clone_source, repo, use_heads): + """ + Load the dependencies.yaml file as a dictionary + """ + + dependencies_file = get_dependencies_file(clone_source) + + with open(os.path.join(dependencies_file, "dependencies.yaml")) as stream: + dependencies = yaml.safe_load(stream) + + if not dependencies[repo]["source"]: + dependencies[repo]["source"] = clone_source + + # Populate parent, assume MetOffice is owner if not set + for dependency, values in dependencies.items(): + if "parent" not in values: + dependencies[dependency]["parent"] = f"MetOffice/{dependency}.git" + if use_heads: + dependencies[dependency]["ref"] = "" + + rmtree(dependencies_file) + + return dependencies diff --git a/rose-stem/lib/python/utils.py b/rose-stem/lib/python/utils.py new file mode 100644 index 000000000..2f8c3d68f --- /dev/null +++ b/rose-stem/lib/python/utils.py @@ -0,0 +1,20 @@ +############################################################################## +# (c) Crown copyright 2025 Met Office. All rights reserved. +# The file LICENCE, distributed with this code, contains details of the terms +# under which the code may be used. +############################################################################## + +from subprocess import Popen, PIPE + + +def get_site(): + proc = Popen( + ["rose", "config", "rose-stem", "automatic-options"], stdout=PIPE, text=True + ) + out, _ = proc.communicate() + if proc.returncode or "SITE" not in out: + raise Exception('Could not determine the rose-stem "SITE"') + # At some sites there may be many variables that are returned by rose config rose-stem + # Try to just grab the thing after SITE= and then ignore anything afterwards + site = out.split("SITE=")[1].split(' ')[0].strip() + return site diff --git a/rose-stem/rose-suite.conf b/rose-stem/rose-suite.conf index b8da6ab95..76050bb11 100644 --- a/rose-stem/rose-suite.conf +++ b/rose-stem/rose-suite.conf @@ -1,8 +1,8 @@ -ROSE_STEM_VERSION=1 - [template variables] FFLAGS='' HOUSEKEEPING=true LDFLAGS='' OVERRIDE_LOG_LEVEL='' -SIMSYS_BRANCH='main' +USE_HEADS=false +USE_MIRRORS=false +USE_TOKENS=false diff --git a/rose-stem/site/common/coupled/tasks_coupled.cylc b/rose-stem/site/common/coupled/tasks_coupled.cylc index df17dd915..ddd37788a 100644 --- a/rose-stem/site/common/coupled/tasks_coupled.cylc +++ b/rose-stem/site/common/coupled/tasks_coupled.cylc @@ -35,7 +35,7 @@ {# Set default values for Coupled app tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "applications/coupled"}) %} + {% do task_dict.update({"application_dir": "lfric_core/applications/coupled"}) %} {% do task_dict.update({"build_families": [task_ns.platform|upper~"_BUILD_COUPLED_"~task_ns.compiler|upper]}) %} {% do task_dict.update({"run_families": [task_ns.platform|upper~"_RUN_COUPLED_"~task_ns.compiler|upper]}) %} diff --git a/rose-stem/site/common/coupling/tasks_coupling.cylc b/rose-stem/site/common/coupling/tasks_coupling.cylc index 8a1765787..21aaa152a 100644 --- a/rose-stem/site/common/coupling/tasks_coupling.cylc +++ b/rose-stem/site/common/coupling/tasks_coupling.cylc @@ -15,7 +15,7 @@ {# Set default values for coupling tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "components/coupling"}) %} + {% do task_dict.update({"application_dir": "lfric_core/components/coupling"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "coupling"}) %} {% endif %} diff --git a/rose-stem/site/common/driver/tasks_driver.cylc b/rose-stem/site/common/driver/tasks_driver.cylc index 5d09adf5e..19927d4a9 100644 --- a/rose-stem/site/common/driver/tasks_driver.cylc +++ b/rose-stem/site/common/driver/tasks_driver.cylc @@ -15,7 +15,7 @@ {# Set default values for driver tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "components/driver"}) %} + {% do task_dict.update({"application_dir": "lfric_core/components/driver"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "driver"}) %} {% endif %} diff --git a/rose-stem/site/common/infrastructure/tasks_infrastructure.cylc b/rose-stem/site/common/infrastructure/tasks_infrastructure.cylc index ce6f2845f..cb81ac665 100644 --- a/rose-stem/site/common/infrastructure/tasks_infrastructure.cylc +++ b/rose-stem/site/common/infrastructure/tasks_infrastructure.cylc @@ -21,7 +21,7 @@ {# Set default values for Infrastructure tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "infrastructure"}) %} + {% do task_dict.update({"application_dir": "lfric_core/infrastructure"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "infrastructure"}) %} {% endif %} diff --git a/rose-stem/site/common/io_demo/tasks_io_demo.cylc b/rose-stem/site/common/io_demo/tasks_io_demo.cylc index 2945d64b2..e3d3c069c 100644 --- a/rose-stem/site/common/io_demo/tasks_io_demo.cylc +++ b/rose-stem/site/common/io_demo/tasks_io_demo.cylc @@ -44,7 +44,7 @@ {# Set default values for io_demo tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "applications/io_demo"}) %} + {% do task_dict.update({"application_dir": "lfric_core/applications/io_demo"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "io_demo"}) %} {% endif %} diff --git a/rose-stem/site/common/lbc_demo/tasks_lbc_demo.cylc b/rose-stem/site/common/lbc_demo/tasks_lbc_demo.cylc index a71d58acb..76938adf0 100644 --- a/rose-stem/site/common/lbc_demo/tasks_lbc_demo.cylc +++ b/rose-stem/site/common/lbc_demo/tasks_lbc_demo.cylc @@ -183,7 +183,7 @@ {# Set default values for LBC demo tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "applications/lbc_demo"}) %} + {% do task_dict.update({"application_dir": "lfric_core/applications/lbc_demo"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "lbc_demo"}) %} {% endif %} diff --git a/rose-stem/site/common/lfric_xios/tasks_lfric_xios.cylc b/rose-stem/site/common/lfric_xios/tasks_lfric_xios.cylc index 3589619a3..e13c7d573 100644 --- a/rose-stem/site/common/lfric_xios/tasks_lfric_xios.cylc +++ b/rose-stem/site/common/lfric_xios/tasks_lfric_xios.cylc @@ -19,7 +19,7 @@ {# Set default values for lfric_xios tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "components/lfric-xios"}) %} + {% do task_dict.update({"application_dir": "lfric_core/components/lfric-xios"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "lfric-xios"}) %} {% endif %} diff --git a/rose-stem/site/common/mesh_tools/tasks_mesh_tools.cylc b/rose-stem/site/common/mesh_tools/tasks_mesh_tools.cylc index f918b8ee1..a2a18705e 100644 --- a/rose-stem/site/common/mesh_tools/tasks_mesh_tools.cylc +++ b/rose-stem/site/common/mesh_tools/tasks_mesh_tools.cylc @@ -100,7 +100,7 @@ {# Set default values for Mesh_Tools tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "mesh_tools"}) %} + {% do task_dict.update({"application_dir": "lfric_core/mesh_tools"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "mesh_tools"}) %} {% endif %} diff --git a/rose-stem/site/common/science/tasks_science.cylc b/rose-stem/site/common/science/tasks_science.cylc index 04e167dbc..99186e5b4 100644 --- a/rose-stem/site/common/science/tasks_science.cylc +++ b/rose-stem/site/common/science/tasks_science.cylc @@ -15,7 +15,7 @@ {# Set default values for Science tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "components/science"}) %} + {% do task_dict.update({"application_dir": "lfric_core/components/science"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "science"}) %} {% endif %} diff --git a/rose-stem/site/common/simple_diffusion/tasks_simple_diffusion.cylc b/rose-stem/site/common/simple_diffusion/tasks_simple_diffusion.cylc index 10527c5fd..c47809319 100644 --- a/rose-stem/site/common/simple_diffusion/tasks_simple_diffusion.cylc +++ b/rose-stem/site/common/simple_diffusion/tasks_simple_diffusion.cylc @@ -36,7 +36,7 @@ {# Set default values for Simple Diffusion tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "applications/simple_diffusion"}) %} + {% do task_dict.update({"application_dir": "lfric_core/applications/simple_diffusion"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "simple_diffusion"}) %} {% endif %} diff --git a/rose-stem/site/common/skeleton/tasks_skeleton.cylc b/rose-stem/site/common/skeleton/tasks_skeleton.cylc index 9a6f664e0..39b436928 100644 --- a/rose-stem/site/common/skeleton/tasks_skeleton.cylc +++ b/rose-stem/site/common/skeleton/tasks_skeleton.cylc @@ -35,7 +35,7 @@ {# Set default values for Skeleton tasks #} {% if task_dict %} - {% do task_dict.update({"application_dir": "applications/skeleton"}) %} + {% do task_dict.update({"application_dir": "lfric_core/applications/skeleton"}) %} {% if "app_name" not in task_dict %} {% do task_dict.update({"app_name": "skeleton"}) %} {% endif %} diff --git a/rose-stem/site/meto/variables.cylc b/rose-stem/site/meto/variables.cylc index 0f53e0160..540674dbd 100644 --- a/rose-stem/site/meto/variables.cylc +++ b/rose-stem/site/meto/variables.cylc @@ -24,6 +24,8 @@ {% do site_vars.update({"launch_platform": "azspice"}) %} {% do site_vars.update({"scripts_platform": "azspice"}) %} +{% do site_vars.update({"git_mirror_loc": "/data/users/gitassist/git_mirrors"}) %} + {# Note intel unavailable on ex1a hence using gnu #} {% do site_vars.update({"mesh_build": {"ex1a": "gnu_fast-debug-64bit", "azspice": "gnu_fast-debug-64bit"} }) %} diff --git a/rose-stem/templates/graph/generate_graph.cylc b/rose-stem/templates/graph/generate_graph.cylc index 203866b2a..01d87712b 100644 --- a/rose-stem/templates/graph/generate_graph.cylc +++ b/rose-stem/templates/graph/generate_graph.cylc @@ -82,12 +82,6 @@ {% endfor %} -{# Add task to export github scripts from SimSys_Scripts repo #} -{# Runtime section in runtime/generate_runtime_scripts #} -{% do graph_sections.append(["export_simsys_scripts"]) %} -{% do tasks_to_run.update({"export_simsys_scripts": {} }) %} - - {# Set Housekeeping task if housekeeping is true - default value #} {# One housekeeping task per platform being run on #} {# Waits for all tasks on that platform to finish before ruuning #} diff --git a/rose-stem/templates/graph/populate_graph_scripts.cylc b/rose-stem/templates/graph/populate_graph_scripts.cylc index be90d0cb7..25e0eeda1 100644 --- a/rose-stem/templates/graph/populate_graph_scripts.cylc +++ b/rose-stem/templates/graph/populate_graph_scripts.cylc @@ -65,7 +65,6 @@ {% if "validate_rose_meta" in task %} {# The validate rose meta task relies on the export of SimSys_Scripts #} {% do graph_sections.append([ - "export_simsys_scripts", task ]) %} {% endif %} diff --git a/rose-stem/templates/populate_task_definitions.cylc b/rose-stem/templates/populate_task_definitions.cylc index 53e02b755..9850d0d75 100644 --- a/rose-stem/templates/populate_task_definitions.cylc +++ b/rose-stem/templates/populate_task_definitions.cylc @@ -51,7 +51,7 @@ {% if task_ns.application == "mesh" %} - {% do task_dict.update({"application_dir": "mesh_tools", + {% do task_dict.update({"application_dir": "lfric_core/mesh_tools", "app_name": "mesh"}) %} {% if task.startswith("build") %} {% do task_dict.update({"task_family": "build"}) %} diff --git a/rose-stem/templates/runtime/generate_runtime_application.cylc b/rose-stem/templates/runtime/generate_runtime_application.cylc index cea0a5bd4..d1cc6b52e 100644 --- a/rose-stem/templates/runtime/generate_runtime_application.cylc +++ b/rose-stem/templates/runtime/generate_runtime_application.cylc @@ -106,7 +106,7 @@ execution time limit = PT{{task_values["wallclock"]}}M [[[environment]]] DESTINATION_DIRECTORY = {{destination_dir}} - CORE_ROOT_DIR = $SOURCE_ROOT + CORE_ROOT_DIR = $SOURCE_ROOT/lfric_core SOURCE_DIRECTORY = $SOURCE_ROOT/{{task_values["application_dir"]}} METADATA = $SOURCE_ROOT/{{task_values["application_dir"]}}/metadata BIN_DIR = {{bin_dir}} diff --git a/rose-stem/templates/runtime/generate_runtime_build.cylc b/rose-stem/templates/runtime/generate_runtime_build.cylc index 8c158347d..747aaabcd 100644 --- a/rose-stem/templates/runtime/generate_runtime_build.cylc +++ b/rose-stem/templates/runtime/generate_runtime_build.cylc @@ -29,7 +29,7 @@ execution time limit = PT{{task_values["build_wallclock"]}}M [[[environment]]] SOURCE_DIRECTORY = $SOURCE_ROOT/{{src_path}} - CORE_ROOT_DIR = $SOURCE_ROOT + CORE_ROOT_DIR = $SOURCE_ROOT/lfric_core DESTINATION_DIRECTORY = {{destination_dir}} BIN_DIR = {{bin_dir}} LIB_DIR = {{lib_dir}} diff --git a/rose-stem/templates/runtime/generate_runtime_control.cylc b/rose-stem/templates/runtime/generate_runtime_control.cylc index 83d8ae949..cb17fe11d 100644 --- a/rose-stem/templates/runtime/generate_runtime_control.cylc +++ b/rose-stem/templates/runtime/generate_runtime_control.cylc @@ -9,23 +9,38 @@ {# export_source and housekeeping for now #} {# gatekeeper tasks will potentially be added here if required #} + [[CONTROL_TASK_RETRIES]] + execution retry delays = 3*PT3M + {% if task == "export-source" %} {# First export-source task. Runs locally to the launch platform #} {# Exports the lfric_core sources to the #} {# cylc-run/share/source directory #} [[{{task}}]] - inherit = EXPORT-SOURCE, {{SITE|upper}}_ORIG - script = """ - mkdir -p `dirname $SOURCE_ROOT` - - echo Source lfric_core: $SOURCE_LFRIC_CORE - - fcm export --force $SOURCE_LFRIC_CORE $SOURCE_ROOT - """ + inherit = EXPORT-SOURCE, {{SITE|upper}}_ORIG, CONTROL_TASK_RETRIES + post-script = """ + cp $SOURCE_ROOT/lfric_core/dependencies.yaml $CYLC_WORKFLOW_RUN_DIR + cp $SOURCE_ROOT/SimSys_Scripts/github_scripts/suite_report_git.py $CYLC_WORKFLOW_RUN_DIR/bin + cp $SOURCE_ROOT/SimSys_Scripts/github_scripts/suite_data.py $CYLC_WORKFLOW_RUN_DIR/bin + cp $SOURCE_ROOT/SimSys_Scripts/github_scripts/git_bdiff.py $CYLC_WORKFLOW_RUN_DIR/bin + cp $SOURCE_ROOT/SimSys_Scripts/github_scripts/get_git_sources.py $CYLC_WORKFLOW_RUN_DIR/bin + """ [[[environment]]] - SOURCE_DIRECTORY = $SOURCE_ROOT - SOURCE_LFRIC_CORE = {{SOURCE_LFRIC}} + ROSE_TASK_APP = extract_source + DEPENDENCIES = {{dependencies}} + USE_MIRRORS = {{USE_MIRRORS}} + USE_TOKENS = {{USE_TOKENS}} + {% if USE_MIRRORS %} + {% if "git_mirror_loc" in site_vars %} + GIT_MIRROR_LOC = {{site_vars.git_mirror_loc}} + {% else %} + {{ raise( + "Trying to run with mirrors without setting a mirror location. " + "Ensure 'git_mirror_loc' is included in site_vars." + ) }} + {% endif %} + {% endif %} {% elif task.startswith("export-source") %} {# 2nd export-source task specific to each platform #} @@ -36,7 +51,7 @@ {% set platform = task.split('_')[1] %} [[{{task}}]] - inherit = EXPORT-SOURCE, {{platform|upper}}_EXPORT-SOURCE + inherit = EXPORT-SOURCE, {{platform|upper}}_EXPORT-SOURCE, CONTROL_TASK_RETRIES script = """ if [[ "$PLATFORM_SYNC" = true ]] ; then RELATIVE_SOURCE_DIRECTORY=`echo $SOURCE_DIRECTORY | sed "s|$HOME/||"` @@ -49,7 +64,6 @@ """ [[[environment]]] SOURCE_DIRECTORY = $SOURCE_ROOT - SOURCE_LFRIC = {{SOURCE_LFRIC}} {% elif task.startswith("housekeep") %} diff --git a/rose-stem/templates/runtime/generate_runtime_mesh.cylc b/rose-stem/templates/runtime/generate_runtime_mesh.cylc index 138f6bffd..5e79bcea9 100644 --- a/rose-stem/templates/runtime/generate_runtime_mesh.cylc +++ b/rose-stem/templates/runtime/generate_runtime_mesh.cylc @@ -24,9 +24,9 @@ DESTINATION_DIRECTORY = {{destination_dir}} BIN_DIR = {{bin_dir}} MESH_DIR = {{mesh_dir}} - SOURCE_DIRECTORY = $SOURCE_ROOT/mesh_tools + SOURCE_DIRECTORY = $SOURCE_ROOT/lfric_core/mesh_tools OUTPUT_FILE_PREFIX = $MESH_DIR/mesh_{{task_ns.conf_name}} [[[directives]]] {{ set_task_resources(task_values["mesh_cpus"], task_values["mesh_memory"]) }} -{% do LOG.debug("Finished in templates/runtime/generate_runtime_mesh.cylc") %} \ No newline at end of file +{% do LOG.debug("Finished in templates/runtime/generate_runtime_mesh.cylc") %} diff --git a/rose-stem/templates/runtime/generate_runtime_other.cylc b/rose-stem/templates/runtime/generate_runtime_other.cylc index 9979f6c00..1bd3024f4 100644 --- a/rose-stem/templates/runtime/generate_runtime_other.cylc +++ b/rose-stem/templates/runtime/generate_runtime_other.cylc @@ -44,7 +44,7 @@ {# Mesh test file location #} {# task output dir #} - {% set kgo_dir = "$SOURCE_ROOT/rose-stem/site/"~ + {% set kgo_dir = "$SOURCE_ROOT/lfric_core/rose-stem/site/"~ SITE~"/kgos/"~ task_ns.application~"/"~ task_ns.platform %} @@ -76,7 +76,7 @@ {# current is in rose-stem/site/SITE/kgos, #} {# new is in the task output dir #} {# Can overwrite this per task, eg for nrun_vs_crun comparisons #} - {% set current_kgo = "$SOURCE_ROOT/rose-stem/site/"~ + {% set current_kgo = "$SOURCE_ROOT/lfric_core/rose-stem/site/"~ SITE~"/kgos/"~ task_ns.application~"/"~ task_ns.platform~ diff --git a/rose-stem/templates/runtime/generate_runtime_scripts.cylc b/rose-stem/templates/runtime/generate_runtime_scripts.cylc index e381879cb..02faaf7b2 100644 --- a/rose-stem/templates/runtime/generate_runtime_scripts.cylc +++ b/rose-stem/templates/runtime/generate_runtime_scripts.cylc @@ -26,14 +26,7 @@ [[{{task}}]] execution time limit = PT15M -{% if "export_simsys_scripts" in task %} - - inherit=EXPORT-SOURCE - script="rose task-run --app-key=export_simsys_scripts" - [[[environment]]] - github_branch={{SIMSYS_BRANCH}} - -{% elif "config_dump_checker" in task %} +{% if "config_dump_checker" in task %} inherit={{inherit.str|upper}} script="rose task-run --app-key=check_config_dump" @@ -64,7 +57,7 @@ script="rose task-run --app-key=validate_rose_meta" [[[environment]]] ROSE_PYTHONPATH = $PYTHONPATH - ROSE_META_PATH = $SOURCE_ROOT/rose-meta + ROSE_META_PATH = $SOURCE_ROOT/lfric_core/rose-meta {% elif "global_variables_checker" in task %} diff --git a/rose-stem/templates/runtime/generate_runtime_technical-tests.cylc b/rose-stem/templates/runtime/generate_runtime_technical-tests.cylc index 70e33eb36..160c2842d 100644 --- a/rose-stem/templates/runtime/generate_runtime_technical-tests.cylc +++ b/rose-stem/templates/runtime/generate_runtime_technical-tests.cylc @@ -34,7 +34,7 @@ execution time limit = PT{{task_values["build_wallclock"]}}M [[[environment]]] SOURCE_DIRECTORY = $SOURCE_ROOT/{{src_path}} - CORE_ROOT_DIR = $SOURCE_ROOT + CORE_ROOT_DIR = $SOURCE_ROOT/lfric_core WORKING_DIR = {{working_dir}}/{{mode}} RDEF_PRECISION = {{task_values["precision"]["rdef"]}} BIN_DIR = {{bin_dir}} @@ -65,7 +65,7 @@ execution time limit = PT{{task_values["tech-tests_wallclock"]}}M [[[environment]]] SOURCE_DIRECTORY = $SOURCE_ROOT/{{src_path}} - CORE_ROOT_DIR = $SOURCE_ROOT + CORE_ROOT_DIR = $SOURCE_ROOT/lfric_core WORKING_DIR = {{working_dir}}/{{mode}} BIN_DIR = {{bin_dir}} [[[directives]]] From 83af4ee698437027ef0557ad02060260368e6861 Mon Sep 17 00:00:00 2001 From: James Bruten <109733895+james-bruten-mo@users.noreply.github.com> Date: Tue, 2 Dec 2025 09:19:43 +0000 Subject: [PATCH 2/8] fix extraction (#165) --- rose-stem/templates/runtime/generate_runtime_control.cylc | 1 + 1 file changed, 1 insertion(+) diff --git a/rose-stem/templates/runtime/generate_runtime_control.cylc b/rose-stem/templates/runtime/generate_runtime_control.cylc index cb17fe11d..02193d9c4 100644 --- a/rose-stem/templates/runtime/generate_runtime_control.cylc +++ b/rose-stem/templates/runtime/generate_runtime_control.cylc @@ -27,6 +27,7 @@ cp $SOURCE_ROOT/SimSys_Scripts/github_scripts/get_git_sources.py $CYLC_WORKFLOW_RUN_DIR/bin """ [[[environment]]] + SOURCE_DIRECTORY = $SOURCE_ROOT ROSE_TASK_APP = extract_source DEPENDENCIES = {{dependencies}} USE_MIRRORS = {{USE_MIRRORS}} From 25066ddbde5dbc8e52d02d2293abb73213787474 Mon Sep 17 00:00:00 2001 From: Ricky Wong <141156427+mo-rickywong@users.noreply.github.com> Date: Tue, 2 Dec 2025 15:32:16 +0000 Subject: [PATCH 3/8] Modified files to reduce resources requested by LBC rose stem tasks (#166) --- rose-stem/app/mesh/opt/rose-app-lbc.conf | 6 +++--- rose-stem/site/common/lbc_demo/tasks_lbc_demo.cylc | 12 ++++++------ ..._ConstantLBC-lbc_azspice_gnu_fast-debug-64bit.txt | 4 ++-- ..._ConstantLBC-lbc_azspice_gnu_full-debug-64bit.txt | 4 ++-- ..._OutputOnLBC-lbc_azspice_gnu_fast-debug-64bit.txt | 4 ++-- ..._OutputOnLBC-lbc_azspice_gnu_full-debug-64bit.txt | 4 ++-- ...demo_default-lbc_azspice_gnu_fast-debug-64bit.txt | 4 ++-- ...demo_default-lbc_azspice_gnu_full-debug-64bit.txt | 4 ++-- ...emo_ConstantLBC-lbc_ex1a_cce_fast-debug-64bit.txt | 4 ++-- ...emo_ConstantLBC-lbc_ex1a_gnu_fast-debug-64bit.txt | 4 ++-- ...bc_demo_default-lbc_ex1a_cce_fast-debug-64bit.txt | 4 ++-- ...bc_demo_default-lbc_ex1a_gnu_fast-debug-64bit.txt | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/rose-stem/app/mesh/opt/rose-app-lbc.conf b/rose-stem/app/mesh/opt/rose-app-lbc.conf index 4dbda3c75..7867cbbd7 100644 --- a/rose-stem/app/mesh/opt/rose-app-lbc.conf +++ b/rose-stem/app/mesh/opt/rose-app-lbc.conf @@ -20,11 +20,11 @@ topology='non_periodic' [namelist:partitions] max_stencil_depth=2 -n_partitions=48 +n_partitions=6 panel_decomposition='custom' -panel_xproc=24 +panel_xproc=3 panel_yproc=2 -partition_range=0,47 +partition_range=0,5 [namelist:planar_mesh] apply_stretch_transform=.false. diff --git a/rose-stem/site/common/lbc_demo/tasks_lbc_demo.cylc b/rose-stem/site/common/lbc_demo/tasks_lbc_demo.cylc index 76938adf0..52579f18e 100644 --- a/rose-stem/site/common/lbc_demo/tasks_lbc_demo.cylc +++ b/rose-stem/site/common/lbc_demo/tasks_lbc_demo.cylc @@ -8,7 +8,7 @@ {# "opt_confs": ["default"], #} {# "resolution": "lbc", #} {# "use_xios": true, #} -{# "mpi_parts": 48, #} +{# "mpi_parts": 6, #} {# "mpi_parts_xios": 1, #} {# "xios_nodes": 1, This will turn on/off xios in launch script #} {# "xios_server_mode": true, #} @@ -21,7 +21,7 @@ "opt_confs":["default"], "resolution":"lbc", "use_xios":true, - "mpi_parts":48, + "mpi_parts":6, "mpi_parts_xios":1, "xios_nodes":0, "xios_server_mode":false, @@ -37,7 +37,7 @@ "opt_confs":["ConstantLBC"], "resolution":"lbc", "use_xios":true, - "mpi_parts":48, + "mpi_parts":6, "mpi_parts_xios":1, "xios_nodes":0, "xios_server_mode":false, @@ -55,7 +55,7 @@ "opt_confs":["OutputOnLBC"], "resolution":"lbc", "use_xios":true, - "mpi_parts":48, + "mpi_parts":6, "mpi_parts_xios":1, "xios_nodes":1, "xios_server_mode":true, @@ -71,7 +71,7 @@ "opt_confs":["OutputOnLBC"], "resolution":"lbc", "use_xios":true, - "mpi_parts":48, + "mpi_parts":6, "mpi_parts_xios":1, "xios_nodes":0, "xios_server_mode":false, @@ -149,7 +149,7 @@ "opt_confs":["IntegerFields"], "resolution":"lbc", "use_xios":true, - "mpi_parts":48, + "mpi_parts":6, "mpi_parts_xios":1, "xios_nodes":0, "xios_server_mode":false, diff --git a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_ConstantLBC-lbc_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_ConstantLBC-lbc_azspice_gnu_fast-debug-64bit.txt index a338ea80c..b78621f8f 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_ConstantLBC-lbc_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_ConstantLBC-lbc_azspice_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 410FC00000000000 Inner product checksum wtheta_field = 412FC00000000000 Inner product checksum multi_data_field = 411FC00000000000 -Inner product checksum w0_field = 412F3A0800000000 +Inner product checksum w0_field = 412EB08800000000 Inner product checksum w3_field = 4127D00000000000 -Inner product checksum w2h_field = 41379DC000000000 +Inner product checksum w2h_field = 4137694000000000 Inner product checksum w2v_field = 412FC00000000000 diff --git a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_ConstantLBC-lbc_azspice_gnu_full-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_ConstantLBC-lbc_azspice_gnu_full-debug-64bit.txt index a338ea80c..b78621f8f 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_ConstantLBC-lbc_azspice_gnu_full-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_ConstantLBC-lbc_azspice_gnu_full-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 410FC00000000000 Inner product checksum wtheta_field = 412FC00000000000 Inner product checksum multi_data_field = 411FC00000000000 -Inner product checksum w0_field = 412F3A0800000000 +Inner product checksum w0_field = 412EB08800000000 Inner product checksum w3_field = 4127D00000000000 -Inner product checksum w2h_field = 41379DC000000000 +Inner product checksum w2h_field = 4137694000000000 Inner product checksum w2v_field = 412FC00000000000 diff --git a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_OutputOnLBC-lbc_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_OutputOnLBC-lbc_azspice_gnu_fast-debug-64bit.txt index 94fed99cb..ad76d26dc 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_OutputOnLBC-lbc_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_OutputOnLBC-lbc_azspice_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 4117724000000000 Inner product checksum wtheta_field = 4137724000000000 Inner product checksum multi_data_field = 4127724000000000 -Inner product checksum w0_field = 41375DF000000000 +Inner product checksum w0_field = 413748C400000000 Inner product checksum w3_field = 413195B000000000 -Inner product checksum w2h_field = 41418FFE00000000 +Inner product checksum w2h_field = 414187F400000000 Inner product checksum w2v_field = 4137724000000000 diff --git a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_OutputOnLBC-lbc_azspice_gnu_full-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_OutputOnLBC-lbc_azspice_gnu_full-debug-64bit.txt index 94fed99cb..ad76d26dc 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_OutputOnLBC-lbc_azspice_gnu_full-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_OutputOnLBC-lbc_azspice_gnu_full-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 4117724000000000 Inner product checksum wtheta_field = 4137724000000000 Inner product checksum multi_data_field = 4127724000000000 -Inner product checksum w0_field = 41375DF000000000 +Inner product checksum w0_field = 413748C400000000 Inner product checksum w3_field = 413195B000000000 -Inner product checksum w2h_field = 41418FFE00000000 +Inner product checksum w2h_field = 414187F400000000 Inner product checksum w2v_field = 4137724000000000 diff --git a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_default-lbc_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_default-lbc_azspice_gnu_fast-debug-64bit.txt index 94fed99cb..ad76d26dc 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_default-lbc_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_default-lbc_azspice_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 4117724000000000 Inner product checksum wtheta_field = 4137724000000000 Inner product checksum multi_data_field = 4127724000000000 -Inner product checksum w0_field = 41375DF000000000 +Inner product checksum w0_field = 413748C400000000 Inner product checksum w3_field = 413195B000000000 -Inner product checksum w2h_field = 41418FFE00000000 +Inner product checksum w2h_field = 414187F400000000 Inner product checksum w2v_field = 4137724000000000 diff --git a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_default-lbc_azspice_gnu_full-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_default-lbc_azspice_gnu_full-debug-64bit.txt index 94fed99cb..ad76d26dc 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_default-lbc_azspice_gnu_full-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/azspice/checksum_lbc_demo_default-lbc_azspice_gnu_full-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 4117724000000000 Inner product checksum wtheta_field = 4137724000000000 Inner product checksum multi_data_field = 4127724000000000 -Inner product checksum w0_field = 41375DF000000000 +Inner product checksum w0_field = 413748C400000000 Inner product checksum w3_field = 413195B000000000 -Inner product checksum w2h_field = 41418FFE00000000 +Inner product checksum w2h_field = 414187F400000000 Inner product checksum w2v_field = 4137724000000000 diff --git a/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_ConstantLBC-lbc_ex1a_cce_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_ConstantLBC-lbc_ex1a_cce_fast-debug-64bit.txt index a338ea80c..b78621f8f 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_ConstantLBC-lbc_ex1a_cce_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_ConstantLBC-lbc_ex1a_cce_fast-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 410FC00000000000 Inner product checksum wtheta_field = 412FC00000000000 Inner product checksum multi_data_field = 411FC00000000000 -Inner product checksum w0_field = 412F3A0800000000 +Inner product checksum w0_field = 412EB08800000000 Inner product checksum w3_field = 4127D00000000000 -Inner product checksum w2h_field = 41379DC000000000 +Inner product checksum w2h_field = 4137694000000000 Inner product checksum w2v_field = 412FC00000000000 diff --git a/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_ConstantLBC-lbc_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_ConstantLBC-lbc_ex1a_gnu_fast-debug-64bit.txt index a338ea80c..b78621f8f 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_ConstantLBC-lbc_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_ConstantLBC-lbc_ex1a_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 410FC00000000000 Inner product checksum wtheta_field = 412FC00000000000 Inner product checksum multi_data_field = 411FC00000000000 -Inner product checksum w0_field = 412F3A0800000000 +Inner product checksum w0_field = 412EB08800000000 Inner product checksum w3_field = 4127D00000000000 -Inner product checksum w2h_field = 41379DC000000000 +Inner product checksum w2h_field = 4137694000000000 Inner product checksum w2v_field = 412FC00000000000 diff --git a/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_default-lbc_ex1a_cce_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_default-lbc_ex1a_cce_fast-debug-64bit.txt index 1dc40a99d..26d594cc4 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_default-lbc_ex1a_cce_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_default-lbc_ex1a_cce_fast-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 4117724000000000 Inner product checksum wtheta_field = 4137724000000000 Inner product checksum multi_data_field = 4127724000000000 -Inner product checksum w0_field = 41375E1800000000 +Inner product checksum w0_field = 413748EC00000000 Inner product checksum w3_field = 413195B000000000 -Inner product checksum w2h_field = 41418FFE00000000 +Inner product checksum w2h_field = 414187F400000000 Inner product checksum w2v_field = 4137724000000000 diff --git a/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_default-lbc_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_default-lbc_ex1a_gnu_fast-debug-64bit.txt index 94fed99cb..ad76d26dc 100644 --- a/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_default-lbc_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lbc_demo/ex1a/checksum_lbc_demo_default-lbc_ex1a_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ Inner product checksum w3_2d_field = 4117724000000000 Inner product checksum wtheta_field = 4137724000000000 Inner product checksum multi_data_field = 4127724000000000 -Inner product checksum w0_field = 41375DF000000000 +Inner product checksum w0_field = 413748C400000000 Inner product checksum w3_field = 413195B000000000 -Inner product checksum w2h_field = 41418FFE00000000 +Inner product checksum w2h_field = 414187F400000000 Inner product checksum w2v_field = 4137724000000000 From 269f49d5d8ccca91e1bff34abc0d9888b0883bfe Mon Sep 17 00:00:00 2001 From: James Bruten <109733895+james-bruten-mo@users.noreply.github.com> Date: Thu, 4 Dec 2025 16:25:57 +0000 Subject: [PATCH 4/8] Add github files (#168) Co-authored-by: Andrew Coughtrie <24609575+andrewcoughtrie@users.noreply.github.com> --- .gitattributes | 47 ++++++ .github/pull_request_template.md | 139 ++++++++++++------ .github/workflows/check-cr-approved.yaml | 11 ++ .gitignore | 17 +++ LICENCE.original | 30 ---- README.md | 20 +-- .../optimisation/meto-ex1a/psykal/global.py | 2 +- .../optimisation/nci-gadi/psykal/global.py | 2 +- .../optimisation/niwa-xc50/psykal/global.py | 2 +- .../optimisation/meto-ex1a/psykal/global.py | 2 +- .../optimisation/nci-gadi/psykal/global.py | 2 +- .../optimisation/niwa-xc50/psykal/global.py | 2 +- .../optimisation/meto-ex1a/psykal/global.py | 2 +- .../optimisation/nci-gadi/psykal/global.py | 2 +- .../optimisation/niwa-xc50/psykal/global.py | 2 +- .../optimisation/meto-ex1a/psykal/global.py | 2 +- .../optimisation/nci-gadi/psykal/global.py | 2 +- .../optimisation/niwa-xc50/psykal/global.py | 2 +- .../optimisation/meto-ex1a/psykal/global.py | 2 +- .../optimisation/nci-gadi/psykal/global.py | 2 +- .../optimisation/niwa-xc50/psykal/global.py | 2 +- .../coupling/documentation/uml/look.iuml | 2 +- .../driver/source/driver_coordinates_mod.F90 | 2 +- .../inventory/documentation/uml/look.iuml | 2 +- .../lfric-xios/documentation/uml/look.iuml | 2 +- .../source/algorithm/copy_field_alg_mod.f90 | 2 +- .../source/algorithm/sci_checksum_alg_mod.x90 | 2 +- .../sci_field_bundle_builtins_mod.x90 | 2 +- .../algorithm/sci_field_minmax_alg_mod.f90 | 2 +- .../sci_galerkin_projection_alg_mod.x90 | 2 +- .../solver/sci_dense_operator_alg_mod.x90 | 2 +- .../algorithm/solver/sci_field_vector_mod.x90 | 2 +- .../solver/sci_r_solver_field_vector_mod.x90 | 2 +- .../dg_inc_matrix_vector_kernel_mod.F90 | 2 +- .../algebra/dg_matrix_vector_kernel_mod.F90 | 2 +- .../algebra/matrix_vector_kernel_mod.F90 | 2 +- .../sci_assign_field_random_kernel_mod.F90 | 2 +- ..._assign_field_single_column_kernel_mod.F90 | 2 +- .../sci_compute_dof_level_kernel_mod.F90 | 2 +- .../algebra/sci_enforce_bc_kernel_mod.F90 | 2 +- .../sci_invert_local_operator_kernel_mod.F90 | 2 +- .../sci_mm_diagonal_assembled_kernel_mod.F90 | 2 +- .../algebra/sci_mm_diagonal_kernel_mod.F90 | 2 +- .../algebra/sci_random_perturb_kernel_mod.F90 | 2 +- .../sci_transpose_matrix_kernel_mod.F90 | 2 +- .../transpose_matrix_vector_kernel_mod.F90 | 2 +- .../sci_columnwise_op_app_kernel_mod.F90 | 2 +- .../sci_columnwise_op_appinv_kernel_mod.F90 | 2 +- ...columnwise_op_asm_diag_hmht_kernel_mod.F90 | 2 +- .../sci_columnwise_op_asm_kernel_mod.F90 | 2 +- ...umnwise_op_asm_m2v_lumped_inv_krnl_mod.F90 | 2 +- ...sci_columnwise_op_scaledadd_kernel_mod.F90 | 2 +- .../sci_compute_curl_operator_kernel_mod.F90 | 2 +- .../sci_compute_div_operator_kernel_mod.F90 | 2 +- .../sci_compute_grad_operator_kernel_mod.F90 | 2 +- .../sci_compute_mass_matrix_kernel_w1_mod.F90 | 2 +- .../sci_compute_mass_matrix_kernel_w2_mod.F90 | 2 +- .../sci_compute_mass_matrix_kernel_w3_mod.F90 | 2 +- ...ompute_mass_matrix_kernel_w_scalar_mod.F90 | 2 +- .../kernel/fem/sci_gp_rhs_kernel_mod.F90 | 2 +- .../fem/sci_gp_vector_rhs_kernel_mod.F90 | 2 +- .../fem/sci_multiplicity_kernel_mod.F90 | 2 +- .../sci_calc_detj_at_w2_kernel_mod.F90 | 2 +- .../geometry/sci_coordinate_jacobian_mod.F90 | 2 +- .../geometry/sci_get_height_kernel_mod.F90 | 2 +- .../sci_nodal_coordinates_kernel_mod.F90 | 2 +- .../combine_w2_field_kernel_mod.F90 | 2 +- .../sample_flux_kernel_mod.F90 | 2 +- .../sci_convert_hcurl_field_kernel_mod.F90 | 2 +- .../sci_convert_hdiv_field_kernel_mod.F90 | 2 +- .../sci_dg_convert_hdiv_field_kernel_mod.F90 | 2 +- .../split_w2_field_kernel_mod.F90 | 2 +- .../sci_tri_solve_sh_rho_to_mr_kernel_mod.F90 | 2 +- .../solver/sci_tri_solve_kernel_mod.f90 | 2 +- .../solver/sci_iterative_solver_mod.f90 | 2 +- .../source/solver/sci_linear_operator_mod.f90 | 2 +- .../source/solver/sci_preconditioner_mod.f90 | 2 +- .../solver/sci_field_vector_mod_test.pf | 2 +- .../compound_operator_kernel_mod_test.pf | 2 +- .../compute_dof_level_kernel_mod_test.pf | 2 +- .../algebra/dg_inc_matrix_vector_mod_test.pf | 2 +- .../algebra/dg_matrix_vector_mod_test.pf | 2 +- .../invert_local_operator_kernel_mod_test.pf | 2 +- .../kernel/algebra/matrix_vector_mod_test.pf | 2 +- .../algebra/mm_diagonal_kernel_mod_test.pf | 2 +- .../algebra/random_perturb_kernel_mod_test.pf | 2 +- .../transpose_matrix_vector_mod_test.pf | 2 +- .../columnwise_op_app_kernel_mod_test.pf | 2 +- .../columnwise_op_appinv_kernel_mod_test.pf | 2 +- ...mnwise_op_asm_diag_hmht_kernel_mod_test.pf | 2 +- .../columnwise_op_asm_kernel_mod_test.pf | 2 +- ...e_op_asm_m2v_lumped_inv_kernel_mod_test.pf | 2 +- .../columnwise_op_mul_kernel_mod_test.pf | 2 +- ...columnwise_op_scaledadd_kernel_mod_test.pf | 2 +- .../compute_curl_operator_kernel_mod_test.pf | 2 +- .../compute_div_operator_kernel_mod_test.pf | 2 +- .../compute_grad_operator_kernel_mod_test.pf | 2 +- .../compute_mass_matrix_kernel_w0_mod_test.pf | 2 +- .../compute_mass_matrix_kernel_w1_mod_test.pf | 2 +- .../compute_mass_matrix_kernel_w2_mod_test.pf | 2 +- .../compute_mass_matrix_kernel_w3_mod_test.pf | 2 +- ...pute_mass_matrix_kernel_wtheta_mod_test.pf | 2 +- .../kernel/fem/gp_rhs_kernel_mod_test.pf | 2 +- .../fem/gp_vector_rhs_kernel_mod_test.pf | 2 +- .../fem/multiplicity_kernel_mod_test.pf | 2 +- .../geometry/calc_da_at_w2_kernel_mod_test.pf | 2 +- .../calc_detj_at_w2_kernel_mod_test.pf | 2 +- .../coordinate_jacobian_xyz_mod_test.pf | 2 +- .../nodal_coordinates_kernel_mod_test.pf | 2 +- .../nodal_xyz_coordinates_kernel_mod_test.pf | 2 +- .../convert_hcurl_field_kernel_mod_test.pf | 2 +- .../convert_hdiv_field_kernel_mod_test.pf | 2 +- .../dg_convert_hdiv_field_kernel_mod_test.pf | 2 +- .../sample_flux_kernel_mod_test.pf | 2 +- .../solver/sci_tri_solve_kernel_mod_test.pf | 2 +- .../get_unit_test_wthetanodal_basis_mod.f90 | 2 +- infrastructure/build/analyse.mk | 2 +- infrastructure/build/compile.mk | 2 +- infrastructure/build/configuration.mk | 2 +- infrastructure/build/extract.mk | 2 +- infrastructure/build/fortran/crayftn.mk | 2 +- infrastructure/build/fortran/gfortran.mk | 2 +- infrastructure/build/fortran/ifort.mk | 2 +- infrastructure/build/fortran/pgfortran.mk | 2 +- infrastructure/build/lfric.mk | 2 +- infrastructure/build/pfunit.mk | 2 +- .../build/psyclone/psyclone_psykal.mk | 2 +- .../build/testframework/__init__.py | 2 +- .../build/testframework/exception.py | 2 +- infrastructure/build/testframework/test.py | 2 +- .../build/testframework/testengine.py | 2 +- infrastructure/build/tools/DependencyAnalyser | 2 +- infrastructure/build/tools/DependencyRules | 2 +- infrastructure/build/tools/GenerateFeigns | 2 +- infrastructure/build/tools/GenerateLoader | 2 +- infrastructure/build/tools/GenerateNamelist | 2 +- infrastructure/build/tools/Makefile | 2 +- infrastructure/build/tools/ProgramObjects | 2 +- .../build/tools/configurator/__init__.py | 2 +- .../tools/configurator/configurationloader.py | 2 +- .../build/tools/configurator/jinjamacros.py | 2 +- .../tools/configurator/namelistdescription.py | 2 +- .../tools/configurator/namelistfeigner.py | 2 +- .../build/tools/dependerator/__init__.py | 2 +- .../build/tools/dependerator/analyser.py | 2 +- .../build/tools/dependerator/database.py | 2 +- .../build/tools/dependerator/process.py | 2 +- .../tools/dependerator/tests/__init__.py | 2 +- .../tools/dependerator/tests/test_analyser.py | 2 +- .../tools/dependerator/tests/test_database.py | 2 +- .../tools/dependerator/tests/test_process.py | 2 +- infrastructure/documentation/uml/field.puml | 2 +- .../documentation/uml/field/field_mod.iuml | 2 +- .../uml/field/field_vector_mod.iuml | 2 +- .../field/function_space_collection_mod.iuml | 2 +- .../uml/field/function_space_mod.iuml | 2 +- .../documentation/uml/field/operator_mod.iuml | 2 +- .../field/quadrature_rule_gaussian_mod.iuml | 2 +- .../uml/field/quadrature_rule_mod.iuml | 2 +- .../quadrature_rule_newton_cotes_mod.iuml | 2 +- .../documentation/uml/field/scalar_mod.iuml | 2 +- .../documentation/uml/field_vector.puml | 2 +- .../uml/function_space_chain.puml | 2 +- .../documentation/uml/io/file_mod.iuml | 2 +- .../documentation/uml/io/gencube_ps_mod.iuml | 2 +- .../documentation/uml/io/ncdf_quad_mod.iuml | 2 +- .../documentation/uml/io/ugrid_2d_mod.iuml | 2 +- .../documentation/uml/io/ugrid_file_mod.iuml | 2 +- .../uml/io/ugrid_generator_mod.iuml | 2 +- .../uml/io/ugrid_mesh_data_mod.iuml | 2 +- .../documentation/uml/linked_list.puml | 2 +- infrastructure/documentation/uml/look.iuml | 2 +- infrastructure/documentation/uml/mesh.puml | 2 +- .../uml/mesh/function_space_chain_mod.iuml | 2 +- .../uml/mesh/function_space_pointer_mod.iuml | 2 +- .../uml/mesh/global_mesh_collection_mod.iuml | 2 +- .../mesh/global_mesh_map_collection_mod.iuml | 2 +- .../uml/mesh/global_mesh_map_mod.iuml | 2 +- .../uml/mesh/global_mesh_mod.iuml | 2 +- .../uml/mesh/mesh_collection_mod.iuml | 2 +- .../uml/mesh/mesh_map_collection_mod.iuml | 2 +- .../documentation/uml/mesh/mesh_map_mod.iuml | 2 +- .../documentation/uml/mesh/mesh_mod.iuml | 2 +- .../documentation/uml/mesh/partition_mod.iuml | 2 +- .../documentation/uml/mesh_collection.puml | 2 +- .../documentation/uml/mesh_context.puml | 2 +- .../documentation/uml/mesh_generator.puml | 2 +- .../documentation/uml/mesh_map.puml | 2 +- .../documentation/uml/namelist.puml | 2 +- .../documentation/uml/quadrature_rule.puml | 2 +- infrastructure/documentation/uml/scalar.puml | 2 +- infrastructure/documentation/uml/solver.puml | 2 +- .../uml/solver/bicgstab_mod.iuml | 2 +- .../documentation/uml/solver/cg_mod.iuml | 2 +- .../uml/solver/iterative_solver_mod.iuml | 2 +- .../uml/solver/linear_operator_mod.iuml | 2 +- .../uml/solver/preconditioner_mod.iuml | 2 +- infrastructure/documentation/uml/ugrid.puml | 2 +- .../uml/utilities/linked_list_data_mod.iuml | 2 +- .../uml/utilities/linked_list_mod.iuml | 2 +- infrastructure/documentation/uml/vector.puml | 2 +- .../integration-test/cli_mod_test.f90 | 2 +- .../integration-test/cli_mod_test.py | 2 +- .../integration-test/log_mod_error_test.f90 | 2 +- .../integration-test/log_mod_error_test.py | 2 +- infrastructure/source/PSYKE/dino_mod.F90 | 2 +- infrastructure/source/field/vector_mod.F90 | 2 +- .../dofmap/master_dofmap_mod.F90 | 2 +- .../dofmap/stencil_dofmap_mod.F90 | 2 +- .../function_space/fs_continuity_mod.F90 | 2 +- .../function_space_chain_mod.F90 | 2 +- .../function_space_collection_mod.F90 | 2 +- ...space_constructor_helper_functions_mod.F90 | 2 +- .../function_space/function_space_mod.F90 | 2 +- .../function_space_pointer_mod.F90 | 2 +- .../source/function_space/polynomial_mod.f90 | 2 +- infrastructure/source/io/file_mod.F90 | 2 +- infrastructure/source/io/io_utility_mod.f90 | 2 +- infrastructure/source/io/ncdf_quad_mod.F90 | 2 +- infrastructure/source/io/ugrid_2d_mod.F90 | 2 +- infrastructure/source/io/ugrid_file_mod.F90 | 2 +- .../source/io/ugrid_generator_mod.F90 | 2 +- .../source/kernel_metadata/argument_mod.F90 | 2 +- .../source/kernel_metadata/kernel_mod.F90 | 2 +- .../mesh/global_mesh_collection_mod.F90 | 2 +- .../mesh/global_mesh_map_collection_mod.F90 | 2 +- .../source/mesh/global_mesh_map_mod.F90 | 2 +- .../source/mesh/global_mesh_mod.F90 | 2 +- .../source/mesh/mesh_collection_mod.F90 | 2 +- .../source/mesh/mesh_colouring_mod.F90 | 2 +- .../mesh_constructor_helper_functions_mod.F90 | 2 +- .../source/mesh/mesh_map_collection_mod.F90 | 2 +- infrastructure/source/mesh/mesh_map_mod.F90 | 2 +- infrastructure/source/mesh/mesh_mod.F90 | 2 +- .../source/mesh/panel_decomposition_mod.f90 | 2 +- infrastructure/source/mesh/partition_mod.F90 | 2 +- .../source/mesh/reference_element_mod.F90 | 2 +- .../quadrature_rule_gaussian_mod.F90 | 2 +- .../source/quadrature/quadrature_rule_mod.F90 | 2 +- .../quadrature_rule_newton_cotes_mod.F90 | 2 +- infrastructure/source/utilities/cli_mod.f90 | 2 +- .../source/utilities/constants_mod.F90 | 2 +- .../source/utilities/coord_transform_mod.F90 | 2 +- .../source/utilities/cross_product_mod.F90 | 2 +- .../source/utilities/linked_list_data_mod.F90 | 2 +- .../source/utilities/linked_list_int_mod.F90 | 2 +- .../source/utilities/linked_list_mod.F90 | 2 +- infrastructure/source/utilities/log_mod.F90 | 2 +- .../source/utilities/matrix_invert_mod.F90 | 2 +- .../unit-test/PSYKE/dino_mod_test.pf | 2 +- .../unit-test/field/field_mod_test.pf | 2 +- .../unit-test/field/integer_field_mod_test.pf | 2 +- .../dofmap/master_dofmap_mod_test.pf | 2 +- .../dofmap/stencil_dofmap_lam_mod_test.pf | 2 +- .../dofmap/stencil_dofmap_mod_test.pf | 2 +- .../function_space_chain_mod_test.pf | 2 +- .../function_space_collection_mod_test.pf | 2 +- .../function_space/function_space_mod_test.pf | 2 +- .../function_space/polynomial_mod_test.pf | 2 +- .../mesh/global_mesh_collection_mod_test.pf | 2 +- .../global_mesh_map_collection_mod_test.pf | 2 +- .../mesh/global_mesh_map_mod_test.pf | 2 +- .../unit-test/mesh/global_mesh_mod_test.pf | 2 +- .../mesh/mesh_collection_mod_test.pf | 2 +- .../unit-test/mesh/mesh_colouring_mod_test.pf | 2 +- .../mesh/mesh_map_collection_mod_test.pf | 2 +- .../unit-test/mesh/mesh_map_mod_test.pf | 2 +- .../unit-test/mesh/mesh_mod_test.pf | 2 +- .../unit-test/mesh/partition_mod_test.pf | 2 +- .../unit-test/operator/operator_mod_test.pf | 2 +- .../operator/operator_real32_mod_test.PF | 2 +- .../operator/operator_real64_mod_test.PF | 2 +- .../unit-test/utilities/constants_mod_test.pf | 2 +- .../utilities/cross_product_mod_test.pf | 2 +- .../utilities/linked_list_mod_test.pf | 2 +- .../utilities/matrix_invert_mod_test.pf | 2 +- .../source/cubedsphere_mesh_generator.f90 | 2 +- mesh_tools/source/planar_mesh_generator.f90 | 2 +- mesh_tools/source/summarise_ugrid.f90 | 2 +- mesh_tools/source/support/gen_planar_mod.F90 | 2 +- mesh_tools/source/support/gencube_ps_mod.F90 | 2 +- .../gen_planar_mod_test_cartesian.pf | 2 +- .../gen_planar_mod_test_spherical.pf | 2 +- mesh_tools/unit-test/gencube_ps_mod_test.pf | 2 +- 284 files changed, 454 insertions(+), 366 deletions(-) create mode 100644 .gitattributes create mode 100644 .github/workflows/check-cr-approved.yaml delete mode 100644 LICENCE.original diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..2cee0e56b --- /dev/null +++ b/.gitattributes @@ -0,0 +1,47 @@ +# Handle line endings automatically for files detected as text +# and leave all files detected as binary untouched. +* text=auto + +# Binaries +*.nc binary +*.png binary + +# Fortran files +*.f text diff=fortran +*.for text diff=fortran +*.f90 text diff=fortran +*.F90 text diff=fortran +*.f95 text diff=fortran +*.f03 text diff=fortran +*.x90 text diff=fortran +*.X90 text diff=fortran +*.t90 text diff=fortran +*.T90 text diff=fortran +*.pf text diff=fortran +*.PF text diff=fortran + +# Enable syntax highlighting for files with `.pf` extensions. +# +*.pf linguist-language=fortran-free-form +*.pf linguist-detectable=true +*.pf linguist-documentation=false + +*.PF linguist-language=fortran-free-form +*.PF linguist-detectable=true +*.PF linguist-documentation=false + +*.x90 linguist-language=fortran-free-form +*.x90 linguist-detectable=true +*.x90 linguist-documentation=false + +*.X90 linguist-language=fortran-free-form +*.X90 linguist-detectable=true +*.X90 linguist-documentation=false + +*.t90 linguist-language=fortran-free-form +*.t90 linguist-detectable=true +*.t90 linguist-documentation=false + +*.T90 linguist-language=fortran-free-form +*.T90 linguist-detectable=true +*.T90 linguist-documentation=false diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e9066c5e3..b0a170eed 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,61 +1,110 @@ -# Description +# PR Summary - +Code Reviewer: + + + + + + -## Linked issues - -Closes # (issue) +## Code Quality Checklist -## Developer tags - +(_Some checks are automatically carried out via the CI pipeline_) -## Type of change +- [ ] I have performed a self-review of my own code +- [ ] My code follows the project's + [style guidelines](https://metoffice.github.io/lfric_core/how_to_contribute/index.html#how-to-contribute-index) +- [ ] Comments have been included that aid undertanding and enhance the + readability of the code +- [ ] My changes generate no new warnings -- [ ] New feature (non-breaking change which adds functionality). -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected). -- [ ] This change requires a documentation update. +## Testing -# How has this been tested? +- [ ] I have tested this change locally, using the LFRic Core rose-stem suite +- [ ] If required (eg. API changes) I have also run the LFRic Apps test suite + using this branch +- [ ] If any tests fail (rose-stem or CI) the reason is understood and + acceptable (eg. kgo changes) +- [ ] I have added tests to cover new functionality as appropriate (eg. system + tests, unit tests, etc.) +- [ ] Any new tests have been assigned an appropriate amount of compute resource + and have been allocated to an appropriate testing group (i.e. the + developer tests are for jobs which use a small amount of compute resource + and complete in a matter of minutes) -Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration. + -- [ ] New tests have been added. -- [ ] Tests have been modified to accommodate this change. -- [ ] GitHub workflows have been changed or added. +### trac.log -# Checklist: + -- [ ] The change has been checked for design compliance by an experienced SSE - -- [ ] My code follows the style guidelines of this project. -- [ ] I have commented my code, particularly in hard-to-understand areas. -- [ ] I have made corresponding changes to the documentation. -- [ ] My changes generate no new warnings. -- [ ] I have added tests that prove my fix is effective or that my feature works. -- [ ] New and existing unit tests pass locally with my changes, for both debug and optimised builds. -- [ ] No AI tools have been used in the creation of this change. +## Security Considerations -## Reasoning on why any of the above boxes have not been checked - +- [ ] I have reviewed my changes for potential security issues +- [ ] Sensitive data is properly handled (if applicable) +- [ ] Authentication and authorisation are properly implemented (if applicable) + +## Performance Impact + +- [ ] Performance of the code has been considered and, if applicable, suitable + performance measurements have been conducted + +## AI Assistance and Attribution + +- [ ] Some of the content of this change has been produced with the assistance + of _Generative AI tool name_ (e.g., Met Office Github Copilot Enterprise, + Github Copilot Personal, ChatGPT GPT-4, etc) and I have followed the + [Simulation Systems AI policy](https://metoffice.github.io/simulation-systems/FurtherDetails/ai.html) + (including attribution labels) + + + +## Documentation + +- [ ] Where appropriate I have updated documentation related to this change and + confirmed that it builds correctly + +## PSyclone Approval + +- [ ] If you have edited any PSyclone-related code (eg. PSyKAl-lite, Kernel + interface, optimisation scripts, LFRic data structure code) then please + contact the + [tooscollabdevteam@metoffice.gov.uk](tooscollabdevteam@metoffice.gov.uk) + +# Sci/Tech Review + + + + +- [ ] I understand this area of code and the changes being added +- [ ] The proposed changes correspond to the pull request description +- [ ] Documentation is sufficient (do documentation papers need updating) +- [ ] Sufficient testing has been completed + +_Please alert the code reviewer via a tag when you have approved the SR_ + +# Code Review -# Review Checks (To be filled in by the reviewer/s) + -- [ ] Has the developer completed the appropriate sections above? -- [ ] Is the change compliant with LFRic Core principles? -- [ ] Is the testing coverage sufficient? -- [ ] Have any technical debt workarounds identified had issues opened and interested parties notified? +- [ ] All dependencies have been resolved +- [ ] Related Issues have been properly linked and addressed +- [ ] CLA compliance has been confirmed +- [ ] Code quality standards have been met +- [ ] Tests are adequate and have passed +- [ ] Documentation is complete and accurate +- [ ] Security considerations have been addressed +- [ ] Performance impact is acceptable diff --git a/.github/workflows/check-cr-approved.yaml b/.github/workflows/check-cr-approved.yaml new file mode 100644 index 000000000..9b66712a1 --- /dev/null +++ b/.github/workflows/check-cr-approved.yaml @@ -0,0 +1,11 @@ +name: Check CR approved + +on: + pull_request_review: + types: [submitted, edited, dismissed] + workflow_dispatch: + +jobs: + check_cr_approved: + if: ${{ github.event.pull_request.number }} + uses: MetOffice/growss/.github/workflows/check-cr-approved.yaml@main diff --git a/.gitignore b/.gitignore index c8710e1ed..31cbc46f8 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,23 @@ documentation/build # vscode .vscode +# vi/vim +*~ +*.swp +*.swo + # Emacs backup files .#* \#*# + +# Python +__pycache__ +*.pyc +.pytest_cache + +# LFRic CL Builds +applications/**/bin +applications/**/working +applications/**/example*/ +science/**/bin +science/**/working diff --git a/LICENCE.original b/LICENCE.original deleted file mode 100644 index b78ee5744..000000000 --- a/LICENCE.original +++ /dev/null @@ -1,30 +0,0 @@ -Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer - -However, it has been created with the help of the GungHo Consortium, -whose members are identified at https://puma.nerc.ac.uk/trac/GungHo/wiki - - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -3. Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - diff --git a/README.md b/README.md index 776304498..748c1ded8 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,12 @@ -LFRic Core -========== -[![Docs](https://github.com/MetOffice/lfric_core/actions/workflows/deploy-docs.yml/badge.svg?branch=main)](https://github.com/MetOffice/lfric_core/actions/workflows/deploy-docs.yml) +# LFRic Core -Location for LFRic infrastructure documentation. The LFRic infrastructure -source code will be migrated from its current Subversion repository to the -``main`` branch in November 2025. +[![ci](https://github.com/MetOffice/lfric_core/actions/workflows/ci.yml/badge.svg)](https://github.com/MetOffice/lfric_core/actions/workflows/ci.yml) -On the Met Office Azure Spice machine the main LFRic module environment -contains all the required packages to build the documentation. To build use +Location for LFRic infrastructure source code and documentation + +On the Met Office Azure Spice machine the main LFRic module environment +contains all the required packages to build the documentation. To build use `make html` in the documentation directory. `make help` will give you the other -options available. Additionally, `make deploy` will build a copy of the +options available. Additionally, `make deploy` will build a copy of the documentation and deploy it to a directory in `$(HOME)/public_html` named after the git branch. - -Any changes should be developed on a fork of the `main` branch. Do not -target the `trunk` branch as this is currently used to synchronise subversion -`trunk`, and we will remove this branch following git migration in November 2025. diff --git a/applications/coupled/optimisation/meto-ex1a/psykal/global.py b/applications/coupled/optimisation/meto-ex1a/psykal/global.py index a5a485392..97840dca4 100644 --- a/applications/coupled/optimisation/meto-ex1a/psykal/global.py +++ b/applications/coupled/optimisation/meto-ex1a/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/coupled/optimisation/nci-gadi/psykal/global.py b/applications/coupled/optimisation/nci-gadi/psykal/global.py index 5a1e96a21..3b247d5a7 100644 --- a/applications/coupled/optimisation/nci-gadi/psykal/global.py +++ b/applications/coupled/optimisation/nci-gadi/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/coupled/optimisation/niwa-xc50/psykal/global.py b/applications/coupled/optimisation/niwa-xc50/psykal/global.py index 5a1e96a21..3b247d5a7 100644 --- a/applications/coupled/optimisation/niwa-xc50/psykal/global.py +++ b/applications/coupled/optimisation/niwa-xc50/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/io_demo/optimisation/meto-ex1a/psykal/global.py b/applications/io_demo/optimisation/meto-ex1a/psykal/global.py index a5a485392..97840dca4 100644 --- a/applications/io_demo/optimisation/meto-ex1a/psykal/global.py +++ b/applications/io_demo/optimisation/meto-ex1a/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/io_demo/optimisation/nci-gadi/psykal/global.py b/applications/io_demo/optimisation/nci-gadi/psykal/global.py index a5a485392..97840dca4 100644 --- a/applications/io_demo/optimisation/nci-gadi/psykal/global.py +++ b/applications/io_demo/optimisation/nci-gadi/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/io_demo/optimisation/niwa-xc50/psykal/global.py b/applications/io_demo/optimisation/niwa-xc50/psykal/global.py index a5a485392..97840dca4 100644 --- a/applications/io_demo/optimisation/niwa-xc50/psykal/global.py +++ b/applications/io_demo/optimisation/niwa-xc50/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/lbc_demo/optimisation/meto-ex1a/psykal/global.py b/applications/lbc_demo/optimisation/meto-ex1a/psykal/global.py index a5a485392..97840dca4 100644 --- a/applications/lbc_demo/optimisation/meto-ex1a/psykal/global.py +++ b/applications/lbc_demo/optimisation/meto-ex1a/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/lbc_demo/optimisation/nci-gadi/psykal/global.py b/applications/lbc_demo/optimisation/nci-gadi/psykal/global.py index 125a77f40..2a88e4484 100644 --- a/applications/lbc_demo/optimisation/nci-gadi/psykal/global.py +++ b/applications/lbc_demo/optimisation/nci-gadi/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/lbc_demo/optimisation/niwa-xc50/psykal/global.py b/applications/lbc_demo/optimisation/niwa-xc50/psykal/global.py index 125a77f40..2a88e4484 100644 --- a/applications/lbc_demo/optimisation/niwa-xc50/psykal/global.py +++ b/applications/lbc_demo/optimisation/niwa-xc50/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/simple_diffusion/optimisation/meto-ex1a/psykal/global.py b/applications/simple_diffusion/optimisation/meto-ex1a/psykal/global.py index 6f89a9843..bb7d955d3 100644 --- a/applications/simple_diffusion/optimisation/meto-ex1a/psykal/global.py +++ b/applications/simple_diffusion/optimisation/meto-ex1a/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/simple_diffusion/optimisation/nci-gadi/psykal/global.py b/applications/simple_diffusion/optimisation/nci-gadi/psykal/global.py index 6f89a9843..bb7d955d3 100644 --- a/applications/simple_diffusion/optimisation/nci-gadi/psykal/global.py +++ b/applications/simple_diffusion/optimisation/nci-gadi/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/simple_diffusion/optimisation/niwa-xc50/psykal/global.py b/applications/simple_diffusion/optimisation/niwa-xc50/psykal/global.py index 6f89a9843..bb7d955d3 100644 --- a/applications/simple_diffusion/optimisation/niwa-xc50/psykal/global.py +++ b/applications/simple_diffusion/optimisation/niwa-xc50/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/skeleton/optimisation/meto-ex1a/psykal/global.py b/applications/skeleton/optimisation/meto-ex1a/psykal/global.py index a5a485392..97840dca4 100644 --- a/applications/skeleton/optimisation/meto-ex1a/psykal/global.py +++ b/applications/skeleton/optimisation/meto-ex1a/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/skeleton/optimisation/nci-gadi/psykal/global.py b/applications/skeleton/optimisation/nci-gadi/psykal/global.py index a5a485392..97840dca4 100644 --- a/applications/skeleton/optimisation/nci-gadi/psykal/global.py +++ b/applications/skeleton/optimisation/nci-gadi/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/applications/skeleton/optimisation/niwa-xc50/psykal/global.py b/applications/skeleton/optimisation/niwa-xc50/psykal/global.py index a5a485392..97840dca4 100644 --- a/applications/skeleton/optimisation/niwa-xc50/psykal/global.py +++ b/applications/skeleton/optimisation/niwa-xc50/psykal/global.py @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/components/coupling/documentation/uml/look.iuml b/components/coupling/documentation/uml/look.iuml index 25a344e06..366a3adf5 100644 --- a/components/coupling/documentation/uml/look.iuml +++ b/components/coupling/documentation/uml/look.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. set namespaceSeparator :: diff --git a/components/driver/source/driver_coordinates_mod.F90 b/components/driver/source/driver_coordinates_mod.F90 index 7372574ed..686b196f2 100644 --- a/components/driver/source/driver_coordinates_mod.F90 +++ b/components/driver/source/driver_coordinates_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/inventory/documentation/uml/look.iuml b/components/inventory/documentation/uml/look.iuml index 25a344e06..366a3adf5 100644 --- a/components/inventory/documentation/uml/look.iuml +++ b/components/inventory/documentation/uml/look.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. set namespaceSeparator :: diff --git a/components/lfric-xios/documentation/uml/look.iuml b/components/lfric-xios/documentation/uml/look.iuml index 25a344e06..366a3adf5 100644 --- a/components/lfric-xios/documentation/uml/look.iuml +++ b/components/lfric-xios/documentation/uml/look.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. set namespaceSeparator :: diff --git a/components/science/source/algorithm/copy_field_alg_mod.f90 b/components/science/source/algorithm/copy_field_alg_mod.f90 index 09acfca39..ec27d044a 100644 --- a/components/science/source/algorithm/copy_field_alg_mod.f90 +++ b/components/science/source/algorithm/copy_field_alg_mod.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2024, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which +! For further details please refer to the file LICENCE which ! you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/source/algorithm/sci_checksum_alg_mod.x90 b/components/science/source/algorithm/sci_checksum_alg_mod.x90 index e105bc52f..3cbd2b929 100644 --- a/components/science/source/algorithm/sci_checksum_alg_mod.x90 +++ b/components/science/source/algorithm/sci_checksum_alg_mod.x90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/source/algorithm/sci_field_bundle_builtins_mod.x90 b/components/science/source/algorithm/sci_field_bundle_builtins_mod.x90 index 69318e2d5..50dbbd7ab 100644 --- a/components/science/source/algorithm/sci_field_bundle_builtins_mod.x90 +++ b/components/science/source/algorithm/sci_field_bundle_builtins_mod.x90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/source/algorithm/sci_field_minmax_alg_mod.f90 b/components/science/source/algorithm/sci_field_minmax_alg_mod.f90 index 3a3611906..57b7d9d31 100644 --- a/components/science/source/algorithm/sci_field_minmax_alg_mod.f90 +++ b/components/science/source/algorithm/sci_field_minmax_alg_mod.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2023, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/algorithm/sci_galerkin_projection_alg_mod.x90 b/components/science/source/algorithm/sci_galerkin_projection_alg_mod.x90 index 5df430809..c726e3cf3 100644 --- a/components/science/source/algorithm/sci_galerkin_projection_alg_mod.x90 +++ b/components/science/source/algorithm/sci_galerkin_projection_alg_mod.x90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> Computes the galerkin projection of fields. diff --git a/components/science/source/algorithm/solver/sci_dense_operator_alg_mod.x90 b/components/science/source/algorithm/solver/sci_dense_operator_alg_mod.x90 index 4e3cd658b..de9e14b18 100644 --- a/components/science/source/algorithm/solver/sci_dense_operator_alg_mod.x90 +++ b/components/science/source/algorithm/solver/sci_dense_operator_alg_mod.x90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/source/algorithm/solver/sci_field_vector_mod.x90 b/components/science/source/algorithm/solver/sci_field_vector_mod.x90 index 25e9f9537..add371cb0 100644 --- a/components/science/source/algorithm/solver/sci_field_vector_mod.x90 +++ b/components/science/source/algorithm/solver/sci_field_vector_mod.x90 @@ -1,6 +1,6 @@ !------------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------- diff --git a/components/science/source/algorithm/solver/sci_r_solver_field_vector_mod.x90 b/components/science/source/algorithm/solver/sci_r_solver_field_vector_mod.x90 index 162261741..88c1905bf 100644 --- a/components/science/source/algorithm/solver/sci_r_solver_field_vector_mod.x90 +++ b/components/science/source/algorithm/solver/sci_r_solver_field_vector_mod.x90 @@ -1,6 +1,6 @@ !------------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------- diff --git a/components/science/source/kernel/algebra/dg_inc_matrix_vector_kernel_mod.F90 b/components/science/source/kernel/algebra/dg_inc_matrix_vector_kernel_mod.F90 index fa28c2b62..8193e0645 100644 --- a/components/science/source/kernel/algebra/dg_inc_matrix_vector_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/dg_inc_matrix_vector_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief This version is for use on discontinous spaces and increments the diff --git a/components/science/source/kernel/algebra/dg_matrix_vector_kernel_mod.F90 b/components/science/source/kernel/algebra/dg_matrix_vector_kernel_mod.F90 index 67371b915..25babb55f 100644 --- a/components/science/source/kernel/algebra/dg_matrix_vector_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/dg_matrix_vector_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief This version is for use on discontinous spaces and over-writes the diff --git a/components/science/source/kernel/algebra/matrix_vector_kernel_mod.F90 b/components/science/source/kernel/algebra/matrix_vector_kernel_mod.F90 index ec2aedc15..c53583587 100644 --- a/components/science/source/kernel/algebra/matrix_vector_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/matrix_vector_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/source/kernel/algebra/sci_assign_field_random_kernel_mod.F90 b/components/science/source/kernel/algebra/sci_assign_field_random_kernel_mod.F90 index d98ed478f..79ef030d9 100644 --- a/components/science/source/kernel/algebra/sci_assign_field_random_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/sci_assign_field_random_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/algebra/sci_assign_field_single_column_kernel_mod.F90 b/components/science/source/kernel/algebra/sci_assign_field_single_column_kernel_mod.F90 index 4c19f1808..28481f4d3 100644 --- a/components/science/source/kernel/algebra/sci_assign_field_single_column_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/sci_assign_field_single_column_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/algebra/sci_compute_dof_level_kernel_mod.F90 b/components/science/source/kernel/algebra/sci_compute_dof_level_kernel_mod.F90 index f9a009233..8de6f4859 100644 --- a/components/science/source/kernel/algebra/sci_compute_dof_level_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/sci_compute_dof_level_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/algebra/sci_enforce_bc_kernel_mod.F90 b/components/science/source/kernel/algebra/sci_enforce_bc_kernel_mod.F90 index d1ac3d46e..a71dbb173 100644 --- a/components/science/source/kernel/algebra/sci_enforce_bc_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/sci_enforce_bc_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/algebra/sci_invert_local_operator_kernel_mod.F90 b/components/science/source/kernel/algebra/sci_invert_local_operator_kernel_mod.F90 index 8526f9d6e..3d8349bd9 100644 --- a/components/science/source/kernel/algebra/sci_invert_local_operator_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/sci_invert_local_operator_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Provides access to the members of the w0_kernel class. diff --git a/components/science/source/kernel/algebra/sci_mm_diagonal_assembled_kernel_mod.F90 b/components/science/source/kernel/algebra/sci_mm_diagonal_assembled_kernel_mod.F90 index aaffdf18a..8953a4ade 100644 --- a/components/science/source/kernel/algebra/sci_mm_diagonal_assembled_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/sci_mm_diagonal_assembled_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/algebra/sci_mm_diagonal_kernel_mod.F90 b/components/science/source/kernel/algebra/sci_mm_diagonal_kernel_mod.F90 index 81a05a31d..30d4b97e3 100644 --- a/components/science/source/kernel/algebra/sci_mm_diagonal_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/sci_mm_diagonal_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/algebra/sci_random_perturb_kernel_mod.F90 b/components/science/source/kernel/algebra/sci_random_perturb_kernel_mod.F90 index 4f9b845eb..7e38b0813 100644 --- a/components/science/source/kernel/algebra/sci_random_perturb_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/sci_random_perturb_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2021, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/algebra/sci_transpose_matrix_kernel_mod.F90 b/components/science/source/kernel/algebra/sci_transpose_matrix_kernel_mod.F90 index e2bea8add..52d4752d8 100644 --- a/components/science/source/kernel/algebra/sci_transpose_matrix_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/sci_transpose_matrix_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/algebra/transpose_matrix_vector_kernel_mod.F90 b/components/science/source/kernel/algebra/transpose_matrix_vector_kernel_mod.F90 index 513908bea..712044219 100644 --- a/components/science/source/kernel/algebra/transpose_matrix_vector_kernel_mod.F90 +++ b/components/science/source/kernel/algebra/transpose_matrix_vector_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_app_kernel_mod.F90 b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_app_kernel_mod.F90 index d44db1bce..eba9c38f6 100644 --- a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_app_kernel_mod.F90 +++ b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_app_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_appinv_kernel_mod.F90 b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_appinv_kernel_mod.F90 index a204de4e1..2dbf90164 100644 --- a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_appinv_kernel_mod.F90 +++ b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_appinv_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_diag_hmht_kernel_mod.F90 b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_diag_hmht_kernel_mod.F90 index bc2ca9141..fe3613c12 100644 --- a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_diag_hmht_kernel_mod.F90 +++ b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_diag_hmht_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_kernel_mod.F90 b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_kernel_mod.F90 index 9d74ed1cc..730062c73 100644 --- a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_kernel_mod.F90 +++ b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_m2v_lumped_inv_krnl_mod.F90 b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_m2v_lumped_inv_krnl_mod.F90 index 4c9430e08..bae083ffd 100644 --- a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_m2v_lumped_inv_krnl_mod.F90 +++ b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_asm_m2v_lumped_inv_krnl_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_scaledadd_kernel_mod.F90 b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_scaledadd_kernel_mod.F90 index 26a4c92f1..e027b03d6 100644 --- a/components/science/source/kernel/columnwise_operators/sci_columnwise_op_scaledadd_kernel_mod.F90 +++ b/components/science/source/kernel/columnwise_operators/sci_columnwise_op_scaledadd_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/fem/sci_compute_curl_operator_kernel_mod.F90 b/components/science/source/kernel/fem/sci_compute_curl_operator_kernel_mod.F90 index 56a4e1016..15da848d3 100644 --- a/components/science/source/kernel/fem/sci_compute_curl_operator_kernel_mod.F90 +++ b/components/science/source/kernel/fem/sci_compute_curl_operator_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- module sci_compute_curl_operator_kernel_mod diff --git a/components/science/source/kernel/fem/sci_compute_div_operator_kernel_mod.F90 b/components/science/source/kernel/fem/sci_compute_div_operator_kernel_mod.F90 index ba4ba5723..b0e8c4630 100644 --- a/components/science/source/kernel/fem/sci_compute_div_operator_kernel_mod.F90 +++ b/components/science/source/kernel/fem/sci_compute_div_operator_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- module sci_compute_div_operator_kernel_mod diff --git a/components/science/source/kernel/fem/sci_compute_grad_operator_kernel_mod.F90 b/components/science/source/kernel/fem/sci_compute_grad_operator_kernel_mod.F90 index 11334c63b..f221e2996 100644 --- a/components/science/source/kernel/fem/sci_compute_grad_operator_kernel_mod.F90 +++ b/components/science/source/kernel/fem/sci_compute_grad_operator_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- module sci_compute_grad_operator_kernel_mod diff --git a/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w1_mod.F90 b/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w1_mod.F90 index 37b499499..f9dc0ff44 100644 --- a/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w1_mod.F90 +++ b/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w1_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Provides access to the members of the w1_kernel class. diff --git a/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w2_mod.F90 b/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w2_mod.F90 index 164750079..351086a38 100644 --- a/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w2_mod.F90 +++ b/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w2_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Provides access to the members of the w2_kernel class. diff --git a/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w3_mod.F90 b/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w3_mod.F90 index b5b566485..dfbf5b0e5 100644 --- a/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w3_mod.F90 +++ b/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w3_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Provides access to the members of the w3_kernel class. diff --git a/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w_scalar_mod.F90 b/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w_scalar_mod.F90 index 5d2e0393f..f63540f33 100644 --- a/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w_scalar_mod.F90 +++ b/components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w_scalar_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2021, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which +! For further details please refer to the file LICENCE which ! you should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Provides access to the members of the ws_kernel class. diff --git a/components/science/source/kernel/fem/sci_gp_rhs_kernel_mod.F90 b/components/science/source/kernel/fem/sci_gp_rhs_kernel_mod.F90 index 5128697df..c2a874845 100644 --- a/components/science/source/kernel/fem/sci_gp_rhs_kernel_mod.F90 +++ b/components/science/source/kernel/fem/sci_gp_rhs_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/source/kernel/fem/sci_gp_vector_rhs_kernel_mod.F90 b/components/science/source/kernel/fem/sci_gp_vector_rhs_kernel_mod.F90 index a61170aa6..114b58b6f 100644 --- a/components/science/source/kernel/fem/sci_gp_vector_rhs_kernel_mod.F90 +++ b/components/science/source/kernel/fem/sci_gp_vector_rhs_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Projects the components of a vector field into a scalar space. diff --git a/components/science/source/kernel/fem/sci_multiplicity_kernel_mod.F90 b/components/science/source/kernel/fem/sci_multiplicity_kernel_mod.F90 index 7f11a9e9f..c934815e0 100644 --- a/components/science/source/kernel/fem/sci_multiplicity_kernel_mod.F90 +++ b/components/science/source/kernel/fem/sci_multiplicity_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/geometry/sci_calc_detj_at_w2_kernel_mod.F90 b/components/science/source/kernel/geometry/sci_calc_detj_at_w2_kernel_mod.F90 index f5503ff24..d1447a72f 100644 --- a/components/science/source/kernel/geometry/sci_calc_detj_at_w2_kernel_mod.F90 +++ b/components/science/source/kernel/geometry/sci_calc_detj_at_w2_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Computes the values of detj at W2 locations. diff --git a/components/science/source/kernel/geometry/sci_coordinate_jacobian_mod.F90 b/components/science/source/kernel/geometry/sci_coordinate_jacobian_mod.F90 index d2db41563..df0a05e4d 100644 --- a/components/science/source/kernel/geometry/sci_coordinate_jacobian_mod.F90 +++ b/components/science/source/kernel/geometry/sci_coordinate_jacobian_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/geometry/sci_get_height_kernel_mod.F90 b/components/science/source/kernel/geometry/sci_get_height_kernel_mod.F90 index cee6a05bf..9778fdc6f 100644 --- a/components/science/source/kernel/geometry/sci_get_height_kernel_mod.F90 +++ b/components/science/source/kernel/geometry/sci_get_height_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Returns a height field (r or z) from the chi array. diff --git a/components/science/source/kernel/geometry/sci_nodal_coordinates_kernel_mod.F90 b/components/science/source/kernel/geometry/sci_nodal_coordinates_kernel_mod.F90 index 994c37297..687a89c19 100644 --- a/components/science/source/kernel/geometry/sci_nodal_coordinates_kernel_mod.F90 +++ b/components/science/source/kernel/geometry/sci_nodal_coordinates_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/inter_function_space/combine_w2_field_kernel_mod.F90 b/components/science/source/kernel/inter_function_space/combine_w2_field_kernel_mod.F90 index 4073204d8..a9c7c78b8 100644 --- a/components/science/source/kernel/inter_function_space/combine_w2_field_kernel_mod.F90 +++ b/components/science/source/kernel/inter_function_space/combine_w2_field_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Combine W2h and W2v fields into a single W2 field diff --git a/components/science/source/kernel/inter_function_space/sample_flux_kernel_mod.F90 b/components/science/source/kernel/inter_function_space/sample_flux_kernel_mod.F90 index ead8b8539..532da31fb 100644 --- a/components/science/source/kernel/inter_function_space/sample_flux_kernel_mod.F90 +++ b/components/science/source/kernel/inter_function_space/sample_flux_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Samples a flux at nodal points: F = u*q. diff --git a/components/science/source/kernel/inter_function_space/sci_convert_hcurl_field_kernel_mod.F90 b/components/science/source/kernel/inter_function_space/sci_convert_hcurl_field_kernel_mod.F90 index 79855d05a..8cbc37847 100644 --- a/components/science/source/kernel/inter_function_space/sci_convert_hcurl_field_kernel_mod.F90 +++ b/components/science/source/kernel/inter_function_space/sci_convert_hcurl_field_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/inter_function_space/sci_convert_hdiv_field_kernel_mod.F90 b/components/science/source/kernel/inter_function_space/sci_convert_hdiv_field_kernel_mod.F90 index f1ed890ec..bc56cbe84 100644 --- a/components/science/source/kernel/inter_function_space/sci_convert_hdiv_field_kernel_mod.F90 +++ b/components/science/source/kernel/inter_function_space/sci_convert_hdiv_field_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/source/kernel/inter_function_space/sci_dg_convert_hdiv_field_kernel_mod.F90 b/components/science/source/kernel/inter_function_space/sci_dg_convert_hdiv_field_kernel_mod.F90 index ac7471e98..71c0acd92 100644 --- a/components/science/source/kernel/inter_function_space/sci_dg_convert_hdiv_field_kernel_mod.F90 +++ b/components/science/source/kernel/inter_function_space/sci_dg_convert_hdiv_field_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2022, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Kernel to apply the div conforming Piola transform to a diff --git a/components/science/source/kernel/inter_function_space/split_w2_field_kernel_mod.F90 b/components/science/source/kernel/inter_function_space/split_w2_field_kernel_mod.F90 index 9e63111df..d75a52b36 100644 --- a/components/science/source/kernel/inter_function_space/split_w2_field_kernel_mod.F90 +++ b/components/science/source/kernel/inter_function_space/split_w2_field_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Split a W2 field into the component W2v and W2h fields diff --git a/components/science/source/kernel/inter_mesh/sci_tri_solve_sh_rho_to_mr_kernel_mod.F90 b/components/science/source/kernel/inter_mesh/sci_tri_solve_sh_rho_to_mr_kernel_mod.F90 index 12edc430b..c0deff18d 100644 --- a/components/science/source/kernel/inter_mesh/sci_tri_solve_sh_rho_to_mr_kernel_mod.F90 +++ b/components/science/source/kernel/inter_mesh/sci_tri_solve_sh_rho_to_mr_kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2020, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Tridiagonal solver for mapping between Wtheta and shifted W3 spaces. diff --git a/components/science/source/kernel/solver/sci_tri_solve_kernel_mod.f90 b/components/science/source/kernel/solver/sci_tri_solve_kernel_mod.f90 index 5ce6bac84..53d2eb251 100644 --- a/components/science/source/kernel/solver/sci_tri_solve_kernel_mod.f90 +++ b/components/science/source/kernel/solver/sci_tri_solve_kernel_mod.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Tridiagonal solver using Thomas algorithm. diff --git a/components/science/source/solver/sci_iterative_solver_mod.f90 b/components/science/source/solver/sci_iterative_solver_mod.f90 index 61d32feb4..48a1fde6a 100644 --- a/components/science/source/solver/sci_iterative_solver_mod.f90 +++ b/components/science/source/solver/sci_iterative_solver_mod.f90 @@ -1,6 +1,6 @@ !------------------------------------------------------------------------------ ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------ diff --git a/components/science/source/solver/sci_linear_operator_mod.f90 b/components/science/source/solver/sci_linear_operator_mod.f90 index 1bf06bc8b..87ef31dab 100644 --- a/components/science/source/solver/sci_linear_operator_mod.f90 +++ b/components/science/source/solver/sci_linear_operator_mod.f90 @@ -1,6 +1,6 @@ !------------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------- diff --git a/components/science/source/solver/sci_preconditioner_mod.f90 b/components/science/source/solver/sci_preconditioner_mod.f90 index cf60e3c72..2b88c9a6a 100644 --- a/components/science/source/solver/sci_preconditioner_mod.f90 +++ b/components/science/source/solver/sci_preconditioner_mod.f90 @@ -1,6 +1,6 @@ !------------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------- diff --git a/components/science/unit-test/algorithm/solver/sci_field_vector_mod_test.pf b/components/science/unit-test/algorithm/solver/sci_field_vector_mod_test.pf index f6ac406c8..9eb563920 100644 --- a/components/science/unit-test/algorithm/solver/sci_field_vector_mod_test.pf +++ b/components/science/unit-test/algorithm/solver/sci_field_vector_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/algebra/compound_operator_kernel_mod_test.pf b/components/science/unit-test/kernel/algebra/compound_operator_kernel_mod_test.pf index bb1917e9c..eae47da74 100644 --- a/components/science/unit-test/kernel/algebra/compound_operator_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/algebra/compound_operator_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/algebra/compute_dof_level_kernel_mod_test.pf b/components/science/unit-test/kernel/algebra/compute_dof_level_kernel_mod_test.pf index 2a86b25ca..f0653f462 100644 --- a/components/science/unit-test/kernel/algebra/compute_dof_level_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/algebra/compute_dof_level_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/algebra/dg_inc_matrix_vector_mod_test.pf b/components/science/unit-test/kernel/algebra/dg_inc_matrix_vector_mod_test.pf index a5ffaa6d8..ea762021f 100644 --- a/components/science/unit-test/kernel/algebra/dg_inc_matrix_vector_mod_test.pf +++ b/components/science/unit-test/kernel/algebra/dg_inc_matrix_vector_mod_test.pf @@ -1,6 +1,6 @@ !------------------------------------------------------------------------------ ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------ ! diff --git a/components/science/unit-test/kernel/algebra/dg_matrix_vector_mod_test.pf b/components/science/unit-test/kernel/algebra/dg_matrix_vector_mod_test.pf index c9c28d736..4e6736d70 100644 --- a/components/science/unit-test/kernel/algebra/dg_matrix_vector_mod_test.pf +++ b/components/science/unit-test/kernel/algebra/dg_matrix_vector_mod_test.pf @@ -1,6 +1,6 @@ !------------------------------------------------------------------------------ ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------ ! diff --git a/components/science/unit-test/kernel/algebra/invert_local_operator_kernel_mod_test.pf b/components/science/unit-test/kernel/algebra/invert_local_operator_kernel_mod_test.pf index b6f57a1b7..cd20e608b 100644 --- a/components/science/unit-test/kernel/algebra/invert_local_operator_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/algebra/invert_local_operator_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/algebra/matrix_vector_mod_test.pf b/components/science/unit-test/kernel/algebra/matrix_vector_mod_test.pf index ed3587a60..90c5dcae5 100644 --- a/components/science/unit-test/kernel/algebra/matrix_vector_mod_test.pf +++ b/components/science/unit-test/kernel/algebra/matrix_vector_mod_test.pf @@ -1,6 +1,6 @@ !------------------------------------------------------------------------------ ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------ ! diff --git a/components/science/unit-test/kernel/algebra/mm_diagonal_kernel_mod_test.pf b/components/science/unit-test/kernel/algebra/mm_diagonal_kernel_mod_test.pf index d91fc573a..506aeb8e3 100644 --- a/components/science/unit-test/kernel/algebra/mm_diagonal_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/algebra/mm_diagonal_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/algebra/random_perturb_kernel_mod_test.pf b/components/science/unit-test/kernel/algebra/random_perturb_kernel_mod_test.pf index 84147385d..b25d10dc9 100644 --- a/components/science/unit-test/kernel/algebra/random_perturb_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/algebra/random_perturb_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2022, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/algebra/transpose_matrix_vector_mod_test.pf b/components/science/unit-test/kernel/algebra/transpose_matrix_vector_mod_test.pf index 5a08f3e09..ee038011f 100644 --- a/components/science/unit-test/kernel/algebra/transpose_matrix_vector_mod_test.pf +++ b/components/science/unit-test/kernel/algebra/transpose_matrix_vector_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_app_kernel_mod_test.pf b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_app_kernel_mod_test.pf index 531e0e908..1e29cff0d 100644 --- a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_app_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_app_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_appinv_kernel_mod_test.pf b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_appinv_kernel_mod_test.pf index 38813a37d..bed9499df 100644 --- a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_appinv_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_appinv_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_diag_hmht_kernel_mod_test.pf b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_diag_hmht_kernel_mod_test.pf index c0bcd091b..3f8e68eec 100644 --- a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_diag_hmht_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_diag_hmht_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_kernel_mod_test.pf b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_kernel_mod_test.pf index e5595a271..1ca79bf1e 100644 --- a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_m2v_lumped_inv_kernel_mod_test.pf b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_m2v_lumped_inv_kernel_mod_test.pf index 37ab76e1a..c63544889 100644 --- a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_m2v_lumped_inv_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_asm_m2v_lumped_inv_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_mul_kernel_mod_test.pf b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_mul_kernel_mod_test.pf index f2a096c56..14de42c6a 100644 --- a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_mul_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_mul_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_scaledadd_kernel_mod_test.pf b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_scaledadd_kernel_mod_test.pf index 218dd498c..d2f8ef185 100644 --- a/components/science/unit-test/kernel/columnwise_operators/columnwise_op_scaledadd_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/columnwise_operators/columnwise_op_scaledadd_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/fem/compute_curl_operator_kernel_mod_test.pf b/components/science/unit-test/kernel/fem/compute_curl_operator_kernel_mod_test.pf index 463034e45..50888b180 100644 --- a/components/science/unit-test/kernel/fem/compute_curl_operator_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/fem/compute_curl_operator_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/fem/compute_div_operator_kernel_mod_test.pf b/components/science/unit-test/kernel/fem/compute_div_operator_kernel_mod_test.pf index 7c7cd0593..53474e517 100644 --- a/components/science/unit-test/kernel/fem/compute_div_operator_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/fem/compute_div_operator_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/fem/compute_grad_operator_kernel_mod_test.pf b/components/science/unit-test/kernel/fem/compute_grad_operator_kernel_mod_test.pf index e0fdd077f..da1dd8b61 100644 --- a/components/science/unit-test/kernel/fem/compute_grad_operator_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/fem/compute_grad_operator_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w0_mod_test.pf b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w0_mod_test.pf index 04321f5f7..f4f2296a8 100644 --- a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w0_mod_test.pf +++ b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w0_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w1_mod_test.pf b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w1_mod_test.pf index 78af79005..1d85c8213 100644 --- a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w1_mod_test.pf +++ b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w1_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w2_mod_test.pf b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w2_mod_test.pf index 10d58b181..3e499f697 100644 --- a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w2_mod_test.pf +++ b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w2_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w3_mod_test.pf b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w3_mod_test.pf index db7967c03..550e039c9 100644 --- a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w3_mod_test.pf +++ b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_w3_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_wtheta_mod_test.pf b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_wtheta_mod_test.pf index c364c0b3e..e214ebfb4 100644 --- a/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_wtheta_mod_test.pf +++ b/components/science/unit-test/kernel/fem/compute_mass_matrix_kernel_wtheta_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/fem/gp_rhs_kernel_mod_test.pf b/components/science/unit-test/kernel/fem/gp_rhs_kernel_mod_test.pf index 905b0edd7..eee93bfa4 100644 --- a/components/science/unit-test/kernel/fem/gp_rhs_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/fem/gp_rhs_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/unit-test/kernel/fem/gp_vector_rhs_kernel_mod_test.pf b/components/science/unit-test/kernel/fem/gp_vector_rhs_kernel_mod_test.pf index 4ec43e4eb..20f623a67 100644 --- a/components/science/unit-test/kernel/fem/gp_vector_rhs_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/fem/gp_vector_rhs_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/unit-test/kernel/fem/multiplicity_kernel_mod_test.pf b/components/science/unit-test/kernel/fem/multiplicity_kernel_mod_test.pf index 54f7a04e7..dbcc7f946 100644 --- a/components/science/unit-test/kernel/fem/multiplicity_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/fem/multiplicity_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/geometry/calc_da_at_w2_kernel_mod_test.pf b/components/science/unit-test/kernel/geometry/calc_da_at_w2_kernel_mod_test.pf index 052609a1b..fee5e8bbb 100644 --- a/components/science/unit-test/kernel/geometry/calc_da_at_w2_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/geometry/calc_da_at_w2_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/geometry/calc_detj_at_w2_kernel_mod_test.pf b/components/science/unit-test/kernel/geometry/calc_detj_at_w2_kernel_mod_test.pf index 44b51bbdb..75650dd78 100644 --- a/components/science/unit-test/kernel/geometry/calc_detj_at_w2_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/geometry/calc_detj_at_w2_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/geometry/coordinate_jacobian_xyz_mod_test.pf b/components/science/unit-test/kernel/geometry/coordinate_jacobian_xyz_mod_test.pf index 7460d35c0..3f3379bbe 100644 --- a/components/science/unit-test/kernel/geometry/coordinate_jacobian_xyz_mod_test.pf +++ b/components/science/unit-test/kernel/geometry/coordinate_jacobian_xyz_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/components/science/unit-test/kernel/geometry/nodal_coordinates_kernel_mod_test.pf b/components/science/unit-test/kernel/geometry/nodal_coordinates_kernel_mod_test.pf index 7f90f405c..2cf9f36b4 100644 --- a/components/science/unit-test/kernel/geometry/nodal_coordinates_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/geometry/nodal_coordinates_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/geometry/nodal_xyz_coordinates_kernel_mod_test.pf b/components/science/unit-test/kernel/geometry/nodal_xyz_coordinates_kernel_mod_test.pf index 013aa4c0a..abebdd0af 100644 --- a/components/science/unit-test/kernel/geometry/nodal_xyz_coordinates_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/geometry/nodal_xyz_coordinates_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/inter_function_space/convert_hcurl_field_kernel_mod_test.pf b/components/science/unit-test/kernel/inter_function_space/convert_hcurl_field_kernel_mod_test.pf index 72a99f70d..563bcdab7 100644 --- a/components/science/unit-test/kernel/inter_function_space/convert_hcurl_field_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/inter_function_space/convert_hcurl_field_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/inter_function_space/convert_hdiv_field_kernel_mod_test.pf b/components/science/unit-test/kernel/inter_function_space/convert_hdiv_field_kernel_mod_test.pf index b7d615f47..28e712d54 100644 --- a/components/science/unit-test/kernel/inter_function_space/convert_hdiv_field_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/inter_function_space/convert_hdiv_field_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/inter_function_space/dg_convert_hdiv_field_kernel_mod_test.pf b/components/science/unit-test/kernel/inter_function_space/dg_convert_hdiv_field_kernel_mod_test.pf index 1cb692bb3..27cf34cda 100644 --- a/components/science/unit-test/kernel/inter_function_space/dg_convert_hdiv_field_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/inter_function_space/dg_convert_hdiv_field_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- module dg_convert_hdiv_field_kernel_mod_test diff --git a/components/science/unit-test/kernel/inter_function_space/sample_flux_kernel_mod_test.pf b/components/science/unit-test/kernel/inter_function_space/sample_flux_kernel_mod_test.pf index 40091a947..335f931bc 100644 --- a/components/science/unit-test/kernel/inter_function_space/sample_flux_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/inter_function_space/sample_flux_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2019, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/kernel/solver/sci_tri_solve_kernel_mod_test.pf b/components/science/unit-test/kernel/solver/sci_tri_solve_kernel_mod_test.pf index d86712d57..b189069ba 100644 --- a/components/science/unit-test/kernel/solver/sci_tri_solve_kernel_mod_test.pf +++ b/components/science/unit-test/kernel/solver/sci_tri_solve_kernel_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/components/science/unit-test/support/get_unit_test_nodal_basis_functions/get_unit_test_wthetanodal_basis_mod.f90 b/components/science/unit-test/support/get_unit_test_nodal_basis_functions/get_unit_test_wthetanodal_basis_mod.f90 index cd867b4ee..1f2d184b3 100644 --- a/components/science/unit-test/support/get_unit_test_nodal_basis_functions/get_unit_test_wthetanodal_basis_mod.f90 +++ b/components/science/unit-test/support/get_unit_test_nodal_basis_functions/get_unit_test_wthetanodal_basis_mod.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2019, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/build/analyse.mk b/infrastructure/build/analyse.mk index a4b50cd09..f002ad794 100644 --- a/infrastructure/build/analyse.mk +++ b/infrastructure/build/analyse.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # diff --git a/infrastructure/build/compile.mk b/infrastructure/build/compile.mk index cbc5c12fb..a25f466d6 100644 --- a/infrastructure/build/compile.mk +++ b/infrastructure/build/compile.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # diff --git a/infrastructure/build/configuration.mk b/infrastructure/build/configuration.mk index 0db238a35..1b020218c 100644 --- a/infrastructure/build/configuration.mk +++ b/infrastructure/build/configuration.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # diff --git a/infrastructure/build/extract.mk b/infrastructure/build/extract.mk index fe758c7dd..38ea33d4b 100644 --- a/infrastructure/build/extract.mk +++ b/infrastructure/build/extract.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # diff --git a/infrastructure/build/fortran/crayftn.mk b/infrastructure/build/fortran/crayftn.mk index ae35e04a0..6e3c73fb7 100644 --- a/infrastructure/build/fortran/crayftn.mk +++ b/infrastructure/build/fortran/crayftn.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # Various things specific to the Cray Fortran compiler. diff --git a/infrastructure/build/fortran/gfortran.mk b/infrastructure/build/fortran/gfortran.mk index 1e94b2bcb..3dabbabb4 100644 --- a/infrastructure/build/fortran/gfortran.mk +++ b/infrastructure/build/fortran/gfortran.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # Various things specific to the GNU Fortran compiler. diff --git a/infrastructure/build/fortran/ifort.mk b/infrastructure/build/fortran/ifort.mk index 8f3f18874..b3a45649c 100644 --- a/infrastructure/build/fortran/ifort.mk +++ b/infrastructure/build/fortran/ifort.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # Various things specific to the Intel Fortran compiler. diff --git a/infrastructure/build/fortran/pgfortran.mk b/infrastructure/build/fortran/pgfortran.mk index 7413f713b..554a075aa 100644 --- a/infrastructure/build/fortran/pgfortran.mk +++ b/infrastructure/build/fortran/pgfortran.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # Various things specific to the Portland Fortran compiler. diff --git a/infrastructure/build/lfric.mk b/infrastructure/build/lfric.mk index 9ccd52602..ab0ca4d9c 100644 --- a/infrastructure/build/lfric.mk +++ b/infrastructure/build/lfric.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # diff --git a/infrastructure/build/pfunit.mk b/infrastructure/build/pfunit.mk index 3ec8232bf..6ac4ecf45 100644 --- a/infrastructure/build/pfunit.mk +++ b/infrastructure/build/pfunit.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # diff --git a/infrastructure/build/psyclone/psyclone_psykal.mk b/infrastructure/build/psyclone/psyclone_psykal.mk index e23f21ec5..fed281665 100644 --- a/infrastructure/build/psyclone/psyclone_psykal.mk +++ b/infrastructure/build/psyclone/psyclone_psykal.mk @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # diff --git a/infrastructure/build/testframework/__init__.py b/infrastructure/build/testframework/__init__.py index 0fd15e23f..1a8e1f2d8 100644 --- a/infrastructure/build/testframework/__init__.py +++ b/infrastructure/build/testframework/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/infrastructure/build/testframework/exception.py b/infrastructure/build/testframework/exception.py index d46416446..ddf73e358 100644 --- a/infrastructure/build/testframework/exception.py +++ b/infrastructure/build/testframework/exception.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/infrastructure/build/testframework/test.py b/infrastructure/build/testframework/test.py index 2b2be5792..0b71c9929 100644 --- a/infrastructure/build/testframework/test.py +++ b/infrastructure/build/testframework/test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## from abc import ABC, abstractmethod diff --git a/infrastructure/build/testframework/testengine.py b/infrastructure/build/testframework/testengine.py index 81a741fa2..fb7900130 100644 --- a/infrastructure/build/testframework/testengine.py +++ b/infrastructure/build/testframework/testengine.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/infrastructure/build/tools/DependencyAnalyser b/infrastructure/build/tools/DependencyAnalyser index 54b0976c2..3c2f81a44 100755 --- a/infrastructure/build/tools/DependencyAnalyser +++ b/infrastructure/build/tools/DependencyAnalyser @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/build/tools/DependencyRules b/infrastructure/build/tools/DependencyRules index deb7f0a16..88db0e796 100755 --- a/infrastructure/build/tools/DependencyRules +++ b/infrastructure/build/tools/DependencyRules @@ -2,7 +2,7 @@ # pylint: disable=invalid-name ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/build/tools/GenerateFeigns b/infrastructure/build/tools/GenerateFeigns index edb5e8df6..a51d029c5 100755 --- a/infrastructure/build/tools/GenerateFeigns +++ b/infrastructure/build/tools/GenerateFeigns @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # pylint: disable=invalid-name diff --git a/infrastructure/build/tools/GenerateLoader b/infrastructure/build/tools/GenerateLoader index 5cdbbcf02..2a047d9be 100755 --- a/infrastructure/build/tools/GenerateLoader +++ b/infrastructure/build/tools/GenerateLoader @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # pylint: disable=invalid-name diff --git a/infrastructure/build/tools/GenerateNamelist b/infrastructure/build/tools/GenerateNamelist index 81eb6033c..bc53c4cd3 100755 --- a/infrastructure/build/tools/GenerateNamelist +++ b/infrastructure/build/tools/GenerateNamelist @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # pylint: disable=invalid-name diff --git a/infrastructure/build/tools/Makefile b/infrastructure/build/tools/Makefile index 9a94d851a..74af77ff3 100644 --- a/infrastructure/build/tools/Makefile +++ b/infrastructure/build/tools/Makefile @@ -1,6 +1,6 @@ ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/infrastructure/build/tools/ProgramObjects b/infrastructure/build/tools/ProgramObjects index 50763ba8c..d130c486a 100755 --- a/infrastructure/build/tools/ProgramObjects +++ b/infrastructure/build/tools/ProgramObjects @@ -2,7 +2,7 @@ # pylint: disable=invalid-name ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/build/tools/configurator/__init__.py b/infrastructure/build/tools/configurator/__init__.py index 895562394..041065579 100644 --- a/infrastructure/build/tools/configurator/__init__.py +++ b/infrastructure/build/tools/configurator/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/build/tools/configurator/configurationloader.py b/infrastructure/build/tools/configurator/configurationloader.py index 8067f6641..d9145ea0f 100644 --- a/infrastructure/build/tools/configurator/configurationloader.py +++ b/infrastructure/build/tools/configurator/configurationloader.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/build/tools/configurator/jinjamacros.py b/infrastructure/build/tools/configurator/jinjamacros.py index b1bae93c5..22bd66434 100644 --- a/infrastructure/build/tools/configurator/jinjamacros.py +++ b/infrastructure/build/tools/configurator/jinjamacros.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/build/tools/configurator/namelistdescription.py b/infrastructure/build/tools/configurator/namelistdescription.py index d0df4f953..d1e99b832 100644 --- a/infrastructure/build/tools/configurator/namelistdescription.py +++ b/infrastructure/build/tools/configurator/namelistdescription.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/build/tools/configurator/namelistfeigner.py b/infrastructure/build/tools/configurator/namelistfeigner.py index e5801e9bd..c2cc0ecc9 100644 --- a/infrastructure/build/tools/configurator/namelistfeigner.py +++ b/infrastructure/build/tools/configurator/namelistfeigner.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/build/tools/dependerator/__init__.py b/infrastructure/build/tools/dependerator/__init__.py index b8da3a681..3c85963ed 100644 --- a/infrastructure/build/tools/dependerator/__init__.py +++ b/infrastructure/build/tools/dependerator/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## __version__ = "2.0-SNAPSHOT" diff --git a/infrastructure/build/tools/dependerator/analyser.py b/infrastructure/build/tools/dependerator/analyser.py index 8db8e6711..60e4906d1 100755 --- a/infrastructure/build/tools/dependerator/analyser.py +++ b/infrastructure/build/tools/dependerator/analyser.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # Generate a make file snippet holding build information about a source file. diff --git a/infrastructure/build/tools/dependerator/database.py b/infrastructure/build/tools/dependerator/database.py index 17f6ab735..a670084e9 100644 --- a/infrastructure/build/tools/dependerator/database.py +++ b/infrastructure/build/tools/dependerator/database.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # Manages a database of dependency information. diff --git a/infrastructure/build/tools/dependerator/process.py b/infrastructure/build/tools/dependerator/process.py index df080da72..05ba1569e 100644 --- a/infrastructure/build/tools/dependerator/process.py +++ b/infrastructure/build/tools/dependerator/process.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## # Process previously analysed dependency database. For fun and profit! diff --git a/infrastructure/build/tools/dependerator/tests/__init__.py b/infrastructure/build/tools/dependerator/tests/__init__.py index eeae5b535..ec4cb4893 100644 --- a/infrastructure/build/tools/dependerator/tests/__init__.py +++ b/infrastructure/build/tools/dependerator/tests/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/infrastructure/build/tools/dependerator/tests/test_analyser.py b/infrastructure/build/tools/dependerator/tests/test_analyser.py index 6112ac152..4c8769352 100644 --- a/infrastructure/build/tools/dependerator/tests/test_analyser.py +++ b/infrastructure/build/tools/dependerator/tests/test_analyser.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## from pathlib import Path diff --git a/infrastructure/build/tools/dependerator/tests/test_database.py b/infrastructure/build/tools/dependerator/tests/test_database.py index 2c9c48828..b72d5a277 100644 --- a/infrastructure/build/tools/dependerator/tests/test_database.py +++ b/infrastructure/build/tools/dependerator/tests/test_database.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/infrastructure/build/tools/dependerator/tests/test_process.py b/infrastructure/build/tools/dependerator/tests/test_process.py index 2afa88223..9ebabdcb8 100644 --- a/infrastructure/build/tools/dependerator/tests/test_process.py +++ b/infrastructure/build/tools/dependerator/tests/test_process.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## diff --git a/infrastructure/documentation/uml/field.puml b/infrastructure/documentation/uml/field.puml index a6e8a0d78..f50611b17 100644 --- a/infrastructure/documentation/uml/field.puml +++ b/infrastructure/documentation/uml/field.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/field/field_mod.iuml b/infrastructure/documentation/uml/field/field_mod.iuml index 74bd88f15..e43fb79e6 100644 --- a/infrastructure/documentation/uml/field/field_mod.iuml +++ b/infrastructure/documentation/uml/field/field_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2021, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class field_mod::field_type { diff --git a/infrastructure/documentation/uml/field/field_vector_mod.iuml b/infrastructure/documentation/uml/field/field_vector_mod.iuml index fe76c6b97..7461298ee 100644 --- a/infrastructure/documentation/uml/field/field_vector_mod.iuml +++ b/infrastructure/documentation/uml/field/field_vector_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class field_vector_mod::field_vector_type{ diff --git a/infrastructure/documentation/uml/field/function_space_collection_mod.iuml b/infrastructure/documentation/uml/field/function_space_collection_mod.iuml index ce4b56f6d..7aaa70b09 100644 --- a/infrastructure/documentation/uml/field/function_space_collection_mod.iuml +++ b/infrastructure/documentation/uml/field/function_space_collection_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class function_space_collection_mod::function_space_collection_type { diff --git a/infrastructure/documentation/uml/field/function_space_mod.iuml b/infrastructure/documentation/uml/field/function_space_mod.iuml index c79d5817c..4fa626430 100644 --- a/infrastructure/documentation/uml/field/function_space_mod.iuml +++ b/infrastructure/documentation/uml/field/function_space_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class function_space_mod::function_space_type { diff --git a/infrastructure/documentation/uml/field/operator_mod.iuml b/infrastructure/documentation/uml/field/operator_mod.iuml index b7a368f21..8333c758a 100644 --- a/infrastructure/documentation/uml/field/operator_mod.iuml +++ b/infrastructure/documentation/uml/field/operator_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. abstract class operator_parent_mod::operator_parent_type{ diff --git a/infrastructure/documentation/uml/field/quadrature_rule_gaussian_mod.iuml b/infrastructure/documentation/uml/field/quadrature_rule_gaussian_mod.iuml index 0d07f2601..70aa683f4 100644 --- a/infrastructure/documentation/uml/field/quadrature_rule_gaussian_mod.iuml +++ b/infrastructure/documentation/uml/field/quadrature_rule_gaussian_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class quadrature_rule_gaussian_mod::quadrature_rule_gaussian_type { diff --git a/infrastructure/documentation/uml/field/quadrature_rule_mod.iuml b/infrastructure/documentation/uml/field/quadrature_rule_mod.iuml index 4d5b1af8b..6509c733b 100644 --- a/infrastructure/documentation/uml/field/quadrature_rule_mod.iuml +++ b/infrastructure/documentation/uml/field/quadrature_rule_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. abstract class quadrature_rule_mod::quadrature_rule_type { diff --git a/infrastructure/documentation/uml/field/quadrature_rule_newton_cotes_mod.iuml b/infrastructure/documentation/uml/field/quadrature_rule_newton_cotes_mod.iuml index 955a5eb16..02354d687 100644 --- a/infrastructure/documentation/uml/field/quadrature_rule_newton_cotes_mod.iuml +++ b/infrastructure/documentation/uml/field/quadrature_rule_newton_cotes_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class quadrature_rule_newton_cotes_mod::quadrature_rule_newton_cotes_type { diff --git a/infrastructure/documentation/uml/field/scalar_mod.iuml b/infrastructure/documentation/uml/field/scalar_mod.iuml index c05e56498..6bbf84649 100644 --- a/infrastructure/documentation/uml/field/scalar_mod.iuml +++ b/infrastructure/documentation/uml/field/scalar_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class scalar_mod::scalar_type { diff --git a/infrastructure/documentation/uml/field_vector.puml b/infrastructure/documentation/uml/field_vector.puml index 8622ddf16..a92b809f9 100644 --- a/infrastructure/documentation/uml/field_vector.puml +++ b/infrastructure/documentation/uml/field_vector.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/function_space_chain.puml b/infrastructure/documentation/uml/function_space_chain.puml index cb0586d09..f66e76bcf 100644 --- a/infrastructure/documentation/uml/function_space_chain.puml +++ b/infrastructure/documentation/uml/function_space_chain.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/io/file_mod.iuml b/infrastructure/documentation/uml/io/file_mod.iuml index 8c11d3e25..e0b4bb428 100644 --- a/infrastructure/documentation/uml/io/file_mod.iuml +++ b/infrastructure/documentation/uml/io/file_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. interface file_mod::file_type { diff --git a/infrastructure/documentation/uml/io/gencube_ps_mod.iuml b/infrastructure/documentation/uml/io/gencube_ps_mod.iuml index 3ced5c79e..04dd05ed5 100644 --- a/infrastructure/documentation/uml/io/gencube_ps_mod.iuml +++ b/infrastructure/documentation/uml/io/gencube_ps_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class gencube_ps_mod::gencube_ps_type { diff --git a/infrastructure/documentation/uml/io/ncdf_quad_mod.iuml b/infrastructure/documentation/uml/io/ncdf_quad_mod.iuml index 701763cf9..b674a5349 100644 --- a/infrastructure/documentation/uml/io/ncdf_quad_mod.iuml +++ b/infrastructure/documentation/uml/io/ncdf_quad_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class ncdf_quad_mod::ncdf_quad_type { diff --git a/infrastructure/documentation/uml/io/ugrid_2d_mod.iuml b/infrastructure/documentation/uml/io/ugrid_2d_mod.iuml index ac3f31cda..8e38c29f9 100644 --- a/infrastructure/documentation/uml/io/ugrid_2d_mod.iuml +++ b/infrastructure/documentation/uml/io/ugrid_2d_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class ugrid_2d_mod::ugrid_2d_type { diff --git a/infrastructure/documentation/uml/io/ugrid_file_mod.iuml b/infrastructure/documentation/uml/io/ugrid_file_mod.iuml index 430ab6ae5..a254e2c6d 100644 --- a/infrastructure/documentation/uml/io/ugrid_file_mod.iuml +++ b/infrastructure/documentation/uml/io/ugrid_file_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. interface ugrid_file_mod::ugrid_file_type{ diff --git a/infrastructure/documentation/uml/io/ugrid_generator_mod.iuml b/infrastructure/documentation/uml/io/ugrid_generator_mod.iuml index ec7927ad0..0151c916c 100644 --- a/infrastructure/documentation/uml/io/ugrid_generator_mod.iuml +++ b/infrastructure/documentation/uml/io/ugrid_generator_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. interface ugrid_generator_mod::ugrid_generator_type{ diff --git a/infrastructure/documentation/uml/io/ugrid_mesh_data_mod.iuml b/infrastructure/documentation/uml/io/ugrid_mesh_data_mod.iuml index 9a5fca642..5f7bb65ac 100644 --- a/infrastructure/documentation/uml/io/ugrid_mesh_data_mod.iuml +++ b/infrastructure/documentation/uml/io/ugrid_mesh_data_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2021, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class ugrid_mesh_data_mod::ugrid_mesh_data_type { diff --git a/infrastructure/documentation/uml/linked_list.puml b/infrastructure/documentation/uml/linked_list.puml index 636e35c9f..5cd9e03ac 100644 --- a/infrastructure/documentation/uml/linked_list.puml +++ b/infrastructure/documentation/uml/linked_list.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/look.iuml b/infrastructure/documentation/uml/look.iuml index 25a344e06..366a3adf5 100644 --- a/infrastructure/documentation/uml/look.iuml +++ b/infrastructure/documentation/uml/look.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. set namespaceSeparator :: diff --git a/infrastructure/documentation/uml/mesh.puml b/infrastructure/documentation/uml/mesh.puml index 378a39c33..46ce0d4f3 100644 --- a/infrastructure/documentation/uml/mesh.puml +++ b/infrastructure/documentation/uml/mesh.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/mesh/function_space_chain_mod.iuml b/infrastructure/documentation/uml/mesh/function_space_chain_mod.iuml index d080db1ff..b4ee88dfd 100644 --- a/infrastructure/documentation/uml/mesh/function_space_chain_mod.iuml +++ b/infrastructure/documentation/uml/mesh/function_space_chain_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class function_space_chain_mod::function_space_chain_type{ diff --git a/infrastructure/documentation/uml/mesh/function_space_pointer_mod.iuml b/infrastructure/documentation/uml/mesh/function_space_pointer_mod.iuml index 025252255..33ccff82c 100644 --- a/infrastructure/documentation/uml/mesh/function_space_pointer_mod.iuml +++ b/infrastructure/documentation/uml/mesh/function_space_pointer_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class function_space_pointer_mod::function_space_pointer_type{ diff --git a/infrastructure/documentation/uml/mesh/global_mesh_collection_mod.iuml b/infrastructure/documentation/uml/mesh/global_mesh_collection_mod.iuml index 53ee361b7..ef3a843f3 100644 --- a/infrastructure/documentation/uml/mesh/global_mesh_collection_mod.iuml +++ b/infrastructure/documentation/uml/mesh/global_mesh_collection_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class global_mesh_collection_mod::global_mesh_collection_type { diff --git a/infrastructure/documentation/uml/mesh/global_mesh_map_collection_mod.iuml b/infrastructure/documentation/uml/mesh/global_mesh_map_collection_mod.iuml index 9ff60eb76..8f752048d 100644 --- a/infrastructure/documentation/uml/mesh/global_mesh_map_collection_mod.iuml +++ b/infrastructure/documentation/uml/mesh/global_mesh_map_collection_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class global_mesh_map_collection_mod::global_mesh_map_collection_type { diff --git a/infrastructure/documentation/uml/mesh/global_mesh_map_mod.iuml b/infrastructure/documentation/uml/mesh/global_mesh_map_mod.iuml index 5a63cbafc..fd2c233ff 100644 --- a/infrastructure/documentation/uml/mesh/global_mesh_map_mod.iuml +++ b/infrastructure/documentation/uml/mesh/global_mesh_map_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class global_mesh_map_mod::global_mesh_map_type { diff --git a/infrastructure/documentation/uml/mesh/global_mesh_mod.iuml b/infrastructure/documentation/uml/mesh/global_mesh_mod.iuml index 1d5b76581..9b6a7e532 100644 --- a/infrastructure/documentation/uml/mesh/global_mesh_mod.iuml +++ b/infrastructure/documentation/uml/mesh/global_mesh_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class global_mesh_mod::global_mesh_type { diff --git a/infrastructure/documentation/uml/mesh/mesh_collection_mod.iuml b/infrastructure/documentation/uml/mesh/mesh_collection_mod.iuml index 521b0324b..12d0b8b8d 100644 --- a/infrastructure/documentation/uml/mesh/mesh_collection_mod.iuml +++ b/infrastructure/documentation/uml/mesh/mesh_collection_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class mesh_collection_mod::mesh_collection_type { diff --git a/infrastructure/documentation/uml/mesh/mesh_map_collection_mod.iuml b/infrastructure/documentation/uml/mesh/mesh_map_collection_mod.iuml index 543f13e11..9a58cd97a 100644 --- a/infrastructure/documentation/uml/mesh/mesh_map_collection_mod.iuml +++ b/infrastructure/documentation/uml/mesh/mesh_map_collection_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class mesh_map_collection_mod::mesh_map_collection_type{ diff --git a/infrastructure/documentation/uml/mesh/mesh_map_mod.iuml b/infrastructure/documentation/uml/mesh/mesh_map_mod.iuml index 1b23ea8f5..f78cb3ba6 100644 --- a/infrastructure/documentation/uml/mesh/mesh_map_mod.iuml +++ b/infrastructure/documentation/uml/mesh/mesh_map_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class mesh_map_mod::mesh_map_type{ diff --git a/infrastructure/documentation/uml/mesh/mesh_mod.iuml b/infrastructure/documentation/uml/mesh/mesh_mod.iuml index 39c1229dc..f22601e9f 100644 --- a/infrastructure/documentation/uml/mesh/mesh_mod.iuml +++ b/infrastructure/documentation/uml/mesh/mesh_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class mesh_mod::mesh_type { diff --git a/infrastructure/documentation/uml/mesh/partition_mod.iuml b/infrastructure/documentation/uml/mesh/partition_mod.iuml index 13ae4bdee..8d39d924f 100644 --- a/infrastructure/documentation/uml/mesh/partition_mod.iuml +++ b/infrastructure/documentation/uml/mesh/partition_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class partition_mod::partition_type { diff --git a/infrastructure/documentation/uml/mesh_collection.puml b/infrastructure/documentation/uml/mesh_collection.puml index 4a3d2c3a8..cfb4422a5 100644 --- a/infrastructure/documentation/uml/mesh_collection.puml +++ b/infrastructure/documentation/uml/mesh_collection.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/mesh_context.puml b/infrastructure/documentation/uml/mesh_context.puml index e4dfc8942..66482c59f 100644 --- a/infrastructure/documentation/uml/mesh_context.puml +++ b/infrastructure/documentation/uml/mesh_context.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/mesh_generator.puml b/infrastructure/documentation/uml/mesh_generator.puml index 34a52e69c..a91f5a064 100644 --- a/infrastructure/documentation/uml/mesh_generator.puml +++ b/infrastructure/documentation/uml/mesh_generator.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/mesh_map.puml b/infrastructure/documentation/uml/mesh_map.puml index e86525d0a..7eb569f05 100644 --- a/infrastructure/documentation/uml/mesh_map.puml +++ b/infrastructure/documentation/uml/mesh_map.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/namelist.puml b/infrastructure/documentation/uml/namelist.puml index d14365f11..c448b7aa8 100644 --- a/infrastructure/documentation/uml/namelist.puml +++ b/infrastructure/documentation/uml/namelist.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2023, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/quadrature_rule.puml b/infrastructure/documentation/uml/quadrature_rule.puml index 14431a124..b3d85a7a5 100644 --- a/infrastructure/documentation/uml/quadrature_rule.puml +++ b/infrastructure/documentation/uml/quadrature_rule.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/scalar.puml b/infrastructure/documentation/uml/scalar.puml index 361880e87..d4694341b 100644 --- a/infrastructure/documentation/uml/scalar.puml +++ b/infrastructure/documentation/uml/scalar.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/solver.puml b/infrastructure/documentation/uml/solver.puml index 9caa92cfe..16ebfb062 100644 --- a/infrastructure/documentation/uml/solver.puml +++ b/infrastructure/documentation/uml/solver.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/solver/bicgstab_mod.iuml b/infrastructure/documentation/uml/solver/bicgstab_mod.iuml index 3db6fc344..04895ea28 100644 --- a/infrastructure/documentation/uml/solver/bicgstab_mod.iuml +++ b/infrastructure/documentation/uml/solver/bicgstab_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class iterative_solver_mod::bicgstab_type{ diff --git a/infrastructure/documentation/uml/solver/cg_mod.iuml b/infrastructure/documentation/uml/solver/cg_mod.iuml index e42afe3b5..97b6997c4 100644 --- a/infrastructure/documentation/uml/solver/cg_mod.iuml +++ b/infrastructure/documentation/uml/solver/cg_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class iterative_solver_mod::conjugate_gradient_type{ diff --git a/infrastructure/documentation/uml/solver/iterative_solver_mod.iuml b/infrastructure/documentation/uml/solver/iterative_solver_mod.iuml index b1513f6da..f6a11598f 100644 --- a/infrastructure/documentation/uml/solver/iterative_solver_mod.iuml +++ b/infrastructure/documentation/uml/solver/iterative_solver_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. abstract class iterative_solver_mod::abstract_iterative_solver_type{ diff --git a/infrastructure/documentation/uml/solver/linear_operator_mod.iuml b/infrastructure/documentation/uml/solver/linear_operator_mod.iuml index 867d2596f..f56500eeb 100644 --- a/infrastructure/documentation/uml/solver/linear_operator_mod.iuml +++ b/infrastructure/documentation/uml/solver/linear_operator_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. abstract class linear_operator_mod::abstract_linear_operator_type{ diff --git a/infrastructure/documentation/uml/solver/preconditioner_mod.iuml b/infrastructure/documentation/uml/solver/preconditioner_mod.iuml index fb3caddad..f650810d6 100644 --- a/infrastructure/documentation/uml/solver/preconditioner_mod.iuml +++ b/infrastructure/documentation/uml/solver/preconditioner_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. abstract class preconditioner_mod::abstract_preconditioner_type{ diff --git a/infrastructure/documentation/uml/ugrid.puml b/infrastructure/documentation/uml/ugrid.puml index 8eb36aebe..405aa9bef 100644 --- a/infrastructure/documentation/uml/ugrid.puml +++ b/infrastructure/documentation/uml/ugrid.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/documentation/uml/utilities/linked_list_data_mod.iuml b/infrastructure/documentation/uml/utilities/linked_list_data_mod.iuml index 2f7129627..93c8d79d8 100644 --- a/infrastructure/documentation/uml/utilities/linked_list_data_mod.iuml +++ b/infrastructure/documentation/uml/utilities/linked_list_data_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. abstract class linked_list_data_mod::linked_list_data_type { diff --git a/infrastructure/documentation/uml/utilities/linked_list_mod.iuml b/infrastructure/documentation/uml/utilities/linked_list_mod.iuml index f5d2eab28..a7f9d4f13 100644 --- a/infrastructure/documentation/uml/utilities/linked_list_mod.iuml +++ b/infrastructure/documentation/uml/utilities/linked_list_mod.iuml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. class linked_list_mod::linked_list_type { diff --git a/infrastructure/documentation/uml/vector.puml b/infrastructure/documentation/uml/vector.puml index c78ba45ca..964454179 100644 --- a/infrastructure/documentation/uml/vector.puml +++ b/infrastructure/documentation/uml/vector.puml @@ -1,5 +1,5 @@ ' Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -' For further details please refer to the file LICENCE.original which you +' For further details please refer to the file LICENCE which you ' should have received as part of this distribution. @startuml diff --git a/infrastructure/integration-test/cli_mod_test.f90 b/infrastructure/integration-test/cli_mod_test.f90 index 53cc63fac..874e25b7e 100644 --- a/infrastructure/integration-test/cli_mod_test.f90 +++ b/infrastructure/integration-test/cli_mod_test.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/integration-test/cli_mod_test.py b/infrastructure/integration-test/cli_mod_test.py index 824cd3d6f..4d3759ee8 100755 --- a/infrastructure/integration-test/cli_mod_test.py +++ b/infrastructure/integration-test/cli_mod_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/integration-test/log_mod_error_test.f90 b/infrastructure/integration-test/log_mod_error_test.f90 index 815024f3e..5887bca99 100644 --- a/infrastructure/integration-test/log_mod_error_test.f90 +++ b/infrastructure/integration-test/log_mod_error_test.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/integration-test/log_mod_error_test.py b/infrastructure/integration-test/log_mod_error_test.py index 5770b7e1c..71c499b0a 100755 --- a/infrastructure/integration-test/log_mod_error_test.py +++ b/infrastructure/integration-test/log_mod_error_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################## # Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -# For further details please refer to the file LICENCE.original which you +# For further details please refer to the file LICENCE which you # should have received as part of this distribution. ############################################################################## """ diff --git a/infrastructure/source/PSYKE/dino_mod.F90 b/infrastructure/source/PSYKE/dino_mod.F90 index d11e21344..5f74c45b7 100644 --- a/infrastructure/source/PSYKE/dino_mod.F90 +++ b/infrastructure/source/PSYKE/dino_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief IO library for the PSKE to inject into PSy layer for kernel extraction, diff --git a/infrastructure/source/field/vector_mod.F90 b/infrastructure/source/field/vector_mod.F90 index cdafeb4b7..f617d1aec 100644 --- a/infrastructure/source/field/vector_mod.F90 +++ b/infrastructure/source/field/vector_mod.F90 @@ -1,6 +1,6 @@ !------------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------- diff --git a/infrastructure/source/function_space/dofmap/master_dofmap_mod.F90 b/infrastructure/source/function_space/dofmap/master_dofmap_mod.F90 index 9576db2ba..2901ea9ea 100644 --- a/infrastructure/source/function_space/dofmap/master_dofmap_mod.F90 +++ b/infrastructure/source/function_space/dofmap/master_dofmap_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief A type which holds information about the master dofmap. diff --git a/infrastructure/source/function_space/dofmap/stencil_dofmap_mod.F90 b/infrastructure/source/function_space/dofmap/stencil_dofmap_mod.F90 index 853bb0c85..e36741bcd 100644 --- a/infrastructure/source/function_space/dofmap/stencil_dofmap_mod.F90 +++ b/infrastructure/source/function_space/dofmap/stencil_dofmap_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief A type which holds information about the dofmap. diff --git a/infrastructure/source/function_space/fs_continuity_mod.F90 b/infrastructure/source/function_space/fs_continuity_mod.F90 index 08e5492e5..a9b404fa7 100644 --- a/infrastructure/source/function_space/fs_continuity_mod.F90 +++ b/infrastructure/source/function_space/fs_continuity_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/function_space/function_space_chain_mod.F90 b/infrastructure/source/function_space/function_space_chain_mod.F90 index 19b70e503..a64a6726e 100644 --- a/infrastructure/source/function_space/function_space_chain_mod.F90 +++ b/infrastructure/source/function_space/function_space_chain_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/function_space/function_space_collection_mod.F90 b/infrastructure/source/function_space/function_space_collection_mod.F90 index a0cdaa60a..1139fc22a 100644 --- a/infrastructure/source/function_space/function_space_collection_mod.F90 +++ b/infrastructure/source/function_space/function_space_collection_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/function_space/function_space_constructor_helper_functions_mod.F90 b/infrastructure/source/function_space/function_space_constructor_helper_functions_mod.F90 index 31bc21121..792fb2ebf 100644 --- a/infrastructure/source/function_space/function_space_constructor_helper_functions_mod.F90 +++ b/infrastructure/source/function_space/function_space_constructor_helper_functions_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Holds support routines for instantiating a function space. diff --git a/infrastructure/source/function_space/function_space_mod.F90 b/infrastructure/source/function_space/function_space_mod.F90 index 4cdb2d07b..4fa65796e 100644 --- a/infrastructure/source/function_space/function_space_mod.F90 +++ b/infrastructure/source/function_space/function_space_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/function_space/function_space_pointer_mod.F90 b/infrastructure/source/function_space/function_space_pointer_mod.F90 index 951daafd1..6bd822d7d 100644 --- a/infrastructure/source/function_space/function_space_pointer_mod.F90 +++ b/infrastructure/source/function_space/function_space_pointer_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/function_space/polynomial_mod.f90 b/infrastructure/source/function_space/polynomial_mod.f90 index d46ce00ed..71505bc3f 100644 --- a/infrastructure/source/function_space/polynomial_mod.f90 +++ b/infrastructure/source/function_space/polynomial_mod.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/io/file_mod.F90 b/infrastructure/source/io/file_mod.F90 index 8ee333125..33cde2778 100644 --- a/infrastructure/source/io/file_mod.F90 +++ b/infrastructure/source/io/file_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Module containing an abstract file type diff --git a/infrastructure/source/io/io_utility_mod.f90 b/infrastructure/source/io/io_utility_mod.f90 index 7862a0d8f..e33cc9701 100644 --- a/infrastructure/source/io/io_utility_mod.f90 +++ b/infrastructure/source/io/io_utility_mod.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/source/io/ncdf_quad_mod.F90 b/infrastructure/source/io/ncdf_quad_mod.F90 index 1e6b8f070..c83aec22b 100644 --- a/infrastructure/source/io/ncdf_quad_mod.F90 +++ b/infrastructure/source/io/ncdf_quad_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief File handler for NetCDF ugrid files. diff --git a/infrastructure/source/io/ugrid_2d_mod.F90 b/infrastructure/source/io/ugrid_2d_mod.F90 index 3628fa587..f7a9f7937 100644 --- a/infrastructure/source/io/ugrid_2d_mod.F90 +++ b/infrastructure/source/io/ugrid_2d_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Store 2-dimensional ugrid mesh data. diff --git a/infrastructure/source/io/ugrid_file_mod.F90 b/infrastructure/source/io/ugrid_file_mod.F90 index 95f81f982..9e2f80f2d 100644 --- a/infrastructure/source/io/ugrid_file_mod.F90 +++ b/infrastructure/source/io/ugrid_file_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Abstract ugrid file type. diff --git a/infrastructure/source/io/ugrid_generator_mod.F90 b/infrastructure/source/io/ugrid_generator_mod.F90 index d44e465ce..d49adb970 100644 --- a/infrastructure/source/io/ugrid_generator_mod.F90 +++ b/infrastructure/source/io/ugrid_generator_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Abstract mesh generator type. diff --git a/infrastructure/source/kernel_metadata/argument_mod.F90 b/infrastructure/source/kernel_metadata/argument_mod.F90 index 46317ea46..1d58541b0 100644 --- a/infrastructure/source/kernel_metadata/argument_mod.F90 +++ b/infrastructure/source/kernel_metadata/argument_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/source/kernel_metadata/kernel_mod.F90 b/infrastructure/source/kernel_metadata/kernel_mod.F90 index 817849b7a..66a9264d1 100644 --- a/infrastructure/source/kernel_metadata/kernel_mod.F90 +++ b/infrastructure/source/kernel_metadata/kernel_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! Abstract base kernel type. diff --git a/infrastructure/source/mesh/global_mesh_collection_mod.F90 b/infrastructure/source/mesh/global_mesh_collection_mod.F90 index 100567d93..a5410f61d 100644 --- a/infrastructure/source/mesh/global_mesh_collection_mod.F90 +++ b/infrastructure/source/mesh/global_mesh_collection_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Holds and manages the multiple global meshes used to setup a model diff --git a/infrastructure/source/mesh/global_mesh_map_collection_mod.F90 b/infrastructure/source/mesh/global_mesh_map_collection_mod.F90 index e7bf5ad5a..60d7a9ab2 100644 --- a/infrastructure/source/mesh/global_mesh_map_collection_mod.F90 +++ b/infrastructure/source/mesh/global_mesh_map_collection_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/mesh/global_mesh_map_mod.F90 b/infrastructure/source/mesh/global_mesh_map_mod.F90 index 851c1df28..0337c76b8 100644 --- a/infrastructure/source/mesh/global_mesh_map_mod.F90 +++ b/infrastructure/source/mesh/global_mesh_map_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/mesh/global_mesh_mod.F90 b/infrastructure/source/mesh/global_mesh_mod.F90 index b3c786bcc..178f6d818 100644 --- a/infrastructure/source/mesh/global_mesh_mod.F90 +++ b/infrastructure/source/mesh/global_mesh_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/source/mesh/mesh_collection_mod.F90 b/infrastructure/source/mesh/mesh_collection_mod.F90 index adfdc45e9..11033c559 100644 --- a/infrastructure/source/mesh/mesh_collection_mod.F90 +++ b/infrastructure/source/mesh/mesh_collection_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/mesh/mesh_colouring_mod.F90 b/infrastructure/source/mesh/mesh_colouring_mod.F90 index 0682ce57d..274454afe 100644 --- a/infrastructure/source/mesh/mesh_colouring_mod.F90 +++ b/infrastructure/source/mesh/mesh_colouring_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Computes mesh colouring for vector spaces. diff --git a/infrastructure/source/mesh/mesh_constructor_helper_functions_mod.F90 b/infrastructure/source/mesh/mesh_constructor_helper_functions_mod.F90 index 48e976108..412302bec 100644 --- a/infrastructure/source/mesh/mesh_constructor_helper_functions_mod.F90 +++ b/infrastructure/source/mesh/mesh_constructor_helper_functions_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Holds helper functions for constructing a mesh object diff --git a/infrastructure/source/mesh/mesh_map_collection_mod.F90 b/infrastructure/source/mesh/mesh_map_collection_mod.F90 index 0577dc52d..b1459a64e 100644 --- a/infrastructure/source/mesh/mesh_map_collection_mod.F90 +++ b/infrastructure/source/mesh/mesh_map_collection_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/mesh/mesh_map_mod.F90 b/infrastructure/source/mesh/mesh_map_mod.F90 index 6b859f650..421cc5855 100644 --- a/infrastructure/source/mesh/mesh_map_mod.F90 +++ b/infrastructure/source/mesh/mesh_map_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/mesh/mesh_mod.F90 b/infrastructure/source/mesh/mesh_mod.F90 index 3fbb69e3f..a449eff03 100644 --- a/infrastructure/source/mesh/mesh_mod.F90 +++ b/infrastructure/source/mesh/mesh_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Local 3D mesh object. diff --git a/infrastructure/source/mesh/panel_decomposition_mod.f90 b/infrastructure/source/mesh/panel_decomposition_mod.f90 index 3b4db3cfa..95ca50107 100644 --- a/infrastructure/source/mesh/panel_decomposition_mod.f90 +++ b/infrastructure/source/mesh/panel_decomposition_mod.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2025, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/source/mesh/partition_mod.F90 b/infrastructure/source/mesh/partition_mod.F90 index 03d5e03ab..3348427a6 100644 --- a/infrastructure/source/mesh/partition_mod.F90 +++ b/infrastructure/source/mesh/partition_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/source/mesh/reference_element_mod.F90 b/infrastructure/source/mesh/reference_element_mod.F90 index 49ee1c7d1..33b2d939c 100644 --- a/infrastructure/source/mesh/reference_element_mod.F90 +++ b/infrastructure/source/mesh/reference_element_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Unit reference elements. diff --git a/infrastructure/source/quadrature/quadrature_rule_gaussian_mod.F90 b/infrastructure/source/quadrature/quadrature_rule_gaussian_mod.F90 index 344415439..98ee0ae76 100644 --- a/infrastructure/source/quadrature/quadrature_rule_gaussian_mod.F90 +++ b/infrastructure/source/quadrature/quadrature_rule_gaussian_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/quadrature/quadrature_rule_mod.F90 b/infrastructure/source/quadrature/quadrature_rule_mod.F90 index 8f6af7fd9..28c6b6d50 100644 --- a/infrastructure/source/quadrature/quadrature_rule_mod.F90 +++ b/infrastructure/source/quadrature/quadrature_rule_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/quadrature/quadrature_rule_newton_cotes_mod.F90 b/infrastructure/source/quadrature/quadrature_rule_newton_cotes_mod.F90 index 824773491..d16181d43 100644 --- a/infrastructure/source/quadrature/quadrature_rule_newton_cotes_mod.F90 +++ b/infrastructure/source/quadrature/quadrature_rule_newton_cotes_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/utilities/cli_mod.f90 b/infrastructure/source/utilities/cli_mod.f90 index 5ff2d7720..144f252aa 100644 --- a/infrastructure/source/utilities/cli_mod.f90 +++ b/infrastructure/source/utilities/cli_mod.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> Parses the commandline for arguments. diff --git a/infrastructure/source/utilities/constants_mod.F90 b/infrastructure/source/utilities/constants_mod.F90 index c3558d745..85653641b 100644 --- a/infrastructure/source/utilities/constants_mod.F90 +++ b/infrastructure/source/utilities/constants_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/utilities/coord_transform_mod.F90 b/infrastructure/source/utilities/coord_transform_mod.F90 index 30a086700..8c8179663 100644 --- a/infrastructure/source/utilities/coord_transform_mod.F90 +++ b/infrastructure/source/utilities/coord_transform_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !------------------------------------------------------------------------------- ! Contributed by John Thuburn. diff --git a/infrastructure/source/utilities/cross_product_mod.F90 b/infrastructure/source/utilities/cross_product_mod.F90 index 2ce08f570..f834694b4 100644 --- a/infrastructure/source/utilities/cross_product_mod.F90 +++ b/infrastructure/source/utilities/cross_product_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/source/utilities/linked_list_data_mod.F90 b/infrastructure/source/utilities/linked_list_data_mod.F90 index f8ec185f7..0107fdc4e 100644 --- a/infrastructure/source/utilities/linked_list_data_mod.F90 +++ b/infrastructure/source/utilities/linked_list_data_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/source/utilities/linked_list_int_mod.F90 b/infrastructure/source/utilities/linked_list_int_mod.F90 index 7c3658e51..1407a54b6 100644 --- a/infrastructure/source/utilities/linked_list_int_mod.F90 +++ b/infrastructure/source/utilities/linked_list_int_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/source/utilities/linked_list_mod.F90 b/infrastructure/source/utilities/linked_list_mod.F90 index e0ea54843..c52b5e47a 100644 --- a/infrastructure/source/utilities/linked_list_mod.F90 +++ b/infrastructure/source/utilities/linked_list_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/source/utilities/log_mod.F90 b/infrastructure/source/utilities/log_mod.F90 index e3d12c594..bcc8545de 100644 --- a/infrastructure/source/utilities/log_mod.F90 +++ b/infrastructure/source/utilities/log_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief A simple logging facility. diff --git a/infrastructure/source/utilities/matrix_invert_mod.F90 b/infrastructure/source/utilities/matrix_invert_mod.F90 index 44a47de86..65fdbd089 100644 --- a/infrastructure/source/utilities/matrix_invert_mod.F90 +++ b/infrastructure/source/utilities/matrix_invert_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/unit-test/PSYKE/dino_mod_test.pf b/infrastructure/unit-test/PSYKE/dino_mod_test.pf index 0c080eb36..ec4b9ece4 100644 --- a/infrastructure/unit-test/PSYKE/dino_mod_test.pf +++ b/infrastructure/unit-test/PSYKE/dino_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/field/field_mod_test.pf b/infrastructure/unit-test/field/field_mod_test.pf index 6c25c7c44..6f74bf383 100644 --- a/infrastructure/unit-test/field/field_mod_test.pf +++ b/infrastructure/unit-test/field/field_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/field/integer_field_mod_test.pf b/infrastructure/unit-test/field/integer_field_mod_test.pf index 7ba7cef02..3746d5d9d 100644 --- a/infrastructure/unit-test/field/integer_field_mod_test.pf +++ b/infrastructure/unit-test/field/integer_field_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/function_space/dofmap/master_dofmap_mod_test.pf b/infrastructure/unit-test/function_space/dofmap/master_dofmap_mod_test.pf index 5722c2a30..dcd540317 100644 --- a/infrastructure/unit-test/function_space/dofmap/master_dofmap_mod_test.pf +++ b/infrastructure/unit-test/function_space/dofmap/master_dofmap_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/function_space/dofmap/stencil_dofmap_lam_mod_test.pf b/infrastructure/unit-test/function_space/dofmap/stencil_dofmap_lam_mod_test.pf index f08eaea05..64860aa50 100644 --- a/infrastructure/unit-test/function_space/dofmap/stencil_dofmap_lam_mod_test.pf +++ b/infrastructure/unit-test/function_space/dofmap/stencil_dofmap_lam_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/function_space/dofmap/stencil_dofmap_mod_test.pf b/infrastructure/unit-test/function_space/dofmap/stencil_dofmap_mod_test.pf index 55193d8fc..7d3f88359 100644 --- a/infrastructure/unit-test/function_space/dofmap/stencil_dofmap_mod_test.pf +++ b/infrastructure/unit-test/function_space/dofmap/stencil_dofmap_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/function_space/function_space_chain_mod_test.pf b/infrastructure/unit-test/function_space/function_space_chain_mod_test.pf index ab0fb83b3..5e85f4193 100644 --- a/infrastructure/unit-test/function_space/function_space_chain_mod_test.pf +++ b/infrastructure/unit-test/function_space/function_space_chain_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/unit-test/function_space/function_space_collection_mod_test.pf b/infrastructure/unit-test/function_space/function_space_collection_mod_test.pf index 04b66b58a..2aa58ab96 100644 --- a/infrastructure/unit-test/function_space/function_space_collection_mod_test.pf +++ b/infrastructure/unit-test/function_space/function_space_collection_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/function_space/function_space_mod_test.pf b/infrastructure/unit-test/function_space/function_space_mod_test.pf index 1497f5579..89b2981ab 100644 --- a/infrastructure/unit-test/function_space/function_space_mod_test.pf +++ b/infrastructure/unit-test/function_space/function_space_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/unit-test/function_space/polynomial_mod_test.pf b/infrastructure/unit-test/function_space/polynomial_mod_test.pf index f43b72254..030787f0b 100644 --- a/infrastructure/unit-test/function_space/polynomial_mod_test.pf +++ b/infrastructure/unit-test/function_space/polynomial_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/mesh/global_mesh_collection_mod_test.pf b/infrastructure/unit-test/mesh/global_mesh_collection_mod_test.pf index c491d706d..aea985f31 100644 --- a/infrastructure/unit-test/mesh/global_mesh_collection_mod_test.pf +++ b/infrastructure/unit-test/mesh/global_mesh_collection_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/mesh/global_mesh_map_collection_mod_test.pf b/infrastructure/unit-test/mesh/global_mesh_map_collection_mod_test.pf index 884102463..0baaa9bf0 100644 --- a/infrastructure/unit-test/mesh/global_mesh_map_collection_mod_test.pf +++ b/infrastructure/unit-test/mesh/global_mesh_map_collection_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/mesh/global_mesh_map_mod_test.pf b/infrastructure/unit-test/mesh/global_mesh_map_mod_test.pf index 938fe9c0e..8bdf46e35 100644 --- a/infrastructure/unit-test/mesh/global_mesh_map_mod_test.pf +++ b/infrastructure/unit-test/mesh/global_mesh_map_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/mesh/global_mesh_mod_test.pf b/infrastructure/unit-test/mesh/global_mesh_mod_test.pf index a30edc344..819340199 100644 --- a/infrastructure/unit-test/mesh/global_mesh_mod_test.pf +++ b/infrastructure/unit-test/mesh/global_mesh_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/mesh/mesh_collection_mod_test.pf b/infrastructure/unit-test/mesh/mesh_collection_mod_test.pf index 6848c2494..b68480905 100644 --- a/infrastructure/unit-test/mesh/mesh_collection_mod_test.pf +++ b/infrastructure/unit-test/mesh/mesh_collection_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/mesh/mesh_colouring_mod_test.pf b/infrastructure/unit-test/mesh/mesh_colouring_mod_test.pf index c30448988..9ef91840e 100644 --- a/infrastructure/unit-test/mesh/mesh_colouring_mod_test.pf +++ b/infrastructure/unit-test/mesh/mesh_colouring_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Test suite to verify computation of colour map. diff --git a/infrastructure/unit-test/mesh/mesh_map_collection_mod_test.pf b/infrastructure/unit-test/mesh/mesh_map_collection_mod_test.pf index 178b11da3..b4b2c87ca 100644 --- a/infrastructure/unit-test/mesh/mesh_map_collection_mod_test.pf +++ b/infrastructure/unit-test/mesh/mesh_map_collection_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/mesh/mesh_map_mod_test.pf b/infrastructure/unit-test/mesh/mesh_map_mod_test.pf index 99afc23c0..1c1be4a66 100644 --- a/infrastructure/unit-test/mesh/mesh_map_mod_test.pf +++ b/infrastructure/unit-test/mesh/mesh_map_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/mesh/mesh_mod_test.pf b/infrastructure/unit-test/mesh/mesh_mod_test.pf index bc12f4e2c..4061998a8 100644 --- a/infrastructure/unit-test/mesh/mesh_mod_test.pf +++ b/infrastructure/unit-test/mesh/mesh_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief pFunit tests for the mesh module. diff --git a/infrastructure/unit-test/mesh/partition_mod_test.pf b/infrastructure/unit-test/mesh/partition_mod_test.pf index 68ec07191..bc698f2e7 100644 --- a/infrastructure/unit-test/mesh/partition_mod_test.pf +++ b/infrastructure/unit-test/mesh/partition_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/operator/operator_mod_test.pf b/infrastructure/unit-test/operator/operator_mod_test.pf index bb20a1542..ae41e1ac4 100644 --- a/infrastructure/unit-test/operator/operator_mod_test.pf +++ b/infrastructure/unit-test/operator/operator_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/operator/operator_real32_mod_test.PF b/infrastructure/unit-test/operator/operator_real32_mod_test.PF index 249e1747f..f0c2cd740 100644 --- a/infrastructure/unit-test/operator/operator_real32_mod_test.PF +++ b/infrastructure/unit-test/operator/operator_real32_mod_test.PF @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2024, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> Test the Operator representation diff --git a/infrastructure/unit-test/operator/operator_real64_mod_test.PF b/infrastructure/unit-test/operator/operator_real64_mod_test.PF index e3c96c71c..b56412a0a 100644 --- a/infrastructure/unit-test/operator/operator_real64_mod_test.PF +++ b/infrastructure/unit-test/operator/operator_real64_mod_test.PF @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2024, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> Test the Operator representation diff --git a/infrastructure/unit-test/utilities/constants_mod_test.pf b/infrastructure/unit-test/utilities/constants_mod_test.pf index ab08a0ffd..e1012155e 100644 --- a/infrastructure/unit-test/utilities/constants_mod_test.pf +++ b/infrastructure/unit-test/utilities/constants_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/utilities/cross_product_mod_test.pf b/infrastructure/unit-test/utilities/cross_product_mod_test.pf index b803bef61..1d94ccce5 100644 --- a/infrastructure/unit-test/utilities/cross_product_mod_test.pf +++ b/infrastructure/unit-test/utilities/cross_product_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/infrastructure/unit-test/utilities/linked_list_mod_test.pf b/infrastructure/unit-test/utilities/linked_list_mod_test.pf index a106a5f68..db8a058b8 100644 --- a/infrastructure/unit-test/utilities/linked_list_mod_test.pf +++ b/infrastructure/unit-test/utilities/linked_list_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- diff --git a/infrastructure/unit-test/utilities/matrix_invert_mod_test.pf b/infrastructure/unit-test/utilities/matrix_invert_mod_test.pf index f2f2a05cc..6434e225a 100644 --- a/infrastructure/unit-test/utilities/matrix_invert_mod_test.pf +++ b/infrastructure/unit-test/utilities/matrix_invert_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- ! diff --git a/mesh_tools/source/cubedsphere_mesh_generator.f90 b/mesh_tools/source/cubedsphere_mesh_generator.f90 index 564e6d0ff..d67c2d32c 100644 --- a/mesh_tools/source/cubedsphere_mesh_generator.f90 +++ b/mesh_tools/source/cubedsphere_mesh_generator.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @mainpage Cubedsphere mesh generator diff --git a/mesh_tools/source/planar_mesh_generator.f90 b/mesh_tools/source/planar_mesh_generator.f90 index c4d172030..93e6a16b8 100644 --- a/mesh_tools/source/planar_mesh_generator.f90 +++ b/mesh_tools/source/planar_mesh_generator.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @mainpage Planar mesh generator diff --git a/mesh_tools/source/summarise_ugrid.f90 b/mesh_tools/source/summarise_ugrid.f90 index dc37696f6..fc2a0f1ee 100644 --- a/mesh_tools/source/summarise_ugrid.f90 +++ b/mesh_tools/source/summarise_ugrid.f90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @mainpage Summarise UGRID diff --git a/mesh_tools/source/support/gen_planar_mod.F90 b/mesh_tools/source/support/gen_planar_mod.F90 index ea247820a..7811a2b09 100644 --- a/mesh_tools/source/support/gen_planar_mod.F90 +++ b/mesh_tools/source/support/gen_planar_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Module to define the gen_planar_type diff --git a/mesh_tools/source/support/gencube_ps_mod.F90 b/mesh_tools/source/support/gencube_ps_mod.F90 index cc21cdb16..b1bb088f1 100644 --- a/mesh_tools/source/support/gencube_ps_mod.F90 +++ b/mesh_tools/source/support/gencube_ps_mod.F90 @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Module to define the gencube_ps_type, a subclass of the diff --git a/mesh_tools/unit-test/gen_planar_mod_test_cartesian.pf b/mesh_tools/unit-test/gen_planar_mod_test_cartesian.pf index e48401f85..c5bf01509 100644 --- a/mesh_tools/unit-test/gen_planar_mod_test_cartesian.pf +++ b/mesh_tools/unit-test/gen_planar_mod_test_cartesian.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Tests for mesh_tools/source/support/gen_planar_mod.F90 diff --git a/mesh_tools/unit-test/gen_planar_mod_test_spherical.pf b/mesh_tools/unit-test/gen_planar_mod_test_spherical.pf index 0119c8820..94b2c99ff 100644 --- a/mesh_tools/unit-test/gen_planar_mod_test_spherical.pf +++ b/mesh_tools/unit-test/gen_planar_mod_test_spherical.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- !> @brief Tests for mesh_tools/source/support/gen_planar_mod.F90 diff --git a/mesh_tools/unit-test/gencube_ps_mod_test.pf b/mesh_tools/unit-test/gencube_ps_mod_test.pf index e63bcde2b..fc588983f 100644 --- a/mesh_tools/unit-test/gencube_ps_mod_test.pf +++ b/mesh_tools/unit-test/gencube_ps_mod_test.pf @@ -1,6 +1,6 @@ !----------------------------------------------------------------------------- ! Copyright (c) 2017, Met Office, on behalf of HMSO and Queen's Printer -! For further details please refer to the file LICENCE.original which you +! For further details please refer to the file LICENCE which you ! should have received as part of this distribution. !----------------------------------------------------------------------------- module gencube_ps_mod_test From 65f53e7b678ee96007c2802fc667a3734ed400c8 Mon Sep 17 00:00:00 2001 From: James Bruten <109733895+james-bruten-mo@users.noreply.github.com> Date: Thu, 4 Dec 2025 16:56:29 +0000 Subject: [PATCH 5/8] update dependency (#169) --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index f1f4d4668..1b318dac9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -22,5 +22,5 @@ lfric_core: ref: SimSys_Scripts: - source: git@github.com:james-bruten-mo/SimSys_Scripts.git + source: git@github.com:MetOffice/SimSys_Scripts.git ref: main From 19f693d2a076c44c4008ca088a5bc3c8dd3fb4f3 Mon Sep 17 00:00:00 2001 From: Jenny Hickson <61183013+jennyhickson@users.noreply.github.com> Date: Sat, 6 Dec 2025 09:33:31 +0000 Subject: [PATCH 6/8] Fix climate runs performance issue. (#170) --- components/lfric-xios/source/lfric_xios_file_mod.f90 | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/lfric-xios/source/lfric_xios_file_mod.f90 b/components/lfric-xios/source/lfric_xios_file_mod.f90 index eb1fdcf66..cc1e9a820 100644 --- a/components/lfric-xios/source/lfric_xios_file_mod.f90 +++ b/components/lfric-xios/source/lfric_xios_file_mod.f90 @@ -390,8 +390,6 @@ subroutine register_with_context(self) if (.not. self%freq_ts == undef_freq) then self%frequency = self%freq_ts * timestep_duration call xios_set_attr( self%handle, output_freq=self%frequency ) - else - call xios_set_attr( self%handle, output_freq=timestep_duration ) end if ! Set the date of the first operation From 8756453519c64c1e8e247f2f05b726f42bc10d7d Mon Sep 17 00:00:00 2001 From: James Bruten <109733895+james-bruten-mo@users.noreply.github.com> Date: Tue, 9 Dec 2025 15:48:40 +0000 Subject: [PATCH 7/8] Add cla files (#172) --- .github/workflows/cla-check.yaml | 10 +++++++++ CONTRIBUTORS.md | 5 +++++ README.md | 35 ++++++++++++++++++++++++++++++++ ReadMe | 34 ------------------------------- 4 files changed, 50 insertions(+), 34 deletions(-) create mode 100644 .github/workflows/cla-check.yaml create mode 100644 CONTRIBUTORS.md delete mode 100644 ReadMe diff --git a/.github/workflows/cla-check.yaml b/.github/workflows/cla-check.yaml new file mode 100644 index 000000000..3d28d7311 --- /dev/null +++ b/.github/workflows/cla-check.yaml @@ -0,0 +1,10 @@ +name: Legal + +on: + pull_request_target: + +jobs: + cla: + uses: MetOffice/growss/.github/workflows/cla-check.yaml@main + with: + runner: 'ubuntu-24.04' diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 000000000..c34eb45d7 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,5 @@ +# Contributors + +| GitHub user | Real Name | Affiliation | Date | +| ----------- | --------- | ----------- | ---- | +| james-bruten-mo | James Bruten | Met Office | 2025-12-09 | diff --git a/README.md b/README.md index 748c1ded8..52a4c4949 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,38 @@ contains all the required packages to build the documentation. To build use options available. Additionally, `make deploy` will build a copy of the documentation and deploy it to a directory in `$(HOME)/public_html` named after the git branch. + +## Contributing Guidelines + +Welcome! + +The following links are here to help set clear expectations for everyone +contributing to this project. By working together under a shared understanding, +we can continuously improve the project while creating a friendly, inclusive +space for all contributors. + +### Contributors Licence Agreement + +Please see the +[Momentum Contributors Licence Agreement](https://github.com/MetOffice/Momentum/blob/main/CLA.md) + +Agreement of the CLA can be shown by adding yourself to the CONTRIBUTORS file +alongside this one, and is a requirement for contributing to this project. + +### Code of Conduct + +Please be aware of and follow the +[Momentum Code of Coduct](https://github.com/MetOffice/Momentum/blob/main/docs/CODE_OF_CONDUCT.md) + +### Working Practices + +This project is managed as part of the Simulation Systems group of repositories. + +Please follow the Simulation Systems +[Working Practices.](https://metoffice.github.io/simulation-systems/index.html) + +Questions are encouraged in the Simulation Systems +[Discussions.](https://github.com/MetOffice/simulation-systems/discussions) + +Please be aware of and follow the Simulation Systems +[AI Policy.](https://metoffice.github.io/simulation-systems/FurtherDetails/ai.html) diff --git a/ReadMe b/ReadMe deleted file mode 100644 index b91ea8c63..000000000 --- a/ReadMe +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################# -# (c) Crown copyright 2019 Met Office. All rights reserved. # -# # -# # -# Redistribution and use in source and binary forms, with or without # -# modification, are permitted provided that the following conditions are met: # -# # -# 1. Redistributions of source code must retain the above copyright notice, # -# this list of conditions and the following disclaimer. # -# 2. Redistributions in binary form must reproduce the above copyright notice, # -# this list of conditions and the following disclaimer in the documentation # -# and/or other materials provided with the distribution. # -# 3. Neither the name of the copyright holder nor the names of its contributors # -# may be used to endorse or promote products derived from this software # -# without specific prior written permission. # -# # -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE # -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR # -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF # -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS # -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN # -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # -# POSSIBILITY OF SUCH DAMAGE. # -################################################################################# - -Welcome to LFRic - -For a quick-start guide visit: - https://code.metoffice.gov.uk/trac/lfric/wiki/LFRicTechnical/GettingGoing - From 12b14c5d5f0fb63eb8ae293a7013003e6ebf1aa1 Mon Sep 17 00:00:00 2001 From: Jenny Hickson <61183013+jennyhickson@users.noreply.github.com> Date: Wed, 10 Dec 2025 13:05:27 +0000 Subject: [PATCH 8/8] Pre release vn3.0 (#174) Co-authored-by: James Bruten --- CONTRIBUTORS.md | 1 + .../rose-meta/lfric-coupled/version22_30.py | 71 ++ .../rose-meta/lfric-coupled/versions.py | 31 +- .../lfric-coupled/vn3.0/rose-meta.conf | 1 + .../rose-meta/lfric-io_demo/version22_30.py | 71 ++ .../rose-meta/lfric-io_demo/versions.py | 31 +- .../lfric-io_demo/vn3.0/rose-meta.conf | 29 + .../rose-meta/lfric-lbc_demo/version22_30.py | 52 + .../rose-meta/lfric-lbc_demo/versions.py | 19 +- .../lfric-lbc_demo/vn3.0/rose-meta.conf | 42 + .../lfric-simple_diffusion/version22_30.py | 71 ++ .../lfric-simple_diffusion/versions.py | 31 +- .../vn3.0/rose-meta.conf | 1 + .../rose-meta/lfric-skeleton/version22_30.py | 71 ++ .../rose-meta/lfric-skeleton/versions.py | 31 +- .../lfric-skeleton/vn3.0/rose-meta.conf | 1 + .../rose-meta/lfric-coupling/version22_30.py | 71 ++ .../rose-meta/lfric-coupling/versions.py | 31 +- .../lfric-coupling/vn3.0/rose-meta.conf | 1 + .../rose-meta/lfric-driver/version22_30.py | 69 ++ .../driver/rose-meta/lfric-driver/versions.py | 33 +- .../lfric-driver/vn3.0/rose-meta.conf | 904 ++++++++++++++++++ .../rose-meta/lfric-inventory/version22_30.py | 71 ++ .../rose-meta/lfric-inventory/versions.py | 31 +- .../lfric-inventory/vn3.0/rose-meta.conf | 1 + .../rose-meta/lfric-xios/version22_30.py | 71 ++ .../rose-meta/lfric-xios/versions.py | 31 +- .../rose-meta/lfric-xios/vn3.0/rose-meta.conf | 1 + .../rose-meta/lfric-science/version22_30.py | 71 ++ .../rose-meta/lfric-science/versions.py | 31 +- .../lfric-science/vn3.0/rose-meta.conf | 1 + dependencies.yaml | 2 +- .../lfric-mesh_tools/version22_30.py | 42 + .../rose-meta/lfric-mesh_tools/versions.py | 2 +- .../lfric-mesh_tools/vn3.0/rose-meta.conf | 630 ++++++++++++ rose-stem/app/coupled/rose-app.conf | 2 +- rose-stem/app/io_demo/rose-app.conf | 2 +- rose-stem/app/mesh/opt/rose-app-lbc.conf | 12 - rose-stem/app/mesh/opt/rose-app-lbc_1x1P.conf | 14 - rose-stem/app/mesh/opt/rose-app-lbc_2x2P.conf | 12 - rose-stem/app/mesh/opt/rose-app-lbc_8x2P.conf | 12 - rose-stem/app/mesh/rose-app.conf | 2 +- rose-stem/app/mesh_tools/rose-app.conf | 2 +- rose-stem/app/simple_diffusion/rose-app.conf | 2 +- rose-stem/app/skeleton/rose-app.conf | 2 +- 45 files changed, 2369 insertions(+), 341 deletions(-) create mode 100644 applications/coupled/rose-meta/lfric-coupled/version22_30.py create mode 100644 applications/coupled/rose-meta/lfric-coupled/vn3.0/rose-meta.conf create mode 100644 applications/io_demo/rose-meta/lfric-io_demo/version22_30.py create mode 100644 applications/io_demo/rose-meta/lfric-io_demo/vn3.0/rose-meta.conf create mode 100644 applications/lbc_demo/rose-meta/lfric-lbc_demo/version22_30.py create mode 100644 applications/lbc_demo/rose-meta/lfric-lbc_demo/vn3.0/rose-meta.conf create mode 100644 applications/simple_diffusion/rose-meta/lfric-simple_diffusion/version22_30.py create mode 100644 applications/simple_diffusion/rose-meta/lfric-simple_diffusion/vn3.0/rose-meta.conf create mode 100644 applications/skeleton/rose-meta/lfric-skeleton/version22_30.py create mode 100644 applications/skeleton/rose-meta/lfric-skeleton/vn3.0/rose-meta.conf create mode 100644 components/coupling/rose-meta/lfric-coupling/version22_30.py create mode 100644 components/coupling/rose-meta/lfric-coupling/vn3.0/rose-meta.conf create mode 100644 components/driver/rose-meta/lfric-driver/version22_30.py create mode 100644 components/driver/rose-meta/lfric-driver/vn3.0/rose-meta.conf create mode 100644 components/inventory/rose-meta/lfric-inventory/version22_30.py create mode 100644 components/inventory/rose-meta/lfric-inventory/vn3.0/rose-meta.conf create mode 100644 components/lfric-xios/rose-meta/lfric-xios/version22_30.py create mode 100644 components/lfric-xios/rose-meta/lfric-xios/vn3.0/rose-meta.conf create mode 100644 components/science/rose-meta/lfric-science/version22_30.py create mode 100644 components/science/rose-meta/lfric-science/vn3.0/rose-meta.conf create mode 100644 mesh_tools/rose-meta/lfric-mesh_tools/version22_30.py create mode 100644 mesh_tools/rose-meta/lfric-mesh_tools/vn3.0/rose-meta.conf diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c34eb45d7..d0f7ae14d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -3,3 +3,4 @@ | GitHub user | Real Name | Affiliation | Date | | ----------- | --------- | ----------- | ---- | | james-bruten-mo | James Bruten | Met Office | 2025-12-09 | +| jennyhickson | Jenny Hickson | Met Office | 2025-12-10 | diff --git a/applications/coupled/rose-meta/lfric-coupled/version22_30.py b/applications/coupled/rose-meta/lfric-coupled/version22_30.py new file mode 100644 index 000000000..d4807a523 --- /dev/null +++ b/applications/coupled/rose-meta/lfric-coupled/version22_30.py @@ -0,0 +1,71 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t4661(MacroUpgrade): + """Upgrade macro for ticket #4661 by Denis Sergeev.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4661" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") + return config, self.reports + + +class vn22_t4020(MacroUpgrade): + """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" + + BEFORE_TAG = "vn2.2_t4661" + AFTER_TAG = "vn2.2_t4020" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting( + config, ["namelist:io", "end_of_run_checkpoint"], ".true." + ) + self.add_setting(config, ["namelist:io", "checkpoint_times"], "") + return config, self.reports + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2_t4020" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + # Blank Upgrade Macro + # Commands From: rose-meta/lfric-coupled + # Blank Upgrade Macro + return config, self.reports diff --git a/applications/coupled/rose-meta/lfric-coupled/versions.py b/applications/coupled/rose-meta/lfric-coupled/versions.py index bcbbe2d70..152c043d0 100644 --- a/applications/coupled/rose-meta/lfric-coupled/versions.py +++ b/applications/coupled/rose-meta/lfric-coupled/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): @@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - - -class vn22_t4661(MacroUpgrade): - """Upgrade macro for ticket #4661 by Denis Sergeev.""" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4661" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") - - return config, self.reports - - -class vn22_t4020(MacroUpgrade): - """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" - - BEFORE_TAG = "vn2.2_t4661" - AFTER_TAG = "vn2.2_t4020" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting( - config, ["namelist:io", "end_of_run_checkpoint"], ".true." - ) - self.add_setting(config, ["namelist:io", "checkpoint_times"], "") - - return config, self.reports diff --git a/applications/coupled/rose-meta/lfric-coupled/vn3.0/rose-meta.conf b/applications/coupled/rose-meta/lfric-coupled/vn3.0/rose-meta.conf new file mode 100644 index 000000000..b0971a3cd --- /dev/null +++ b/applications/coupled/rose-meta/lfric-coupled/vn3.0/rose-meta.conf @@ -0,0 +1 @@ +import=lfric-driver/vn3.0 diff --git a/applications/io_demo/rose-meta/lfric-io_demo/version22_30.py b/applications/io_demo/rose-meta/lfric-io_demo/version22_30.py new file mode 100644 index 000000000..0ba077abe --- /dev/null +++ b/applications/io_demo/rose-meta/lfric-io_demo/version22_30.py @@ -0,0 +1,71 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t4661(MacroUpgrade): + """Upgrade macro for ticket #4661 by Denis Sergeev.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4661" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") + return config, self.reports + + +class vn22_t4020(MacroUpgrade): + """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" + + BEFORE_TAG = "vn2.2_t4661" + AFTER_TAG = "vn2.2_t4020" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting( + config, ["namelist:io", "end_of_run_checkpoint"], ".true." + ) + self.add_setting(config, ["namelist:io", "checkpoint_times"], "") + return config, self.reports + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2_t4020" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + # Blank Upgrade Macro + # Commands From: rose-meta/lfric-io_demo + # Blank Upgrade Macro + return config, self.reports diff --git a/applications/io_demo/rose-meta/lfric-io_demo/versions.py b/applications/io_demo/rose-meta/lfric-io_demo/versions.py index bcbbe2d70..152c043d0 100644 --- a/applications/io_demo/rose-meta/lfric-io_demo/versions.py +++ b/applications/io_demo/rose-meta/lfric-io_demo/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): @@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - - -class vn22_t4661(MacroUpgrade): - """Upgrade macro for ticket #4661 by Denis Sergeev.""" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4661" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") - - return config, self.reports - - -class vn22_t4020(MacroUpgrade): - """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" - - BEFORE_TAG = "vn2.2_t4661" - AFTER_TAG = "vn2.2_t4020" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting( - config, ["namelist:io", "end_of_run_checkpoint"], ".true." - ) - self.add_setting(config, ["namelist:io", "checkpoint_times"], "") - - return config, self.reports diff --git a/applications/io_demo/rose-meta/lfric-io_demo/vn3.0/rose-meta.conf b/applications/io_demo/rose-meta/lfric-io_demo/vn3.0/rose-meta.conf new file mode 100644 index 000000000..2f47d84e7 --- /dev/null +++ b/applications/io_demo/rose-meta/lfric-io_demo/vn3.0/rose-meta.conf @@ -0,0 +1,29 @@ +import=lfric-driver/vn3.0 + +[namelist:io=multifile_io] +compulsory=true +description=Use multifile_io functionality +help=This is used to turn the multifile_io functionality in the io_demo app + =on and off +!kind=default +type=logical + +[namelist:multifile_io] +compulsory=false +duplicate=true +!instance_key_member=filename + +[namelist:multifile_io=filename] +compulsory=true +!kind=default +type=character + +[namelist:multifile_io=start_timestep] +compulsory=true +!kind=default +type=integer + +[namelist:multifile_io=stop_timestep] +compulsory=true +!kind=default +type=integer diff --git a/applications/lbc_demo/rose-meta/lfric-lbc_demo/version22_30.py b/applications/lbc_demo/rose-meta/lfric-lbc_demo/version22_30.py new file mode 100644 index 000000000..c2098bef6 --- /dev/null +++ b/applications/lbc_demo/rose-meta/lfric-lbc_demo/version22_30.py @@ -0,0 +1,52 @@ +import sys +from metomi.rose.upgrade import MacroUpgrade + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + +""" +Copy this template and complete to add your macro + +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + +class vn22_t4231(MacroUpgrade): + # Upgrade macro for #4231 by Ricky Wong + # Ticket #4231 adds a new application, "lbc_demo" + # This ugrade macro does nothing but set the + # appropriate "After_tag" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4231" + + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t34(MacroUpgrade): + # Upgrade macro for 34 by jennifer hickson + + BEFORE_TAG = "vn2.2_t4231" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + return config, self.reports diff --git a/applications/lbc_demo/rose-meta/lfric-lbc_demo/versions.py b/applications/lbc_demo/rose-meta/lfric-lbc_demo/versions.py index c7e69bb2f..152c043d0 100644 --- a/applications/lbc_demo/rose-meta/lfric-lbc_demo/versions.py +++ b/applications/lbc_demo/rose-meta/lfric-lbc_demo/versions.py @@ -1,6 +1,10 @@ import sys + from metomi.rose.upgrade import MacroUpgrade +from .version22_30 import * + + class UpgradeError(Exception): """Exception created when an upgrade fails.""" @@ -13,6 +17,7 @@ def __repr__(self): __str__ = __repr__ + """ Copy this template and complete to add your macro @@ -26,17 +31,3 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - -class vn22_t4231(MacroUpgrade): - # Upgrade macro for #4231 by Ricky Wong - # Ticket #4231 adds a new application, "lbc_demo" - # This ugrade macro does nothing but set the - # appropriate "After_tag" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4231" - - def upgrade(self, config, meta_config=None): - # Add settings - return config, self.reports -""" diff --git a/applications/lbc_demo/rose-meta/lfric-lbc_demo/vn3.0/rose-meta.conf b/applications/lbc_demo/rose-meta/lfric-lbc_demo/vn3.0/rose-meta.conf new file mode 100644 index 000000000..55539d6c0 --- /dev/null +++ b/applications/lbc_demo/rose-meta/lfric-lbc_demo/vn3.0/rose-meta.conf @@ -0,0 +1,42 @@ +import=lfric-driver/vn3.0 + +[namelist:lbc_demo] +compulsory=true + +[namelist:lbc_demo=apply_lbc] +compulsory=true +!kind=default +type=logical + +[namelist:lbc_demo=enable_lbc] +compulsory=true +!kind=default +type=logical + +[namelist:lbc_demo=field_type] +compulsory=true +!enumeration=true +value-titles='Real','Integer' +values='real','integer' + +[namelist:lbc_demo=lbc_source] +compulsory=true +!enumeration=true +value-titles='File','Analytic' +values='file','analytic' + +[namelist:lbc_demo=read_lbc] +compulsory=true +!kind=default +type=logical + +[namelist:lbc_demo=set_lbc] +compulsory=true +!enumeration=true +value-titles='Constant','Quadrant' +values='constant','quadrant' + +[namelist:lbc_demo=write_lbc] +compulsory=true +!kind=default +type=logical diff --git a/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/version22_30.py b/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/version22_30.py new file mode 100644 index 000000000..5f95e3da8 --- /dev/null +++ b/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/version22_30.py @@ -0,0 +1,71 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t4661(MacroUpgrade): + """Upgrade macro for ticket #4661 by Denis Sergeev.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4661" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") + return config, self.reports + + +class vn22_t4020(MacroUpgrade): + """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" + + BEFORE_TAG = "vn2.2_t4661" + AFTER_TAG = "vn2.2_t4020" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting( + config, ["namelist:io", "end_of_run_checkpoint"], ".true." + ) + self.add_setting(config, ["namelist:io", "checkpoint_times"], "") + return config, self.reports + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2_t4020" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + # Blank Upgrade Macro + # Commands From: rose-meta/lfric-simple_diffusion + # Blank Upgrade Macro + return config, self.reports diff --git a/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/versions.py b/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/versions.py index bcbbe2d70..152c043d0 100644 --- a/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/versions.py +++ b/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): @@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - - -class vn22_t4661(MacroUpgrade): - """Upgrade macro for ticket #4661 by Denis Sergeev.""" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4661" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") - - return config, self.reports - - -class vn22_t4020(MacroUpgrade): - """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" - - BEFORE_TAG = "vn2.2_t4661" - AFTER_TAG = "vn2.2_t4020" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting( - config, ["namelist:io", "end_of_run_checkpoint"], ".true." - ) - self.add_setting(config, ["namelist:io", "checkpoint_times"], "") - - return config, self.reports diff --git a/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/vn3.0/rose-meta.conf b/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/vn3.0/rose-meta.conf new file mode 100644 index 000000000..b0971a3cd --- /dev/null +++ b/applications/simple_diffusion/rose-meta/lfric-simple_diffusion/vn3.0/rose-meta.conf @@ -0,0 +1 @@ +import=lfric-driver/vn3.0 diff --git a/applications/skeleton/rose-meta/lfric-skeleton/version22_30.py b/applications/skeleton/rose-meta/lfric-skeleton/version22_30.py new file mode 100644 index 000000000..f435f036a --- /dev/null +++ b/applications/skeleton/rose-meta/lfric-skeleton/version22_30.py @@ -0,0 +1,71 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t4661(MacroUpgrade): + """Upgrade macro for ticket #4661 by Denis Sergeev.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4661" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") + return config, self.reports + + +class vn22_t4020(MacroUpgrade): + """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" + + BEFORE_TAG = "vn2.2_t4661" + AFTER_TAG = "vn2.2_t4020" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting( + config, ["namelist:io", "end_of_run_checkpoint"], ".true." + ) + self.add_setting(config, ["namelist:io", "checkpoint_times"], "") + return config, self.reports + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2_t4020" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + # Blank Upgrade Macro + # Commands From: rose-meta/lfric-skeleton + # Blank Upgrade Macro + return config, self.reports diff --git a/applications/skeleton/rose-meta/lfric-skeleton/versions.py b/applications/skeleton/rose-meta/lfric-skeleton/versions.py index bcbbe2d70..152c043d0 100644 --- a/applications/skeleton/rose-meta/lfric-skeleton/versions.py +++ b/applications/skeleton/rose-meta/lfric-skeleton/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): @@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - - -class vn22_t4661(MacroUpgrade): - """Upgrade macro for ticket #4661 by Denis Sergeev.""" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4661" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") - - return config, self.reports - - -class vn22_t4020(MacroUpgrade): - """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" - - BEFORE_TAG = "vn2.2_t4661" - AFTER_TAG = "vn2.2_t4020" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting( - config, ["namelist:io", "end_of_run_checkpoint"], ".true." - ) - self.add_setting(config, ["namelist:io", "checkpoint_times"], "") - - return config, self.reports diff --git a/applications/skeleton/rose-meta/lfric-skeleton/vn3.0/rose-meta.conf b/applications/skeleton/rose-meta/lfric-skeleton/vn3.0/rose-meta.conf new file mode 100644 index 000000000..b0971a3cd --- /dev/null +++ b/applications/skeleton/rose-meta/lfric-skeleton/vn3.0/rose-meta.conf @@ -0,0 +1 @@ +import=lfric-driver/vn3.0 diff --git a/components/coupling/rose-meta/lfric-coupling/version22_30.py b/components/coupling/rose-meta/lfric-coupling/version22_30.py new file mode 100644 index 000000000..7147f79fe --- /dev/null +++ b/components/coupling/rose-meta/lfric-coupling/version22_30.py @@ -0,0 +1,71 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t4661(MacroUpgrade): + """Upgrade macro for ticket #4661 by Denis Sergeev.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4661" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") + return config, self.reports + + +class vn22_t4020(MacroUpgrade): + """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" + + BEFORE_TAG = "vn2.2_t4661" + AFTER_TAG = "vn2.2_t4020" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting( + config, ["namelist:io", "end_of_run_checkpoint"], ".true." + ) + self.add_setting(config, ["namelist:io", "checkpoint_times"], "") + return config, self.reports + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2_t4020" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + # Blank Upgrade Macro + # Commands From: rose-meta/lfric-coupling + # Blank Upgrade Macro + return config, self.reports diff --git a/components/coupling/rose-meta/lfric-coupling/versions.py b/components/coupling/rose-meta/lfric-coupling/versions.py index bcbbe2d70..152c043d0 100644 --- a/components/coupling/rose-meta/lfric-coupling/versions.py +++ b/components/coupling/rose-meta/lfric-coupling/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): @@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - - -class vn22_t4661(MacroUpgrade): - """Upgrade macro for ticket #4661 by Denis Sergeev.""" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4661" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") - - return config, self.reports - - -class vn22_t4020(MacroUpgrade): - """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" - - BEFORE_TAG = "vn2.2_t4661" - AFTER_TAG = "vn2.2_t4020" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting( - config, ["namelist:io", "end_of_run_checkpoint"], ".true." - ) - self.add_setting(config, ["namelist:io", "checkpoint_times"], "") - - return config, self.reports diff --git a/components/coupling/rose-meta/lfric-coupling/vn3.0/rose-meta.conf b/components/coupling/rose-meta/lfric-coupling/vn3.0/rose-meta.conf new file mode 100644 index 000000000..b0971a3cd --- /dev/null +++ b/components/coupling/rose-meta/lfric-coupling/vn3.0/rose-meta.conf @@ -0,0 +1 @@ +import=lfric-driver/vn3.0 diff --git a/components/driver/rose-meta/lfric-driver/version22_30.py b/components/driver/rose-meta/lfric-driver/version22_30.py new file mode 100644 index 000000000..d22be26db --- /dev/null +++ b/components/driver/rose-meta/lfric-driver/version22_30.py @@ -0,0 +1,69 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t4661(MacroUpgrade): + """Upgrade macro for ticket #4661 by Denis Sergeev.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4661" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") + return config, self.reports + + +class vn22_t4020(MacroUpgrade): + """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" + + BEFORE_TAG = "vn2.2_t4661" + AFTER_TAG = "vn2.2_t4020" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting( + config, ["namelist:io", "end_of_run_checkpoint"], ".true." + ) + self.add_setting(config, ["namelist:io", "checkpoint_times"], "") + return config, self.reports + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2_t4020" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + # Blank Upgrade Macro + return config, self.reports diff --git a/components/driver/rose-meta/lfric-driver/versions.py b/components/driver/rose-meta/lfric-driver/versions.py index 3c3ca119c..152c043d0 100644 --- a/components/driver/rose-meta/lfric-driver/versions.py +++ b/components/driver/rose-meta/lfric-driver/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): @@ -20,39 +20,14 @@ def __repr__(self): """ Copy this template and complete to add your macro + class vnXX_txxx(MacroUpgrade): # Upgrade macro for by + BEFORE_TAG = "vnX.X" AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - - -class vn22_t4661(MacroUpgrade): - """Upgrade macro for ticket #4661 by Denis Sergeev.""" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4661" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") - return config, self.reports - - -class vn22_t4020(MacroUpgrade): - """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" - - BEFORE_TAG = "vn2.2_t4661" - AFTER_TAG = "vn2.2_t4020" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting( - config, ["namelist:io", "end_of_run_checkpoint"], ".true." - ) - self.add_setting(config, ["namelist:io", "checkpoint_times"], "") - - return config, self.reports diff --git a/components/driver/rose-meta/lfric-driver/vn3.0/rose-meta.conf b/components/driver/rose-meta/lfric-driver/vn3.0/rose-meta.conf new file mode 100644 index 000000000..980ecd18b --- /dev/null +++ b/components/driver/rose-meta/lfric-driver/vn3.0/rose-meta.conf @@ -0,0 +1,904 @@ +#============================================================================== +# SYSTEM SETTINGS +#============================================================================== + +[Submission] +ns=namelist/Job/Submission +sort-key=Section-001 + +#============================================================================== +# ENVIRONMENT VARIABLES AVAILABLE TO ROSE TASK +#============================================================================== +[env] +compulsory=true + +[env=EXEC_NAME] +compulsory=true +description=Program executable name +sort-key=Panel-A01 +type=raw + +[env=OMP_NUM_THREADS] +compulsory=true +description=Number of threads for OpenMP +fail-if=this < 1 ; +range=1: +sort-key=Panel-A03 +type=integer + +[env=TOTAL_RANKS] +compulsory=true +description=Number of process ranks for a parallel run job +fail-if=this < 1 ; +range=1: +sort-key=Panel-A02 +type=integer + +[env=XIOS_SERVER_MODE] +compulsory=true +description=Run with XIOS in server mode +sort-key=Panel-A04 +type=python_boolean + +[env=XIOS_SERVER_RANKS] +compulsory=true +description=XIOS server process ranks +fail-if=this < 1 ; +range=1: +sort-key=Panel-A05 +type=integer + +#============================================================================== +# PRIMARY GLOBAL MESH +#============================================================================== +[namelist:base_mesh] +compulsory=true +description=Provides information to define the LFRic infrastructure principle mesh. +help=Lfric must use at least one mesh (prime) to run. + =This panel specifies details of the mesh and its + =configuration. +ns=namelist/Model/Mesh +sort-key=Section-A02 +title=Mesh + +[!namelist:base_mesh=f_lat] +compulsory=false +description=Latitude for F-plane + =approximation [rad]. +expression=namelist:base_mesh=f_lat_deg * source:constants_mod=PI / 180.0_r_def +help=Pre-set latitude for F-plane approximation [Radians]. The F-plane approximation + =is use to calculate the Coriolis operator, where the Coriolis parameter, f, is + =assumed to be invariant with latitude. + = +!kind=default +type=real + +[namelist:base_mesh=f_lat_deg] +compulsory=true +description=?????? +fail-if=this < -90.0 ; + =this > 90.0 ; +help=?????? + =?????? +!kind=default +range=-90.0:90.0 +sort-key=Panel-A06 +type=real + +[namelist:base_mesh=file_prefix] +compulsory=true +description=Location of 2D mesh input file(s) (prefix). +help=Input files for 2D meshes are in NetCDF file format. The mesh topologies in the file should + =be conformant to UGRID convention and must contain at least one mesh topology, the prime mesh. + = + =This variable is the file name (or path) prefix the mesh input file(s). If the meshes have + =been prepartitioned (namelist:base_mesh=prepartitioned = .true.) to match the intended + =distributed memory deployment of the application, each process rank of the run will load + =the mesh file given by: + = + = __.nc + = + =which will contain data to directly populate the required . Otherwise, a + = will be partitioned at runtime and the model will attempt to load: + = + = .nc + = + =Note: Should prepartitioned meshes be employed, the mesh input file(s) should have + = been created specifying the same number of partitions as ranks in the intended + = run. + = +sort-key=Panel-A01 +!string_length=filename +type=character +url=http://ugrid-conventions.github.io/ugrid-conventions + +[namelist:base_mesh=fplane] +compulsory=true +description=?????? +fail-if=this == true and namelist:base_mesh=geometry == "'spherical'" +help=Plane has constant f (omega) + =fplane can not be true when geometry = spherical +!kind=default +sort-key=Panel-A05 +type=logical + +[namelist:base_mesh=geometry] +compulsory=true +description=The geometry on which the domain is embedded +!enumeration=true +fail-if=this == "'spherical'" and namelist:base_mesh=topology == "'fully_periodic'" and namelist:partitioning=partitioner != "'cubedsphere'" and namelist:base_mesh=prepartitioned == ".false." ; + =this == "'planar'" and namelist:partitioning=partitioner != "'planar'" and namelist:base_mesh=prepartitioned == ".false." ; +help=Along with topology this describes the domain. The geometry is the shape + =on which the domain is embedded. This is currently either 'spherical' or + ='planar'. +sort-key=Panel-A03 +value-titles=Planar, Spherical +values='planar', 'spherical' + +[namelist:base_mesh=prepartitioned] +compulsory=true +description=Load pre-partitioned local meshes +help=Input mesh files may contain global meshes whose extents are intended to cover + =the entire model domain. These may require partitioning in to a number of local + =meshes (1 per processor rank) at runtime depending on the number of ranks + =requested to run the model. + = + =Prepartitioned meshes would be beneficial in cases were the number of ranks for + =the model run seldom change. + = + =If prepartitioned meshes are not used the model will expect global meshes + =in the mesh input file to be partitioned at model runtime. + = + =Note: With increasing mesh size, at some point prepartitioned meshes may become + = necessary. + = +sort-key=Panel-A04a +trigger=namelist:partitioning: .false. ; +type=logical + +[namelist:base_mesh=prime_mesh_name] +compulsory=true +description=Tag-name for prime-mesh +help=Mesh topologies are held in UGRID conformant NetCDF files. It is + =possible that the mesh files in this format may contain more than + =one mesh topology. This tag-name identifies the mesh topology to + =use from the mesh file namelist:base_mesh=filename. +sort-key=Panel-A02 +!string_length=default +type=character + +[namelist:base_mesh=topology] +compulsory=true +description=Describes the periodicity of the domain. +!enumeration=true +fail-if=this != "'fully_periodic'" and namelist:partitioning=partitioner == "'cubedsphere'" ; +help=Together with the geometry this describes the domain. The topology is the + =periodicity of the base mesh. A mesh over the whole globe would have + =spherical geometry and fully_periodic topology, while a regional model + =on the sphere would have spherical geometry and non_periodic topology. + =Note that to run a regional model in limited-area mode with lateral boundary + =conditions, namelist:boundaries=limited_area also needs to be set to "true". +sort-key=Panel-A07 +value-titles=Fully-periodic, Non-periodic +values='fully_periodic', 'non_periodic' + +#============================================================================== +# 2D MESH EXTRUSION +#============================================================================== +[namelist:extrusion] +compulsory=true +description=Settings for the selected vertical mesh extrusion method. +help=Settings for the uniform, quadratic, geometric and DCMIP mesh extrusion + =profiles to extrude 2D to 3D mesh using non-dimensional vertical coordinate. +ns=namelist/Model/Mesh/Extrusion +sort-key=Section-A03 + +[namelist:extrusion=domain_height] +compulsory=true +description=Height of domain above the surface [m] +fail-if=this < 0.0 ; +help=Height of the model domain above the surface. + =Surface is 0m for planar domains and planet_radius for spherical. +!kind=default +range=this > 0.0: +sort-key=Panel-A02 +type=real + +[namelist:extrusion=eta_values] +!bounds=namelist:extrusion=number_of_layers-1 +compulsory=true +description=Eta values, excluding 0 and 1 +help=Non-dimensional height values defining the model vertical levels. + =The length should be smaller by number_of_layers by one. + = + =The values must strictly be between 0 and 1: + =0 < eta_values < 1 + =because 0 and 1 are appended to the list automatically. +!kind=default +length=: +range=0.0:1.0 +sort-key=Panel-A04 +type=real + +[namelist:extrusion=method] +compulsory=true +description=Method for generating eta coordinate +!enumeration=true +fail-if=this == 'um_L38_29t_9s_40km' and namelist:extrusion=number_of_layers != 38 ; + =this == 'um_L70_50t_20s_80km' and namelist:extrusion=number_of_layers != 70 ; + =this == 'um_L85_50t_35s_85km' and namelist:extrusion=number_of_layers != 85 ; + =this == 'um_L70_61t_9s_40km' and namelist:extrusion=number_of_layers != 70 ; + =this == 'um_L120_99t_21s_40km' and namelist:extrusion=number_of_layers != 120 ; + =this == 'um_L140_122t_18s_40km' and namelist:extrusion=number_of_layers != 140 ; +help=Available extrusion methods are (\f$n$ is number of layers): + =0) Specified by user; + =1) Uniform eta spacing (\f$\frac{k}{n}\f$); + =2) Quadratic eta spacing (\f$\frac{k}{n}^2\f$); + =3) Geometric eta spacing (\f$d\eta = \frac{(s - 1)}{(s^{n} - 1)}$) + = with stretching factor prescribed (\f$s=1.03$); + =4) DCMIP eta spacing (Ullrich et al. (2012) DCMIP documentation, Appendix F.2.) + = with flattening parameter prescribed. + =5) L38 40km UM specific eta spacing; + =6) L70 80km UM specific eta spacing; + =7) L85 85km UM specific eta spacing; + =8) L70 40km UM specific eta spacing + =9) L120 40km UM specific eta spacing + =10) L140 40km UM specific eta spacing +sort-key=Panel-A01 +trigger=namelist:extrusion=eta_values: 'specified_values'; +value-titles=Specified by user, Uniform, Quadratic, Geometric, DCMIP, + = um_L38_29t_9s_40km, um_L70_50t_20s_80km, um_L85_50t_35s_85km, um_L70_61t_9s_40km, + = um_L120_99t_21s_40km, um_L140_122t_18s_40km +values='specified_values', 'uniform', 'quadratic', 'geometric', 'dcmip', + ='um_L38_29t_9s_40km', 'um_L70_50t_20s_80km', 'um_L85_50t_35s_85km', 'um_L70_61t_9s_40km', + ='um_L120_99t_21s_40km', 'um_L140_122t_18s_40km' + +[namelist:extrusion=number_of_layers] +compulsory=true +description=Number of layers in the vertical +fail-if=this < 1 ; +help=Setting for number of layers of 3D-mesh in vertical. +!kind=default +range=1: +sort-key=Panel-A03 +type=integer + +[namelist:extrusion=planet_radius] +compulsory=true +description=Radius of the planet surface [m] +fail-if=this <= 0.0 ; +help=Radius of domain bottom. Note: Orography not included. +!kind=default +range=this > 0.0: +sort-key=Panel-A02 +type=real + +[namelist:extrusion=stretching_height] +compulsory=false +description=Physical height above which surface altitude does not + = influence layer height +fail-if=this < 0.0 ; +help=Physical height above which surface altitude does not + =influence layer height. + =Note that in order to reproduce the vertical stretching used in + =the UM 'smooth' extrusion, this value should be set to + =the value of eta_rho corresponding to the UM level + =first_constant_r_rho_level and multiplied by domain_height. +!kind=default +range=0: +sort-key=Panel-A02 ;1 +type=real + +[namelist:extrusion=stretching_method] +compulsory=false +description=Method of generating stretching +!enumeration=true +help=Available stretching methods are: + =1) Linear (linear multiple of physical depth) + =2) Smooth (quadratic below stretching_height, linear above) +sort-key=Panel-A01 +trigger=namelist:extrusion=stretching_height: 'smooth' ; +value-titles=Linear, Smooth +values='linear', 'smooth' + +#============================================================================== +# FINITE ELEMENT +#============================================================================== +[namelist:finite_element] +compulsory=true +description=Settings to define the choice of finite elements used +help=Settings to define which finite elements create the function spaces used + =in the model +ns=namelist/Model/Finite element +sort-key=Section-A01 +title=Finite element + +[namelist:finite_element=cellshape] +compulsory=true +description=The base shape of the elements forming the 2d mesh before extrusion + =into prisms in 3d +!enumeration=true +fail-if=this != "'quadrilateral'" ; +help=Current infrastructure requires that the cellshape is 'quadrilateral' +sort-key=Panel-A01 +value-titles=Triangluar, Quadrilateral +values='triangle', 'quadrilateral' + +[namelist:finite_element=coord_order] +compulsory=true +description=Order of the coordinate space. +fail-if=this < 0 ; +help=Order of the coordinate space. If 0 is chosen, this will be the continuous + =W0 space, with the order set by the element order. This option is only + =possible for certain geometries and topologies. Otherwise, this will be + =a discontinuous space. +!kind=default +range=0: +sort-key=Panel-A03 +type=integer + +[namelist:finite_element=coord_system] +compulsory=true +description=The coordinate system that will be stored in the chi coordinate + =fields used for computations throughout the model. +!enumeration=true +fail-if= +help=Select 'xyz' to run the model in global Cartesian coordinates. + =Otherwise use 'native' to run with the coordinate system native to the + =mesh being used. For instance, this will use the (alpha,beta,height) + =system with cubed-sphere meshes and the (longitude,latitude,height) system + =with spherical limited-area models. For the (alpha,beta,height) and + =(longitude,latitude,height) systems, the third coordinate field is given by + =height = radius - planet radius +sort-key=Panel-A04 +value-titles='(X,Y,Z)', 'Native' +values='xyz', 'native' + +[namelist:finite_element=element_order_h] +compulsory=true +description=The polynomial order of the set of compatible finite element in the + =horizontal +fail-if=this < 0 ; +help=This is the polynomial order of the L2 (W3) space in the horizontal + =direction, and is used to set the polynomial order for other finite element + =spaces. In most cases is equal to element_order_v. +!kind=default +range=0:9 +sort-key=Panel-A02 +type=integer + +[namelist:finite_element=element_order_v] +compulsory=true +description=The polynomial order of the set of compatible finite element in the + =vertical +fail-if=this < 0 ; +help=This is the polynomial order of the L2 (W3) space in the vertical + =direction, and is used to set the polynomial order for other finite element + =spaces. In most cases is equal to element_order_h. +!kind=default +range=0:9 +sort-key=Panel-A02 +type=integer + +[!namelist:finite_element=nqp_h_exact] +compulsory=false +expression=namelist:finite_element=element_order_h+3 +help=Number of quadrature points needed to exactly integrate a product of test & + = trial functions with a linear Jacobian in the horizontal direction +!kind=default +sort-key=Panel-A05 +type=integer + +[!namelist:finite_element=nqp_v_exact] +compulsory=false +expression=namelist:finite_element=element_order_v+3 +help=Number of quadrature points needed to exactly integrate a product of test & + = trial functions with a linear Jacobian in the vertical direction +!kind=default +sort-key=Panel-A05 +type=integer + +[namelist:finite_element=rehabilitate] +compulsory=true +description=Option to switch on rehabilitation to modify the mapping for the W3 + =space. +help=Rehabilitation is the modification of mapping for + =the W3 space and the divergence mapping so that + =the correct order of accuracy is maintained on + =non-affine elements. For affine elements it is not + =required. This is included here as in the future + =we wish to move to not rehabilitating +!kind=default +sort-key=Panel-A06 +type=logical + +#============================================================================== +# IO +#============================================================================== +[namelist:io] +compulsory=true +description=Sets I/O options for diagnostic output, checkpointing and dumps +help=?????? +ns=namelist/Job/IO +sort-key=Section-A02 +title=I/O + +[namelist:io=checkpoint_read] +compulsory=true +description=Enable read of a checkpoint file +help=Read the checkpoint file specified by the checkpoint + =stem name (namelist:files=checkpoint_stem_name) + =and start timestep (namelist:time=timestep_start). +!kind=default +ns=namelist/Job/IO/Checkpointing & Restart +sort-key=Panel-A02 +type=logical + +[namelist:io=checkpoint_times] +compulsory=false +description=List of times to output a checkpoint file in seconds +fail-if=this < 1 ; +help=Checkpoint file write times in seconds, must be greater than zero. + =These must also be values corresponding to an integer number of timesteps. +!kind=second +length=: +ns=namelist/Job/IO/Checkpointing & Restart +sort-key=Panel-A04 +type=real + +[namelist:io=checkpoint_write] +compulsory=true +description=Enable write of a checkpoint file +help=Write checkpoint files specified by checkpoint + =stem name (namelist:files=checkpoint_stem_name) +!kind=default +ns=namelist/Job/IO/Checkpointing & Restart +sort-key=Panel-A03 +trigger=namelist:io=checkpoint_times: .true. ; + =namelist:io=end_of_run_checkpoint: .true. ; +type=logical + +[namelist:io=counter_output_suffix] +compulsory=true +description=Suffix appended to the file containing subroutine counter output for a subroutine +help=The output of the subroutine counters will be written to a file with this suffix. + =The default value is "counter.txt". +ns=namelist/Job/IO/System +sort-key=Panel-A04 +!string_length=filename +type=character + +[namelist:io=diagnostic_frequency] +compulsory=true +description=Frequency of diagnostic output [timesteps] +fail-if=this < 1 ; +help=Frequency of diagnostic output [timesteps] +!kind=medium +ns=namelist/Job/IO/Diagnostics +range=1: +sort-key=Panel-A03 +type=integer + +[namelist:io=end_of_run_checkpoint] +compulsory=true +description=Enable checkpointing on the last timestep of the run. +help=This will create a checkpoint file at the end of the run regardless of + =the values in the namelist:io=checkpoint_times list. If a value for the + =final step is also in the namelist:io=checkpoint_times list only a single + =checkpoint file will be created. +!kind=default +ns=namelist/Job/IO/Checkpointing & Restart +sort-key=Panel-A05 +type=logical + +[namelist:io=file_convention] +compulsory=true +description=Enumeration describing the convention of file to be output, either CF or UGRID. +!enumeration=true +help=UGRID: UGRID conventions should be used as default, but are larger files. + =CF: CF option allows for more lightweight output files but with no mesh information. +ns=namelist/Job/IO/File Format +sort-key=Panel-A00 +value-titles=UGRID, CF +values='UGRID','CF' + +[namelist:io=nodal_output_on_w3] +compulsory=true +description=Enable projection of fields to + =W3 for nodal diagnostic output +help=This option creates diagnostic output of fields on W3 in addition to their native function spaces. + =It only applies to the old nodal style ouput. i.e. if write_diag is .true. and use_xios_io is .false. +!kind=default +ns=namelist/Job/IO/Diagnostics +sort-key=Panel-A04 +type=logical + +[namelist:io=subroutine_counters] +compulsory=true +description=Enable output of subroutine counters +help=Writes out subroutine counters to test file +!kind=default +ns=namelist/Job/IO/System +sort-key=Panel-A03 +type=logical + +[namelist:io=subroutine_timers] +compulsory=true +description=Enable output of subroutine runtimes +help=Writes out subroutine run times to text file +!kind=default +ns=namelist/Job/IO/System +sort-key=Panel-A02 +type=logical + +[namelist:io=timer_output_path] +compulsory=true +description=Relative to the file containing the subroutine timer output +help=The output of the subroutine timers will be written to this file path (relative to the model + = working directory). The default value is "timer.txt" +ns=namelist/Job/IO/System +sort-key=Panel-A02 +!string_length=filename +type=character + +[namelist:io=use_xios_io] +compulsory=true +description=Use XIOS for all I/O + =(where there is a choice of methods) +help=Currently we still have some legacy I/O methods for diagnostic output + =and checkpointing. This option forces use of XIOS. +!kind=default +ns=namelist/Job/IO/Diagnostics +sort-key=Panel-A06 +trigger=namelist:io=nodal_output_on_w3: .false. ; + =env=XIOS_SERVER_MODE: .true. ; + =env=XIOS_SERVER_RANKS: .true. ; +type=logical + +[namelist:io=write_diag] +compulsory=true +description=Enable diagnostic output +help=Writes diagnostic output to file at the specified diagnostic frequency +!kind=default +ns=namelist/Job/IO/Diagnostics +sort-key=Panel-A01 +type=logical + +#============================================================================== +# SYSTEM LOGGING +#============================================================================== +[namelist:logging] +compulsory=true +ns=namelist/Job/IO/System + +[namelist:logging=log_to_rank_zero_only] +compulsory=true +description=Only log to a single rank, defined as rank zero +ns=namelist/Job/IO/System +sort-key=Panel-A02 +type=logical + +[namelist:logging=run_log_level] +compulsory=true +description=Logging level for run +!enumeration=true +help=Determines the severity of logging messages which are sent to standard + =output. Error levels are cumulative in severity: + = + = * Trace + = * Debugging + = * Information + = * Warning + = * Error + = + =e.g. Setting the log level to "Information" will mean log messages + =related to information,warnings and errors will be reported to + =standard output at runtime. + = +ns=namelist/Job/IO/System +sort-key=Panel-A01 +value-titles=Error, Warning, Information, Debugging, Trace +values='error','warning','info','debug','trace' + +#================= +# Multigrid Mesh = +#================= +#============================================================================== +# MULTIGRID +#============================================================================== +[namelist:multigrid] +compulsory=true +description=?????? +help=?????? + =?????? +ns=namelist/Science/Dynamics/multigrid +sort-key=Section-A06 +title=Multi-grid + +[namelist:multigrid=chain_mesh_tags] +!bounds=namelist:multigrid=multigrid_chain_nitems +compulsory=true +description=Meshes for function space chain. +fail-if=len(this) != namelist:multigrid=multigrid_chain_nitems ; +help=This is an ordered list of mesh names as loaded from the mesh + =input file. It is expected that the mesh input file will contain + =the correct intergrid maps betwen subsequent meshes in the chain. + = +length=: +sort-key=Panel-A04 +!string_length=default +type=character + +[namelist:multigrid=multigrid_chain_nitems] +compulsory=true +description=Number of items in multigrid function space chain +fail-if=this < 1 ; +help=?????? + =?????? +!kind=default +range=1: +sort-key=Panel-A02 +type=integer + +[namelist:multigrid=n_coarsesmooth] +compulsory=false +type=integer + +[namelist:multigrid=n_postsmooth] +compulsory=false +type=integer + +[namelist:multigrid=n_presmooth] +compulsory=false +type=integer + +[namelist:multigrid=smooth_relaxation] +compulsory=false +type=real + +#============================================================================== +# GLOBAL MESH PARTITIONING +#============================================================================== +[namelist:partitioning] +compulsory=true +description=Global mesh panel partitioning. +help=For parallel computing, the 2D global mesh is divided up into partitions. + =Each process rank runs an instance of the model on one partition. The + =partition decompostion is specified on a `per panel` basis. + =i.e. The cubedsphere has six panels; the planar mesh has one panel. +ns=namelist/Model/Mesh/Partitioning +sort-key=Section-A02 + +[namelist:partitioning=coarsen_multigrid_tiles] +compulsory=false +description=Reduce x and y tile sizes by a factor of 2 in each multigrid level +help=Enables using larger tiles at higher resolution levels by automatically + =reducing tile sizes in coarser levels, which can improve performance. +sort-key=Panel-A10 +type=logical + +[namelist:partitioning=generate_inner_halos] +compulsory=true +description=Generate inner halo regions +help=In order to overlap comms & compute, the owned cells are reordered + =so that they consist of a number of layers of inner halos. These owned + =cells correspond to the halo cells on neighbouring MPI regions. +sort-key=Panel-A05 +type=logical + +[namelist:partitioning=inner_halo_tiles] +compulsory=false +description=Tile inner halos separately from partition interior. +help=Tiling inner halos separately from the partition interior guarantees + =that tiles never cross the boundary between interior and inner halo, + =which can be useful when overlapping communication and computation. +sort-key=Panel-A08 +type=logical + +[namelist:partitioning=max_tiled_multigrid_level] +compulsory=false +description=Coarsest multigrid level to be tiled +help=Revert to 1x1 tiling (equivalent to colouring) for multigrid levels + =above this threshold (level 1 has highest resolution); tiling is + =typically more beneficial for higher resolutions. +range=1: +sort-key=Panel-A09 +type=integer + +[namelist:partitioning=panel_decomposition] +compulsory=true +description=Panel partition decomposition +!enumeration=true +help=Partitioner will attempt to generate partitioned panels based + =on the given enumeration choices: + = + = * auto: Decompose domain as close to square decompositions. + = * row: Single row of partitions. + = * column: Single column of partitions. + = * custom: x/y decompositions explicitly requested using + = namelist:partitioning=panel_xproc, + = namelist:partitioning=panel_yproc. + = * auto_nonuniform: As auto but allow columns of partitions + = of differing heights. + = * guided_nonuniform: Partition into columns according to + = namelist:partitioning=panel_xproc but of different heights + = +!kind=default +sort-key=Panel-A01 +trigger=namelist:partitioning=panel_xproc: this == "'custom'" or this == "'guided_nonuniform'" ; + =namelist:partitioning=panel_yproc: this == "'custom'" ; +value-titles=Auto, Single row, Single column, Custom, Auto nonuniform, Guided nonuniform +values='auto', 'row', 'column', 'custom', 'auto_nonuniform', 'guided_nonuniform' + +[namelist:partitioning=panel_xproc] +compulsory=true +description=Panel partitions in x-direction +fail-if=this < 1 ; + =(env=TOTAL_RANKS == 1) and (this != 1) ; + =(env=TOTAL_RANKS != 1) and (namelist:base_mesh=geometry=="'spherical'") and ( this*namelist:partitioning=panel_yproc != env=TOTAL_RANKS/6 ) ; + =(env=TOTAL_RANKS != 1) and (namelist:base_mesh=geometry=="'planar'") and ( this*namelist:partitioning=panel_yproc != env=TOTAL_RANKS ) ; +help=Number of partitions to generate across the x-direction of a panel of the mesh +!kind=default +range=1: +sort-key=Panel-A02 +type=integer + +[namelist:partitioning=panel_yproc] +compulsory=true +description=Panel partitions in y-direction +fail-if=this < 1 ; + =(env=TOTAL_RANKS == 1) and (this != 1) ; + =(env=TOTAL_RANKS != 1) and (namelist:base_mesh=geometry=="'spherical'") and ( this*namelist:partitioning=panel_xproc != env=TOTAL_RANKS/6 ) ; + =(env=TOTAL_RANKS != 1) and (namelist:base_mesh=geometry=="'planar'") and ( this*namelist:partitioning=panel_xproc != env=TOTAL_RANKS ) ; +help=Number of partitions to generate across the y-direction of a panel of the mesh +!kind=default +range=1: +sort-key=Panel-A03 +type=integer + +[namelist:partitioning=partitioner] +compulsory=true +description=?????? +!enumeration=true +fail-if=this == "'cubedsphere'" and not ( namelist:base_mesh=geometry == "'spherical'" and namelist:base_mesh=topology == "'fully_periodic'" ); + =this == "'cubedsphere'" and not ( env=TOTAL_RANKS % 6 == 0 or env=TOTAL_RANKS == 1 ) ; +help=This should match the mesh being used. For planar domains or LAMs on the + =sphere the partitioner should be set to "'planar'". +sort-key=Panel-A04 +value-titles=Planar, Cubedsphere +values='planar', 'cubedsphere' + +[namelist:partitioning=tile_size_x] +compulsory=false +description=Tile size (number of cells) in x-direction +help=Tiling reorders computation of cells in the horizontal mesh to maximise + =processor cache reuse. It is currently only available for partitioned + =meshes and where mesh partitions have a rectangular shape. Tiles sizes + =along partition borders are automatically adjusted to fit, but sizes that + =are larger than partition dimensions are not accepted. +range=1: +sort-key=Panel-A06 +type=integer + +[namelist:partitioning=tile_size_y] +compulsory=false +description=Tile size (number of cells) in y-direction +help=Tiling reorders computation of cells in the horizontal mesh to maximise + =processor cache reuse. It is currently only available for partitioned + =meshes and where mesh partitions have a rectangular shape. Tiles sizes + =along partition borders are automatically adjusted to fit, but sizes that + =are larger than partition dimensions are not accepted. +range=1: +sort-key=Panel-A07 +type=integer + +#============================================================================== +# PLANET +#============================================================================== +[namelist:planet] +compulsory=true +description=?????? +help=?????? + =?????? +ns=namelist/Model/Planet +sort-key=Section-A03 + +[!namelist:planet=scaled_radius] +compulsory=false +expression=namelist:extrusion=planet_radius / namelist:planet=scaling_factor +help=?????? + =?????? +!kind=default +type=real + +[namelist:planet=scaling_factor] +compulsory=true +description=?????? +help=?????? + =?????? +!kind=default +sort-key=Panel-A07 +type=real + +#============================================================================== +# TIME CONTROL +#============================================================================== +[namelist:time] +compulsory=true +description=Time options +help=At the moment, this just sets the start and end timestep for the run +ns=namelist/Job/Time +sort-key=Section-A01 +title=Time Control + +[namelist:time=calendar] +compulsory=true +description=How to interpret date/time provided by humans +!enumeration=true +sort-key=Panel-A00 +values='timestep' + +[namelist:time=calendar_origin] +compulsory=true +description=Calendar date of time origin +help=Format yyyy-mm-dd hh:mm:ss +sort-key=Panel-A01 +type=character + +[namelist:time=calendar_start] +compulsory=true +description=Calendar date of first timestep +help=Format yyyy-mm-dd hh:mm:ss +sort-key=Panel-A02 +type=character + +[namelist:time=calendar_type] +compulsory=true +description=Type of calendar to use +!enumeration=true +help=gregorian: Gregorian calendar + =d360: 360 day calendar with 12 30-day months +sort-key=Panel-A03 +value-titles=Gregorian, D360 +values='gregorian', 'd360' + +[namelist:time=timestep_end] +compulsory=true +description=Last timestep in run +sort-key=Panel-A04 +type=character + +[namelist:time=timestep_start] +compulsory=true +description=First timestep in run +sort-key=Panel-A05 +type=character + +#============================================================================== +# TIMESTEPPING +#============================================================================== +[namelist:timestepping] +compulsory=true +description=?????? +help=?????? + =?????? +ns=namelist/Job/Timestepping +sort-key=Section-A03 + +[namelist:timestepping=dt] +compulsory=true +description=?????? +fail-if=this < 0.0 ; +help=Timestep in seconds +!kind=second +range=0.0: +sort-key=Panel-A02 +type=real + +[namelist:timestepping=spinup_period] +compulsory=true +description=?????? +help=>=0 time in seconds for the spin up period +!kind=second +sort-key=Panel-A10 +type=real diff --git a/components/inventory/rose-meta/lfric-inventory/version22_30.py b/components/inventory/rose-meta/lfric-inventory/version22_30.py new file mode 100644 index 000000000..c0834b809 --- /dev/null +++ b/components/inventory/rose-meta/lfric-inventory/version22_30.py @@ -0,0 +1,71 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t4661(MacroUpgrade): + """Upgrade macro for ticket #4661 by Denis Sergeev.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4661" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") + return config, self.reports + + +class vn22_t4020(MacroUpgrade): + """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" + + BEFORE_TAG = "vn2.2_t4661" + AFTER_TAG = "vn2.2_t4020" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting( + config, ["namelist:io", "end_of_run_checkpoint"], ".true." + ) + self.add_setting(config, ["namelist:io", "checkpoint_times"], "") + return config, self.reports + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2_t4020" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + # Blank Upgrade Macro + # Commands From: rose-meta/lfric-inventory + # Blank Upgrade Macro + return config, self.reports diff --git a/components/inventory/rose-meta/lfric-inventory/versions.py b/components/inventory/rose-meta/lfric-inventory/versions.py index bcbbe2d70..152c043d0 100644 --- a/components/inventory/rose-meta/lfric-inventory/versions.py +++ b/components/inventory/rose-meta/lfric-inventory/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): @@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - - -class vn22_t4661(MacroUpgrade): - """Upgrade macro for ticket #4661 by Denis Sergeev.""" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4661" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") - - return config, self.reports - - -class vn22_t4020(MacroUpgrade): - """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" - - BEFORE_TAG = "vn2.2_t4661" - AFTER_TAG = "vn2.2_t4020" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting( - config, ["namelist:io", "end_of_run_checkpoint"], ".true." - ) - self.add_setting(config, ["namelist:io", "checkpoint_times"], "") - - return config, self.reports diff --git a/components/inventory/rose-meta/lfric-inventory/vn3.0/rose-meta.conf b/components/inventory/rose-meta/lfric-inventory/vn3.0/rose-meta.conf new file mode 100644 index 000000000..b0971a3cd --- /dev/null +++ b/components/inventory/rose-meta/lfric-inventory/vn3.0/rose-meta.conf @@ -0,0 +1 @@ +import=lfric-driver/vn3.0 diff --git a/components/lfric-xios/rose-meta/lfric-xios/version22_30.py b/components/lfric-xios/rose-meta/lfric-xios/version22_30.py new file mode 100644 index 000000000..c71d4a60c --- /dev/null +++ b/components/lfric-xios/rose-meta/lfric-xios/version22_30.py @@ -0,0 +1,71 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t4661(MacroUpgrade): + """Upgrade macro for ticket #4661 by Denis Sergeev.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4661" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") + return config, self.reports + + +class vn22_t4020(MacroUpgrade): + """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" + + BEFORE_TAG = "vn2.2_t4661" + AFTER_TAG = "vn2.2_t4020" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting( + config, ["namelist:io", "end_of_run_checkpoint"], ".true." + ) + self.add_setting(config, ["namelist:io", "checkpoint_times"], "") + return config, self.reports + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2_t4020" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + # Blank Upgrade Macro + # Commands From: rose-meta/lfric-xios + # Blank Upgrade Macro + return config, self.reports diff --git a/components/lfric-xios/rose-meta/lfric-xios/versions.py b/components/lfric-xios/rose-meta/lfric-xios/versions.py index bcbbe2d70..152c043d0 100644 --- a/components/lfric-xios/rose-meta/lfric-xios/versions.py +++ b/components/lfric-xios/rose-meta/lfric-xios/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): @@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - - -class vn22_t4661(MacroUpgrade): - """Upgrade macro for ticket #4661 by Denis Sergeev.""" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4661" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") - - return config, self.reports - - -class vn22_t4020(MacroUpgrade): - """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" - - BEFORE_TAG = "vn2.2_t4661" - AFTER_TAG = "vn2.2_t4020" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting( - config, ["namelist:io", "end_of_run_checkpoint"], ".true." - ) - self.add_setting(config, ["namelist:io", "checkpoint_times"], "") - - return config, self.reports diff --git a/components/lfric-xios/rose-meta/lfric-xios/vn3.0/rose-meta.conf b/components/lfric-xios/rose-meta/lfric-xios/vn3.0/rose-meta.conf new file mode 100644 index 000000000..b0971a3cd --- /dev/null +++ b/components/lfric-xios/rose-meta/lfric-xios/vn3.0/rose-meta.conf @@ -0,0 +1 @@ +import=lfric-driver/vn3.0 diff --git a/components/science/rose-meta/lfric-science/version22_30.py b/components/science/rose-meta/lfric-science/version22_30.py new file mode 100644 index 000000000..e8aa158dd --- /dev/null +++ b/components/science/rose-meta/lfric-science/version22_30.py @@ -0,0 +1,71 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t4661(MacroUpgrade): + """Upgrade macro for ticket #4661 by Denis Sergeev.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn2.2_t4661" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") + return config, self.reports + + +class vn22_t4020(MacroUpgrade): + """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" + + BEFORE_TAG = "vn2.2_t4661" + AFTER_TAG = "vn2.2_t4020" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + self.add_setting( + config, ["namelist:io", "end_of_run_checkpoint"], ".true." + ) + self.add_setting(config, ["namelist:io", "checkpoint_times"], "") + return config, self.reports + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2_t4020" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-driver + # Blank Upgrade Macro + # Commands From: rose-meta/lfric-science + # Blank Upgrade Macro + return config, self.reports diff --git a/components/science/rose-meta/lfric-science/versions.py b/components/science/rose-meta/lfric-science/versions.py index bcbbe2d70..152c043d0 100644 --- a/components/science/rose-meta/lfric-science/versions.py +++ b/components/science/rose-meta/lfric-science/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): @@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ - - -class vn22_t4661(MacroUpgrade): - """Upgrade macro for ticket #4661 by Denis Sergeev.""" - - BEFORE_TAG = "vn2.2" - AFTER_TAG = "vn2.2_t4661" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting(config, ["namelist:extrusion", "eta_values"], "''") - - return config, self.reports - - -class vn22_t4020(MacroUpgrade): - """Upgrade macro for ticket #4020 by Andrew Coughtrie.""" - - BEFORE_TAG = "vn2.2_t4661" - AFTER_TAG = "vn2.2_t4020" - - def upgrade(self, config, meta_config=None): - # Commands From: rose-meta/lfric-driver - self.add_setting( - config, ["namelist:io", "end_of_run_checkpoint"], ".true." - ) - self.add_setting(config, ["namelist:io", "checkpoint_times"], "") - - return config, self.reports diff --git a/components/science/rose-meta/lfric-science/vn3.0/rose-meta.conf b/components/science/rose-meta/lfric-science/vn3.0/rose-meta.conf new file mode 100644 index 000000000..b0971a3cd --- /dev/null +++ b/components/science/rose-meta/lfric-science/vn3.0/rose-meta.conf @@ -0,0 +1 @@ +import=lfric-driver/vn3.0 diff --git a/dependencies.yaml b/dependencies.yaml index 1b318dac9..5a6be7319 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -23,4 +23,4 @@ lfric_core: SimSys_Scripts: source: git@github.com:MetOffice/SimSys_Scripts.git - ref: main + ref: 2025.12.1 diff --git a/mesh_tools/rose-meta/lfric-mesh_tools/version22_30.py b/mesh_tools/rose-meta/lfric-mesh_tools/version22_30.py new file mode 100644 index 000000000..4470675a7 --- /dev/null +++ b/mesh_tools/rose-meta/lfric-mesh_tools/version22_30.py @@ -0,0 +1,42 @@ +import sys + +from metomi.rose.upgrade import MacroUpgrade + +from .version21_22 import * + + +class UpgradeError(Exception): + """Exception created when an upgrade fails.""" + + def __init__(self, msg): + self.msg = msg + + def __repr__(self): + sys.tracebacklimit = 0 + return self.msg + + __str__ = __repr__ + + +""" +Copy this template and complete to add your macro +class vnXX_txxx(MacroUpgrade): + # Upgrade macro for by + BEFORE_TAG = "vnX.X" + AFTER_TAG = "vnX.X_txxx" + def upgrade(self, config, meta_config=None): + # Add settings + return config, self.reports +""" + + +class vn22_t34(MacroUpgrade): + """Upgrade macro for ticket TTTT by Unknown.""" + + BEFORE_TAG = "vn2.2" + AFTER_TAG = "vn3.0" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-mesh_tools + # Blank Upgrade Macro + return config, self.reports diff --git a/mesh_tools/rose-meta/lfric-mesh_tools/versions.py b/mesh_tools/rose-meta/lfric-mesh_tools/versions.py index 5a3ba41f4..152c043d0 100644 --- a/mesh_tools/rose-meta/lfric-mesh_tools/versions.py +++ b/mesh_tools/rose-meta/lfric-mesh_tools/versions.py @@ -2,7 +2,7 @@ from metomi.rose.upgrade import MacroUpgrade -from .version21_22 import * +from .version22_30 import * class UpgradeError(Exception): diff --git a/mesh_tools/rose-meta/lfric-mesh_tools/vn3.0/rose-meta.conf b/mesh_tools/rose-meta/lfric-mesh_tools/vn3.0/rose-meta.conf new file mode 100644 index 000000000..9f3b12dd5 --- /dev/null +++ b/mesh_tools/rose-meta/lfric-mesh_tools/vn3.0/rose-meta.conf @@ -0,0 +1,630 @@ +[env=mesh_generator] +compulsory=true +ns=namelist/mesh +sort-key=Panel-A01 +trigger=namelist:cubedsphere_mesh: Cubed-Sphere ; + =namelist:planar_mesh: Planar ; +values=Cubed-Sphere, Planar + +[namelist:cubedsphere_mesh] +compulsory=true +description=Cubed-Sphere mesh configuration +ns=namelist/mesh/cubed-sphere +sort-key=Section-A02 +title=Cubed-Sphere + +[namelist:cubedsphere_mesh=edge_cells] +!bounds=namelist:mesh=n_meshes +compulsory=true +description=Edge cells along mesh panel edge +fail-if=len(this) != len(namelist:mesh=mesh_names) ; +help=Number of cells on a panel edge, Cubed-Sphere is made + =up of 6 rectangular panels with equal numbers of cells + =on each panels edge. +!kind=default +length=: +range=1: +sort-key=Panel-A01 +type=integer + +[namelist:cubedsphere_mesh=equatorial_latitude] +compulsory=true +description=Latitude of the equator of the mesh, in degrees, following the + =Schmidt stretching transform +fail-if=this >= 90.0 + =this <= -90.0 +help=Applies the Schmidt transform, which stretches the mesh towards to North + =or South pole. This is described by the latitude that the equator is + =moved to. +!kind=default +range=-90.0:90.0 +sort-key=Panel-A04 +type=real + +[namelist:cubedsphere_mesh=smooth_passes] +compulsory=true +description=Number of smoothing iterations +fail-if=this < 0 +help=Smoothing is only applied the highest resolution mesh in a run configuration. +!kind=default +range=0: +sort-key=Panel-A02 +type=integer + +#==================================================== +# Mesh +#==================================================== +# Describes common mesh attributes for generation +# and triggers mesh specific namelists. +#==================================================== +[namelist:mesh] +title=Mesh + +[namelist:mesh=coord_sys] +compulsory=true +description=Mesh coodinate system +!enumeration=true +fail-if=namelist:mesh=geometry == "'spherical'" and this == "'xyz'" ; +help=Selects the coordinate system used to position mesh nodes. + = + = xyz: Uses cartesian x,y,z axes (m). + = ll: Uses spherical latitude, longitude (degrees). + = + =Currently unsupported option: + = xyz & spherical geometry +!kind=default +sort-key=Panel-B01 +trigger=namelist:mesh=rotate_mesh: this == "'ll'" ; +value-titles=XYZ, LL +values='xyz', 'll' + +[namelist:mesh=geometry] +compulsory=true +description=Geometry of mesh domain. +!enumeration=true +help=Will be used to specify the shape of the domain surface. + = + =++++++++++++++++++++++++++++++ + =At present, this is only used to trigger the rose-gui panels + =to select between the cubed-sphere (spherical) and LAM (Planar) + =meshes. + =++++++++++++++++++++++++++++++ + = + =It is anticipated that it will be used when the + =cubedsphere_mesh_generator and planar_mesh_generators are merged. + = +ns=namelist/mesh +sort-key=Panel-C01 +trigger=namelist:mesh=rotate_mesh: this == "'spherical'" ; +value-titles=Planar, Sphere +values='planar', 'spherical' + +[namelist:mesh=mesh_file_prefix] +compulsory=true +description=Output UGRID filename. +help=This file will contain all requested meshes/maps from the mesh generators. + =All meshes contained within the file will relate to the requested base class + =of mesh. +sort-key=Panel-A02 +!string_length=filename +type=character + +[namelist:mesh=mesh_maps] +!bounds=int(gamma( real(namelist:mesh=n_meshes) )) +compulsory=true +description=Intergrid mesh mappings +!fail-if=len(namelist:mesh=mesh_names) < 2 and len(this) > 0 ; +help=This list defines mesh-mesh mappings that are to be + =included in the mesh UGRID file. + = + =Maps ares defined by individual list items in the form + = + = : + = + =which will produce a mesh map in each direction, A->B and B->A. + =All mesh names listed in map creation must have been requested + =for mesh generation, i.e. in the variable namelist:mesh=mesh_names + = +length=: +sort-key=Panel-F03 +!string_length=default +type=character + +[namelist:mesh=mesh_names] +!bounds=namelist:mesh=n_meshes +compulsory=true +description=Mesh topology name(s). +fail-if=len(this) < 1 ; + =len(this) != namelist:mesh=n_meshes ; +help=These mesh names are used as variable names to identify + =meshes in UGRID conformant, NetCDF output file. + = + =The length of this list should match the number of meshes + =requested (namelist:mesh=n_meshes). +length=: +sort-key=Panel-F02 +!string_length=default +trigger=namelist:mesh=mesh_maps: len(this) > 1 ; +type=character + +[namelist:mesh=n_meshes] +compulsory=true +description=Number of meshes to generate. +fail-if=this < 1 +help=Specifies number of meshes to create. +!kind=default +range=1: +sort-key=Panel-F01 +trigger=namelist:mesh=mesh_maps: this > 1 ; +type=integer + +[namelist:mesh=partition_mesh] +compulsory=true +description=Create partitioned meshes. +help=Meshes are partitioned and written to file with the required local mesh object information. + =These can be read directly to populate a local mesh object and remove the need to partition + =the mesh at runtime, i.e. allows for the use of prepartitioned meshes. +!kind=default +sort-key=Panel-A03 +trigger=namelist:partitions: .true. ; +type=logical + +[namelist:mesh=rotate_mesh] +compulsory=true +description=Perform rotated pole transformations. +help=Enables options for rotating the base mesh generation strategy. + =This is done in two stages using the North pole location as a + =reference. + = + = 1. The mesh is rotated about the reference pole. This is to allow for + = meshes which are not symmetrical about the pole axis, e.g. Cubesphere + = 2. The reference pole is rotated to a new pole location while maintaining + = the mesh position relative to the reference pole. + = +sort-key=Panel-D01 +trigger=namelist:rotation: .true. ; +type=logical + +[namelist:mesh=topology] +compulsory=true +description=Describes connectivity of mesh domain. +!enumeration=true +fail-if=this == "'channel'" and (namelist:planar_mesh=periodic_x == ".true." and namelist:planar_mesh=periodic_y == ".true.") ; + =this == "'channel'" and (namelist:planar_mesh=periodic_x == ".false." and namelist:planar_mesh=periodic_y == ".false.") ; +help= + = +ns=namelist/mesh +sort-key=Panel-C01 +value-titles=Non Periodic, Channel, Periodic +values='non_periodic', 'channel', 'periodic' + +#============================================================================== +# GLOBAL MESH PARTITIONING +#============================================================================== +[namelist:partitions] +compulsory=true +description=Global mesh partitioning. +help=For parallel computing, the 2D global mesh is divided up into partitions. + =Each process rank runs an instance of the model on one partition. The + =partition decompostion is specified on a `per panel` basis. + =i.e. The cubedsphere has six panels; the planar mesh has one panel. +ns=namelist/mesh/partitions +sort-key=Section-A05 +title=Partitions + +[namelist:partitions=generate_inner_halos] +compulsory=true +description=Generate inner halo regions +help=In order to overlap comms & compute, the owned cells are reordered + =so that they consist of a number of layers of inner halos. These owned + =cells correspond to the halo cells on neighbouring MPI regions. +sort-key=Panel-A05 +type=logical + +[namelist:partitions=max_stencil_depth] +compulsory=true +description=Stencil depth [cells] +fail-if=this < 1 ; +help=Max extent of stencil in cells from the looping cell +!kind=default +range=1: +sort-key=Panel-A05 +type=integer + +[namelist:partitions=n_partitions] +compulsory=true +description=Number of partitions/meshes to create. +fail-if=this < 1 ; +help=The number of local meshes (partitions) to split global mesh into. + =This is NOT the same as the partition range to process. +range=1: +sort-key=Panel-A01 +type=integer + +[namelist:partitions=panel_decomposition] +compulsory=true +description=Panel partition decomposition +!enumeration=true +help=Partitioner will attempt to generate partitioned panels based + =on the given enumeration choices: + = + = * auto: Decompose domain as close to square decompositions. + = * row: Single row of partitions. + = * column: Single column of partitions. + = * custom: x/y decompositions explicitly requested using + = namelist:partitions=panel_xproc, + = namelist:partitions=panel_yproc. + = * auto_nonuniform: As auto but allow columns of partitions + = of differing heights. + = * guided_nonuniform: Partition into columns according to + = namelist:partitions=panel_xproc but of different heights + = +!kind=default +sort-key=Panel-A02 +trigger=namelist:partitions=panel_xproc: this == "'custom'" or this == "'guided_nonuniform'" ; + =namelist:partitions=panel_yproc: this == "'custom'" ; +value-titles=Auto, Single row, Single column, Custom, Auto nonuniform, Guided nonuniform +values='auto', 'row', 'column', 'custom', 'auto_nonuniform', 'guided_nonuniform' + +[namelist:partitions=panel_xproc] +compulsory=true +description=Panel partitions in x-direction. +fail-if=this < 1 ; +help=Number of partitions to generate across the x-direction of a mesh panel. +!kind=default +range=1: +sort-key=Panel-A03 +type=integer + +[namelist:partitions=panel_yproc] +compulsory=true +description=Panel partitions in y-direction. +fail-if=this < 1 ; +help=Number of partitions to generate across the y-direction of a mesh panel. +!kind=default +range=1: +sort-key=Panel-A04 +type=integer + +[namelist:partitions=partition_range] +compulsory=true +description=Specified range of partitions to output. +fail-if=this(1) < 0 ; + =this(2) < 0 ; + =this(1) >= namelist:partitions=n_partitions ; + =this(2) >= namelist:partitions=n_partitions ; + =this(1) > this(2) ; +help=This variable specifies the [lower bound, upper bound] of + =the range of consecutive partition IDs to be output to file. + =The bounds are given as partition IDs which range from 0 to + =n_partitions-1. + = + =E.g. partition_range=[1,3] would produce local mesh + = partition IDs 0 to 2, each in their own mesh file. +length=2 +range=0: +sort-key=Panel-A05 +type=integer + +#==================================================== +# Planar Mesh +#==================================================== +# Describes mesh attributes specific to the +# planar mesh. +#==================================================== +[namelist:planar_mesh] +compulsory=true +description=Planar mesh configuration +ns=namelist/mesh/planar +sort-key=Section-A03 +title=Planar + +[namelist:planar_mesh=apply_stretch_transform] +compulsory=true +description=Apply stretched grid transformation. +help=Enables using a larger cell spacing in the outer region of the domain, + =compared to the inner region. +!kind=default +sort-key=Panel-D01 +trigger=namelist:stretch_transform: .true.; +type=logical + +[namelist:planar_mesh=create_lbc_mesh] +compulsory=true +description=Create LBC mesh +help=Enables options for a Lateral Boundary Condition(LBC) mesh to be created + =The LBC mesh locates driver model data around the LAM domain boundaries + =for a specified depth in cells. +!kind=default +sort-key=Panel-A13 +trigger=namelist:planar_mesh=lbc_parent_mesh: .true. ; + =namelist:planar_mesh=lbc_rim_depth: .true. ; +type=logical + +[namelist:planar_mesh=domain_centre] +compulsory=true +description=Co-ordinates of domain centre [x-axis,y-axis]. +fail-if=namelist:mesh=coord_sys == 'll' and this(1) < -180.0 ; + =namelist:mesh=coord_sys == 'll' and this(1) > 180.0 ; + =namelist:mesh=coord_sys == 'll' and this(2) < -90.0 ; + =namelist:mesh=coord_sys == 'll' and this(2) > 90.0 ; +help=Domain centre coordinates + = + = For spherical coordinates + =---------------------------- + =Values are taken as [longitude,latitude], positive as + =degrees east, degrees_west respectively. + = + = Co-ordinate ranges are: + = + = longitude: -180.0 : 180.0 + = latitude: -90.0 : 90.0 + = + =Cordinates are taken on as being on a unrotated frame of reference. + = + = For cartesian coordinates + =---------------------------- + = Values are taken as [m,m], positive in x/y directions. + = +!kind=default +length=2 +sort-key=Panel-A01 +type=real + +[namelist:planar_mesh=domain_size] +compulsory=true +description=Domain size,[x-axis,y-axis] +fail-if=this <= 0.0 +help=Grid domain size of mesh in [x-axis,y-axis]. + =Units of values are dependant on choice of coordinate system + = * Spherical: [longitude, latitiude] in degrees. + = * Cartesian: [m] along x/y-axes +!kind=default +length=2 +range=0.0: +sort-key=Panel-A02 +type=real + +[namelist:planar_mesh=edge_cells_x] +compulsory=true +description=Number of edges cells (x-axis). +fail-if=this < 2 and namelist:planar_mesh=periodic_x == ".true." ; + =this < 1 ; + =len(this) != len(namelist:mesh=mesh_names) ; +help=Number of edges cells are specified as a list of integers, one for each mesh requested. + =The ordering corresponds to the order of the meshes listed in namelist:mesh=mesh_names. + = + =The minimum number of edge cells on the x-axis for meshes which are periodic in + =the x direction (namelist:planar_mesh=periodic_x) is 2. This restriction is a limitation of + =the science code. +!kind=default +length=: +range=1: +sort-key=Panel-A05 +type=integer + +[namelist:planar_mesh=edge_cells_y] +compulsory=true +description=Number of edges cells (y-axis). +fail-if=this < 2 and namelist:planar_mesh=periodic_y == ".true." ; + =this < 1 ; + =len(this) != len(namelist:mesh=mesh_names) ; +help=Number of edges cells are specified as a list of integers, one for each mesh requested. + =The ordering corresponds to the order of the meshes listed in namelist:mesh=mesh_names. + = + =The minimum number of edge cells on the y-axis for meshes which are periodic in + =the y direction (namelist:planar_mesh=periodic_y) is 2. This restriction is a limitation of + =the science code. +!kind=default +length=: +range=1: +sort-key=Panel-A06 +type=integer + +[namelist:planar_mesh=lbc_parent_mesh] +compulsory=true +description=LBC parent LAM. +help=Specifies the name of the LAM mesh to base the + =LBC mesh upon. +!kind=default +sort-key=Panel-A14 +type=character + +[namelist:planar_mesh=lbc_rim_depth] +compulsory=true +description=Rim depth (cells). +fail-if=this < 1 ; +help=LBC mesh rim depth in cells. The rim depth should be + =less than half the minimum cell dimension of the parent + =LAM (namelist:planar_mesh=lbc_parent_mesh), otherwise + =there will be no inner domain. i.e. + = + = Rim depth < min(LAM n_xcells, LAM n_ycells)/2 + = +!kind=default +range=1: +sort-key=Panel-A15 +type=integer + +[namelist:planar_mesh=periodic_x] +compulsory=true +description=Periodic in x-axis +help=Specifies whether the topology of the mesh should be periodic in the x direction. + = + =A mesh which is periodic in the x-direction means that outflow across the domain's + =Eastern boundary would appear as inflow across the domain's Western boundary and + =vice versa. +!kind=default +sort-key=Panel-A09 +type=logical + +[namelist:planar_mesh=periodic_y] +compulsory=true +description=Periodic in y-axis +help=Specifies whether the topology of the mesh should be periodic in the y direction. + = + =A mesh which is periodic in the y-direction will mean that outflow across the domain's + =Northern boundary would appear as inflow across the domain's Southern boundary and + =vice versa. +!kind=default +sort-key=Panel-A10 +type=logical + +[namelist:rotation] +compulsory=true +ns=namelist/mesh/Rotation +sort-key=Section=A04 + +[namelist:rotation=rotation_target] +compulsory=true +description=Method used to specify the domain input. +!enumeration=true +help=LAM domains can be specified using the following input + = parameter sets: + = + = * north_pole: specify a target north pole for rotation. + = * null_island: specify a target null island for rotation. + = (i.e. the target location to position the + = intersection of the Prime Meridian and Equator) +!kind=default +sort-key=Panel-A02 +trigger=namelist:rotation=target_null_island: this == "'null_island'" ; + =namelist:rotation=target_north_pole: this == "'north_pole'" ; +value-titles=North pole, Null island +values='north_pole', 'null_island' + +[namelist:rotation=target_north_pole] +compulsory=true +description=Co-ordinates of target pole (degrees) +fail-if=namelist:rotation=target_north_pole(1) < -180.0 ; + =namelist:rotation=target_north_pole(1) > 180.0 ; + =namelist:rotation=target_north_pole(2) < -90.0 ; + =namelist:rotation=target_north_pole(2) > 90.0 ; +help=Target pole co-ordinates [longitude,latitude]. The mesh is transformed + =such that the reference pole (default: north pole) is relocated to the + =specified target pole co-ordinates. + = + =This is done such that the true North pole lies on longitude=0. + = + =Target pole co-ordinate ranges are: + = + = longitude: -180.0 : 180.0 + = latitude: -90.0 : 90.0 + = +!kind=default +length=2 +range=-180.0:180.0 +sort-key=Panel-A03 +type=real + +[namelist:rotation=target_null_island] +compulsory=true +description=Co-ordinates of target Null Island (degrees) +fail-if=namelist:rotation=target_null_island(1) < -180.0 ; + =namelist:rotation=target_null_island(1) > 180.0 ; + =namelist:rotation=target_null_island(2) < -90.0 ; + =namelist:rotation=target_null_island(2) > 90.0 ; +help=The Null Island is the intersection of the Prime Meridian and Equator on a given domain. + =The mesh is transformed such that an unrotated Null Island [0.0,0.0] is relocated to the + =specified target_null_island co-ordinates. + = + =This is done such that the true North pole lies on longitude=0. + = + =Target target_null_island co-ordinate ranges are: + = + = longitude: -180.0 : 180.0 + = latitude: -90.0 : 90.0 + = +!kind=default +length=2 +range=-180.0:180.0 +sort-key=Panel-A01 +type=real + +[namelist:stretch_transform] +compulsory=true +ns=namelist/mesh/stretch_transform +sort-key=Section=A04 + +[namelist:stretch_transform=cell_size_inner] +compulsory=true +description=Inner region cell size +fail-if=this(1) >= namelist:stretch_transform=cell_size_outer(1) ; + =this(2) >= namelist:stretch_transform=cell_size_outer(2) ; +help=[delta_x_inner, delta_y_inner] + =delta_x_inner needs to be smaller than delta_x_outer, and + =similarly for the y direction. + =Units are dependant on the coordinate system/geometry. +!kind=default +length=2 +range=0.0: +sort-key=Panel-A04 +type=real + +[namelist:stretch_transform=cell_size_outer] +compulsory=true +description=Outer region cell size +fail-if=this(1) < namelist:stretch_transform=cell_size_inner(1) ; + =this(2) < namelist:stretch_transform=cell_size_inner(2) ; +help=[delta_x_outer, delta_y_outer] + =delta_x_inner needs to be smaller than delta_x_outer, and + =similarly for the y direction. + =Units are dependant on the coordinate system/geometry. +!kind=default +length=2 +range=0.0: +sort-key=Panel-A04 +type=real + +[namelist:stretch_transform=n_cells_outer] +compulsory=true +description=Depth (in cells) of outer region +help=[n_outer_x, n_outer_y] + =This is the number of cells in an outer region + =near to a domain edge. i.e. There are + =2*n_cells_outer along the whole axis +!kind=default +length=2 +range=2: +sort-key=Panel-A04 +type=integer + +[namelist:stretch_transform=n_cells_stretch] +compulsory=true +description=Depth (in cells) of stretch region +help=[n_stretch_x, n_stretch_y] + =A stretch region is defined to be the + =cells in between the inner region and an + =outer region, and where the cell size is in + =between the inner and outer cell sizes. + =i.e. cell_size_outer > size > cell_size_inner + =and 2*n_cells_stretch along the whole axis +!kind=default +length=2 +range=0: +sort-key=Panel-A04 +type=integer + +[namelist:stretch_transform=stretching_on] +compulsory=true +description=Locations to map stretching function +!enumeration=true +help=lfric-cell-centres: The stretching function is mapped to the LFRic cell centres. + = cell-nodes: The stretching function is mapped to the LFRic cell nodes. + = p-points: The stretching function is mapped to a set of points such that the + = cell nodes are half way between these points. +!kind=default +sort-key=Panel-A04 +value-titles=cell-centres, cell-nodes, p-points +values='cell_centres','cell_nodes', 'p_points' + +[namelist:stretch_transform=transform_mesh] +compulsory=true +description=Mesh to apply transform to +help=Specifies the name of the main mesh to apply the transform to. + =Where inter-grid maps have been requested from the named mesh + =to coarser meshes, the coarse mesh nodes are updated to match + =the named mesh nodes. +!kind=default +sort-key=Panel-A04 +type=character diff --git a/rose-stem/app/coupled/rose-app.conf b/rose-stem/app/coupled/rose-app.conf index 861fa58a8..1b7910b57 100644 --- a/rose-stem/app/coupled/rose-app.conf +++ b/rose-stem/app/coupled/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-coupled/vn2.2_t4020 +meta=lfric-coupled/vn3.0 [command] default=rose app-run -C $CYLC_WORKFLOW_RUN_DIR/app/coupled -O lam -O LAM50x50-2x2 --install-only diff --git a/rose-stem/app/io_demo/rose-app.conf b/rose-stem/app/io_demo/rose-app.conf index eba42ae7f..e92bdb229 100644 --- a/rose-stem/app/io_demo/rose-app.conf +++ b/rose-stem/app/io_demo/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-io_demo/vn2.2_t4020 +meta=lfric-io_demo/vn3.0 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef ; \ diff --git a/rose-stem/app/mesh/opt/rose-app-lbc.conf b/rose-stem/app/mesh/opt/rose-app-lbc.conf index 7867cbbd7..b2ceed3df 100644 --- a/rose-stem/app/mesh/opt/rose-app-lbc.conf +++ b/rose-stem/app/mesh/opt/rose-app-lbc.conf @@ -3,19 +3,13 @@ default=mkdir -p $MESH_DIR ; mpiexec -n 1 $BIN_DIR/planar_mesh_generator mesh_ge srun=mkdir -p $MESH_DIR ; srun --ntasks=1 $BIN_DIR/planar_mesh_generator mesh_generation.nml [env] -OMP_NUM_THREADS=1 mesh_generator=Planar [!!namelist:cubedsphere_mesh] [namelist:mesh] -coord_sys='ll' -geometry='spherical' -mesh_file_prefix='$OUTPUT_FILE_PREFIX' mesh_names='primary' -n_meshes=1 partition_mesh=.true. -rotate_mesh=.false. topology='non_periodic' [namelist:partitions] @@ -27,9 +21,7 @@ panel_yproc=2 partition_range=0,5 [namelist:planar_mesh] -apply_stretch_transform=.false. create_lbc_mesh=.true. -domain_centre=0.0,0.0 domain_size=24.0,22.0 edge_cells_x=96 edge_cells_y=96 @@ -37,7 +29,3 @@ lbc_parent_mesh='primary' lbc_rim_depth=20 periodic_x=.false. periodic_y=.false. - -[!!namelist:rotation] - -[!!namelist:stretch_transform] diff --git a/rose-stem/app/mesh/opt/rose-app-lbc_1x1P.conf b/rose-stem/app/mesh/opt/rose-app-lbc_1x1P.conf index 2c5bc3dfa..2b8aa5b41 100644 --- a/rose-stem/app/mesh/opt/rose-app-lbc_1x1P.conf +++ b/rose-stem/app/mesh/opt/rose-app-lbc_1x1P.conf @@ -3,33 +3,23 @@ default=mkdir -p $MESH_DIR ; mpiexec -n 1 $BIN_DIR/planar_mesh_generator mesh_ge srun=mkdir -p $MESH_DIR ; srun --ntasks=1 $BIN_DIR/planar_mesh_generator mesh_generation.nml [env] -OMP_NUM_THREADS=1 mesh_generator=Planar [!!namelist:cubedsphere_mesh] [namelist:mesh] -coord_sys='ll' -geometry='spherical' -mesh_file_prefix='$OUTPUT_FILE_PREFIX' mesh_names='primary' -n_meshes=1 partition_mesh=.true. -rotate_mesh=.false. topology='non_periodic' [namelist:partitions] max_stencil_depth=2 -n_partitions=1 panel_decomposition='custom' panel_xproc=1 panel_yproc=1 -partition_range=0,0 [namelist:planar_mesh] -apply_stretch_transform=.false. create_lbc_mesh=.true. -domain_centre=0.0,0.0 domain_size=24.0,22.0 edge_cells_x=96 edge_cells_y=96 @@ -37,7 +27,3 @@ lbc_parent_mesh='primary' lbc_rim_depth=20 periodic_x=.false. periodic_y=.false. - -[!!namelist:rotation] - -[!!namelist:stretch_transform] diff --git a/rose-stem/app/mesh/opt/rose-app-lbc_2x2P.conf b/rose-stem/app/mesh/opt/rose-app-lbc_2x2P.conf index f72fee2e2..bfb6442b9 100644 --- a/rose-stem/app/mesh/opt/rose-app-lbc_2x2P.conf +++ b/rose-stem/app/mesh/opt/rose-app-lbc_2x2P.conf @@ -3,19 +3,13 @@ default=mkdir -p $MESH_DIR ; mpiexec -n 1 $BIN_DIR/planar_mesh_generator mesh_ge srun=mkdir -p $MESH_DIR ; srun --ntasks=1 $BIN_DIR/planar_mesh_generator mesh_generation.nml [env] -OMP_NUM_THREADS=1 mesh_generator=Planar [!!namelist:cubedsphere_mesh] [namelist:mesh] -coord_sys='ll' -geometry='spherical' -mesh_file_prefix='$OUTPUT_FILE_PREFIX' mesh_names='primary' -n_meshes=1 partition_mesh=.true. -rotate_mesh=.false. topology='non_periodic' [namelist:partitions] @@ -27,9 +21,7 @@ panel_yproc=2 partition_range=0,3 [namelist:planar_mesh] -apply_stretch_transform=.false. create_lbc_mesh=.true. -domain_centre=0.0,0.0 domain_size=24.0,22.0 edge_cells_x=96 edge_cells_y=96 @@ -37,7 +29,3 @@ lbc_parent_mesh='primary' lbc_rim_depth=20 periodic_x=.false. periodic_y=.false. - -[!!namelist:rotation] - -[!!namelist:stretch_transform] diff --git a/rose-stem/app/mesh/opt/rose-app-lbc_8x2P.conf b/rose-stem/app/mesh/opt/rose-app-lbc_8x2P.conf index 1abce4001..2609cef82 100644 --- a/rose-stem/app/mesh/opt/rose-app-lbc_8x2P.conf +++ b/rose-stem/app/mesh/opt/rose-app-lbc_8x2P.conf @@ -3,19 +3,13 @@ default=mkdir -p $MESH_DIR ; mpiexec -n 1 $BIN_DIR/planar_mesh_generator mesh_ge srun=mkdir -p $MESH_DIR ; srun --ntasks=1 $BIN_DIR/planar_mesh_generator mesh_generation.nml [env] -OMP_NUM_THREADS=1 mesh_generator=Planar [!!namelist:cubedsphere_mesh] [namelist:mesh] -coord_sys='ll' -geometry='spherical' -mesh_file_prefix='$OUTPUT_FILE_PREFIX' mesh_names='primary' -n_meshes=1 partition_mesh=.true. -rotate_mesh=.false. topology='non_periodic' [namelist:partitions] @@ -27,9 +21,7 @@ panel_yproc=2 partition_range=0,15 [namelist:planar_mesh] -apply_stretch_transform=.false. create_lbc_mesh=.true. -domain_centre=0.0,0.0 domain_size=24.0,22.0 edge_cells_x=96 edge_cells_y=96 @@ -37,7 +29,3 @@ lbc_parent_mesh='primary' lbc_rim_depth=20 periodic_x=.false. periodic_y=.false. - -[!!namelist:rotation] - -[!!namelist:stretch_transform] diff --git a/rose-stem/app/mesh/rose-app.conf b/rose-stem/app/mesh/rose-app.conf index 38a96dc9d..1653ef41b 100644 --- a/rose-stem/app/mesh/rose-app.conf +++ b/rose-stem/app/mesh/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-mesh_tools/vn2.2 +meta=lfric-mesh_tools/vn3.0 [command] default=echo "There is no default mesh generator, please specify an optional configuration"; false diff --git a/rose-stem/app/mesh_tools/rose-app.conf b/rose-stem/app/mesh_tools/rose-app.conf index 9db5061f1..9c4dcec46 100644 --- a/rose-stem/app/mesh_tools/rose-app.conf +++ b/rose-stem/app/mesh_tools/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-mesh_tools/vn2.2 +meta=lfric-mesh_tools/vn3.0 [command] default=${BIN_DIR}/${APPLICATION} mesh_generation.nml diff --git a/rose-stem/app/simple_diffusion/rose-app.conf b/rose-stem/app/simple_diffusion/rose-app.conf index 496d13e0e..d7c6320ff 100644 --- a/rose-stem/app/simple_diffusion/rose-app.conf +++ b/rose-stem/app/simple_diffusion/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-simple_diffusion/vn2.2_t4020 +meta=lfric-simple_diffusion/vn3.0 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef ; \ diff --git a/rose-stem/app/skeleton/rose-app.conf b/rose-stem/app/skeleton/rose-app.conf index 7d485a0ad..e7b3a52e4 100644 --- a/rose-stem/app/skeleton/rose-app.conf +++ b/rose-stem/app/skeleton/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-skeleton/vn2.2_t4020 +meta=lfric-skeleton/vn3.0 [command] default=$LAUNCH_SCRIPT/launch-exe