[release/v1] Updating from main in preparation for PR to main.#127
Merged
mkavulich merged 16 commits intoESCOMP:release/v1from Oct 23, 2025
Merged
[release/v1] Updating from main in preparation for PR to main.#127mkavulich merged 16 commits intoESCOMP:release/v1from
mkavulich merged 16 commits intoESCOMP:release/v1from
Conversation
…SCOMP#80) * Update StandardNamesRules.rst: add _due_to_PBL_processes and other process suffixes
* Add JEDI skin temperature variables * Change sea to ocean
This adds emissions names to the CCPP standard names
…P#98) - Remove references to CCPP except where relevant - Cherry-pick changes to tools/write_standard_name_table.py from release branch that allows for subsections in standard names and markdown table - Group CCPP-specific variables into a dedicated section - Change some long_name descriptions to remove CCPP-specific wording - A few more details in README.md
* Remove old code owner * Add new UKMO code owner --------- Co-authored-by: DESTOUCHES Mayeul <mayeul.destouches@umr-cnrm.fr>
…OMP#106) There are many misspellings in the existing main branch, not only in the long_name descriptions but in the standard_name entries themselves. This PR addresses the ones I have identified so far.
This PR adds in new aerosol variables needed for the Met Office LFRIC forecast model. These are the number and mass fractions for the two dust modes in the UKCA/GLOMAP aerosol model.
…ly when pull requests are merged (ESCOMP#117) This pull request adds the capability to render the XML standard names dictionary to Yaml, in addition to the existing rendering to Markdown. I decided to render comments into long strings that the Python Yaml library then wraps correctly. I validated the resulting Yaml file using https://yamlchecker.com and it is valid. This pull request further updates the existing GitHub action for consistency and standard Yaml formatting (2-space indentation), and replaces the check if the Markdown is updated with tests to render the xml to both md and yaml. Lastly, a second GitHub workflow is added that automatically renders the xml to md and yaml and commits the files to the repository. This action is only run when the authoritative branch (main) is updated (push = merge a pull request). I tested this action in my fork of ESM standard names (see https://github.com/climbfuji/CCPPStandardNames/actions/runs/15637497788/job/44056347886). What I did not test is how this works with branch protection (my main branch was not protected). We will find out if additional settings/changes are needed once this PR is approved and merged. Closes ESCOMP#113
Add a Pull Request template providing instructions on what information to include when opening a Pull Request. Some rules/guidelines initially in the governance document have been moved here as well.
Because it is a bit of a hassle for PR authors to have to make changes to multiple files, ESCOMP#117 attempted to automate the process using the `tools/write_standard_name_table.py` tool. However, this new GitHub action could not run automatically due to branch protection rules on the `main` branch. Rather than remove those restrictions, this PR reverts to the old method of manual updates, but provides more extensive documentation and user prompts to do this updating properly.
add glomap dust modes (ESCOMP#111) This PR adds in new aerosol variables needed for the Met Office LFRIC forecast model. These are the number and mass fractions for the two dust modes in the UKCA/GLOMAP aerosol model.
Add xml to yaml converter, update Markdown and Yaml files automatically when pull requests are merged (ESCOMP#117) This pull request adds the capability to render the XML standard names dictionary to Yaml, in addition to the existing rendering to Markdown. I decided to render comments into long strings that the Python Yaml library then wraps correctly. I validated the resulting Yaml file using https://yamlchecker.com and it is valid. This pull request further updates the existing GitHub action for consistency and standard Yaml formatting (2-space indentation), and replaces the check if the Markdown is updated with tests to render the xml to both md and yaml. Lastly, a second GitHub workflow is added that automatically renders the xml to md and yaml and commits the files to the repository. This action is only run when the authoritative branch (main) is updated (push = merge a pull request). I tested this action in my fork of ESM standard names (see https://github.com/climbfuji/CCPPStandardNames/actions/runs/15637497788/job/44056347886). What I did not test is how this works with branch protection (my main branch was not protected). We will find out if additional settings/changes are needed once this PR is approved and merged. Closes ESCOMP#113
Initial PR template (ESCOMP#119) Add a Pull Request template providing instructions on what information to include when opening a Pull Request. Some rules/guidelines initially in the governance document have been moved here as well.
New procedure for updating .md and .yaml files (ESCOMP#122) Because it is a bit of a hassle for PR authors to have to make changes to multiple files, ESCOMP#117 attempted to automate the process using the `tools/write_standard_name_table.py` tool. However, this new GitHub action could not run automatically due to branch protection rules on the `main` branch. Rather than remove those restrictions, this PR reverts to the old method of manual updates, but provides more extensive documentation and user prompts to do this updating properly.
mkavulich
requested review from
cacraigucar,
climbfuji,
dustinswales,
gold2718,
grantfirl,
mattldawson,
mwaxmonsky,
nusbaume,
peverwhee,
ss421 and
svahl991
as code owners
climbfuji
reviewed
Oct 8, 2025
Collaborator
There was a problem hiding this comment.
this codeowner file contains errors, we need to fix
Collaborator
Author
There was a problem hiding this comment.
I added @MarekWlasak as a collaborator; this probably should have been done earlier since his name has been in the CODEOWNERS file of the main branch since March. Once he accepts the error should resolve.
gold2718
approved these changes
Oct 9, 2025
Collaborator
gold2718
left a comment
gold2718
left a comment
There was a problem hiding this comment.
I think this is generally okay but I would like to put in a plea to not have end-of-line whitespace so changes there do not show up.
README.md
Outdated
|
|
||
| A Markdown file describing the standard names | ||
| [is included](https://github.com/ESCOMP/ESMStandardNames/blob/main/Metadata-standard-names.md). | ||
| Rules governing the designation and format of standard names can be found in [StandardNamesRules.rst](https://github.com/ESCOMP/ESMStandardNames/blob/main/StandardNamesRules.rst). |
Collaborator
There was a problem hiding this comment.
I think this is one case where the the main version should be preserved (i.e., please do not introduce end-of-line whitespace).
climbfuji
approved these changes
Oct 9, 2025
nusbaume
approved these changes
Oct 23, 2025
mkavulich
added a commit
to mkavulich/ESMStandardNames
that referenced
this pull request
Nov 10, 2025
I thought this was achieved by ESCOMP#127 but apparently I missed some conflicts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR merges the latest commits from main, reconciling with recent rules/standards changes in this branch. After this is merged we can start the process of making this major merge back to main.
Issues
None