diff --git a/source/Development/TestSuites/jules.rst b/source/Development/TestSuites/jules.rst index 0181bc5b..cc0c686d 100644 --- a/source/Development/TestSuites/jules.rst +++ b/source/Development/TestSuites/jules.rst @@ -34,13 +34,6 @@ stored :ref:`KGO files `. See :ref:`multirepo` for details on how to carry out this testing. - .. important:: - - For **jules-shared** changes, when LFRic testing, the - changes need to be manually synced to the LFRic location. When UM - testing, this is not required as **jules-shared** is imported from the - JULES branch. - Below is a (by no means comprehensive) set of groups that you may wish to use on Met Office systems. diff --git a/source/Development/macros.rst b/source/Development/macros.rst index b83031d4..e7ffc15a 100644 --- a/source/Development/macros.rst +++ b/source/Development/macros.rst @@ -199,3 +199,12 @@ When setting this, the version is the last released version of LFRic Apps. If it's a linked Apps-Core PR, then set the ticket number based on the Apps Issue or PR. This avoids potential ticket number clashes between the repositories. + +Shared JULES Metadata Changes +----------------------------- + +:ref:`jules-shared` metadata resides in the JULES repository +and is imported by both the UM and LFRic. If changes are being made to the +``jules-shared`` metadata then a linked UM and LFRic Apps PR will be required to +add a macro. This macro should live in the ``um-atmos`` and ``jules-lsm`` +versions.py files respectively. diff --git a/source/Development/metadata_guidance.rst b/source/Development/metadata_guidance.rst index 14e10b5d..63e2fdd5 100644 --- a/source/Development/metadata_guidance.rst +++ b/source/Development/metadata_guidance.rst @@ -60,8 +60,8 @@ have identical metadata regardless of the repository where they reside Shared JULES metadata is in the process of being migrated to ``rose-meta/jules-shared``, in the JULES repository. The sub-directories are -imported by **rose-meta/um-atmos** and **rose-meta/jules-standalone** and is -manually synced with a copy in LFRic. Please see `Sharing JULES metadata +imported by **rose-meta/um-atmos** (UM), **rose-meta/jules-standalone** (JULES) +and **rose-meta/jules-lsm** (LFRic Apps). Please see `Sharing JULES metadata `__ for more details including what should be in `jules-shared `__ @@ -85,6 +85,11 @@ your metadata. This is largely based on how the UM does everything, so should be revisited after the CA2 activity is finished. The following sections have been +.. important:: + + If modifying ``jules-shared`` metadata, this will require a linked PR with + and upgrade macro in **both** UM (um-atmos) and LFRic Apps (jules-lsm). + Number of panels ---------------- diff --git a/source/Development/testing.rst b/source/Development/testing.rst index aebed5a2..94b67e29 100644 --- a/source/Development/testing.rst +++ b/source/Development/testing.rst @@ -158,11 +158,11 @@ commands, noting that ``--jules-path`` is only required if you have :ref:`guidance`. +-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| UM | ``./admin/rose-stem/update_all.py --path=/path/to/working/copy/of/test/branch --um=vnX.X_tXXXX [--jules-path=/path/to/jules/working/copy/of/branch]`` | +| UM | ``./admin/rose-stem/update_all.py --path=/path/to/working/copy/of/test/branch --um=vnX.X_tXXXX [--jules-path=/path/to/jules/clone]`` | +-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | JULES | ``./bin/upgrade_jules_test_apps vnX.X_tXXXX`` | +-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| LFRic | ``apply_macros.py vnX.Y_tZZZZ [--apps=/path/to/apps] [--core=/path/to/core] [--jules=/path/to/jules]`` | +| LFRic | ``apply_macros.py vnX.Y_tZZZZ [--apps=/path/to/apps] [--core=/path/to/core] [--jules=/path/to/jules/clone]`` | +-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ .. tip::