Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions source/Development/TestSuites/jules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ stored :ref:`KGO files <kgo>`.

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.

Expand Down
9 changes: 9 additions & 0 deletions source/Development/macros.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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<shared-namelists>` 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.
9 changes: 7 additions & 2 deletions source/Development/metadata_guidance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
<https://github.com/MetOffice/jules/wiki/sharing_jules_metadata>`__ for
Comment thread
maggiehendry marked this conversation as resolved.
more details including what should be in `jules-shared
<https://github.com/MetOffice/jules/wiki/sharing_jules_metadata#whats-in-jules-shared>`__
Expand All @@ -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
----------------

Expand Down
4 changes: 2 additions & 2 deletions source/Development/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ commands, noting that ``--jules-path`` is only required if you have
:ref:`guidance<shared-namelists>`.

+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 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::
Expand Down
Loading