Skip to content

Changes made to reflect jules-shared developments#138

Merged
James Bruten (james-bruten-mo) merged 12 commits into
mainfrom
jules-shared_extend
Mar 6, 2024
Merged

Changes made to reflect jules-shared developments#138
James Bruten (james-bruten-mo) merged 12 commits into
mainfrom
jules-shared_extend

Conversation

@maggiehendry
Copy link
Copy Markdown
Collaborator

@maggiehendry Maggie (maggiehendry) commented Feb 12, 2024

Changes made throughout the working practices to accommodate the developments to the jules-shared metadata related to um:#7391.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

One minor comment that isn't critical - generally all well captured, thanks.

which resides 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 the `Sharing
JULES metadata
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think this should either be "Please see Sharing JULES metadata" or "Please see the Sharing JULES metadata wiki"

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Changed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hi Maggie, mostly fine, but as noted on the UM ticket I think we need to make the jules-path a requirement. I think I've highlighted everywhere this needs doing. If I've missed any then please do those as well. Cheers

Comment thread source/WorkingPractices/testing.rst
Comment thread source/WorkingPractices/metadata_guidance.rst
Comment thread source/WorkingPractices/metadata_guidance.rst
Comment thread source/Reviewers/howtocommit.rst
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just a couple of other things having looked through this again with the latest upgrade_all changes

Comment thread source/WorkingPractices/testing.rst Outdated
| JULES | ./bin/upgrade_jules_test_apps vnX.X_tXXXX |
+-------+----------------------------------------------------------------------------------------+
+-------+----------------------------------------------------------------------------------------------------------------------------------------------+
| UM | ``$UMDIR/bin/update_all.py --path=/path/to/working/copy/of/test/branch --um=vnX.X_tXXXX --jules-path=/path/to/jules/working/copy/of/branch`` |
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just having another look through these after the latest set of UM changes. Could you add square brackets around the jules argument to indicate it's optional please.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I've made the change.

where the ``-C`` option can be omitted if inside the app's
directory.

.. Important::
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

And can you move this "important" box above the "Note" box that starts on line 90

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I had added the important box so that it appeared within the note box as it applied to the instructions in the note box. If I move it above the note box, then it'll look like it applies to the update_all.py instructions, which it doesn't.

Either the --force argument or one of the upgrade macro arguments are
required.

Options:
  -h, --help            show this help message and exit
  -P PATH, --path=PATH  Path to working copy (defaults to ".")
  -u UM, --um=UM        Version of UM atmos to upgrade to
  -U MAKEUM, --makeum=MAKEUM
                        Version of FCM_make UM to upgrade to
  -S, --sort            Option to hash sort and remove duplicate namelists
  -D, --delprofs        Option to remove unused profile namelists
  -C CREATEBC, --createbc=CREATEBC
                        Version of CreateBC to upgrade to
  -F, --force           Use the force to ensure apps and metadata consistent
                        they are
  -j N_PROC, --nproc=N_PROC
                        Number of concurrent processes to use

Use the force to all apps fix you need commands and warning added to ensure Cylc7 is used with vn13.5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update to reflect rose-meta/jules-shared import from JULES branch

3 participants