Skip to content

Resolve issues: #24, #64, #82, #118, other fixes #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkavulich wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Resolve issues: #24, #64, #82, #118, other fixes #148

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1c115c8
Address issue 60
mkavulich May 11, 2026
96290e5
Resolve #24: "vertical_layer_dimension" is redundant to just "vertica…
mkavulich May 12, 2026
c03c63f
Add definition for "interface" to the list
mkavulich May 12, 2026
3c1ed75
Update CI actions versions
mkavulich Jun 8, 2026
c7d2ab3
Fix remaining format statements to f-strings
mkavulich Jun 8, 2026
755454c
Raise better exceptions on xml_tools errors
mkavulich Jun 8, 2026
9ac9a08
Sort new names
mkavulich Jun 8, 2026
cede48c
Update metadata files
mkavulich Jun 8, 2026
dc6d8d2
Change mentions of "sea level" to "mean sea level" for clarity, as we…
mkavulich Jun 8, 2026
938bb11
Remove mwaxmonsky from CODEOWNERS per personal request
mkavulich Jun 8, 2026
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
18 changes: 9 additions & 9 deletions .github/workflows/pull_request_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

@climbfuji climbfuji Jun 8, 2026

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.

Look how up to date we are!


- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"

Expand All @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Install dependencies
run: |
Expand All @@ -50,10 +50,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"

Expand All @@ -74,10 +74,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"

Expand All @@ -95,10 +95,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"

Expand Down
20 changes: 10 additions & 10 deletions Metadata-standard-names.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,14 @@ Names indicating the size, extent, or bounds of data structures in a model.
* `real`: units = 1
* `upper_bound_of_vertical_dimension_of_surface_snow`: upper bound of of snow-related arrays for land surface model
* `integer`: units = count
* `vertical_dimension`: number of vertical layers
* `integer`: units = count
* `vertical_dimension_extended_up_by_1`: number of vertical layers extended up by 1
* `integer`: units = count
* `vertical_dimension_for_radiation`: Vertical dimension for radiation
* `integer`: units = count
* `vertical_dimension_minus_one`: Vertical dimension minus one
* `integer`: units = count
* `vertical_dimension_of_sea_ice`: Vertical dimension of sea ice
* `integer`: units = count
* `vertical_dimension_of_soil`: Vertical dimension of soil
Expand All @@ -302,12 +308,6 @@ Names indicating the size, extent, or bounds of data structures in a model.
* `integer`: units = count
* `vertical_interface_dimension_interstitial`: Vertical interface dimension interstitial
* `integer`: units = count
* `vertical_layer_dimension`: number of vertical layers
* `integer`: units = count
* `vertical_layer_dimension_extended_up_by_1`: number of vertical layers extended up by 1
* `integer`: units = count
* `vertical_layer_dimension_minus_one`: Vertical layer dimension minus one
* `integer`: units = count
## Constants
Constant parameters that should be identical across a full modeling system
* `avogadro_number`: Avogadro number
Expand Down Expand Up @@ -2434,6 +2434,8 @@ Thresholds represent some value at which the behavior of some process changes, i
* `volume_fraction_of_condensed_water_in_soil`: Volume fraction of condensed water in soil
* Equivalent CF name: `volume_fraction_of_condensed_water_in_soil`
* `real`: units = fraction
* `volume_fraction_of_equilibrium_soil_moisture`: Volume fraction of equilibrium soil moisture
* `real`: units = fraction
* `volume_fraction_of_frozen_soil_moisture_for_lsm`: Volume fraction of frozen soil moisture for land surface model
* `real`: units = fraction
* `volume_fraction_of_liquid_water_in_soil_at_critical_point`: volume fraction of water in liquid phase in soil at critical point
Expand All @@ -2442,16 +2444,14 @@ Thresholds represent some value at which the behavior of some process changes, i
* `real`: units = m3 m-3
* `volume_fraction_of_liquid_water_in_soil_at_wilting_point`: volume fraction of water in liquid phase in soil at wilting point
* `real`: units = m3 m-3
* `volume_fraction_of_soil_moisture_between_soil_bottom_and_water_table`: Volume fraction of soil moisture between soil bottom and water table
* `real`: units = fraction
* `volume_fraction_of_soil_moisture_for_lsm`: Volume fraction of soil moisture for land surface model
* `real`: units = fraction
* `volume_fraction_of_unfrozen_soil_moisture_for_lsm`: Volume fraction of unfrozen soil moisture for land surface model
* `real`: units = fraction
* `volume_fraction_of_unfrozen_water_in_soil`: Volume fraction of unfrozen water in soil
* `real`: units = fraction
* `volumetric_equilibrium_soil_moisture`: Volumetric equilibrium soil moisture
* `real`: units = m3 m-3
* `volumetric_soil_moisture_between_soil_bottom_and_water_table`: Volumetric soil moisture between soil bottom and water table
* `real`: units = m3 m-3
* `water_storage_in_aquifer`: Water storage in aquifer
* `real`: units = mm
* `water_storage_in_aquifer_and_saturated_soil`: Water storage in aquifer and saturated soil
Expand Down
40 changes: 20 additions & 20 deletions Metadata-standard-names.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,10 +536,22 @@ section:
description: upper bound of of snow-related arrays for land surface model
type: integer
units: count
- name: vertical_dimension
description: number of vertical layers
type: integer
units: count
- name: vertical_dimension_extended_up_by_1
description: number of vertical layers extended up by 1
type: integer
units: count
- name: vertical_dimension_for_radiation
description: Vertical dimension for radiation
type: integer
units: count
- name: vertical_dimension_minus_one
description: Vertical dimension minus one
type: integer
units: count
- name: vertical_dimension_of_sea_ice
description: Vertical dimension of sea ice
type: integer
Expand Down Expand Up @@ -568,18 +580,6 @@ section:
description: Vertical interface dimension interstitial
type: integer
units: count
- name: vertical_layer_dimension
description: number of vertical layers
type: integer
units: count
- name: vertical_layer_dimension_extended_up_by_1
description: number of vertical layers extended up by 1
type: integer
units: count
- name: vertical_layer_dimension_minus_one
description: Vertical layer dimension minus one
type: integer
units: count
- name: Constants
comment: Constant parameters that should be identical across a full modeling system
standard_names:
Expand Down Expand Up @@ -5049,6 +5049,10 @@ section:
description: Volume fraction of condensed water in soil
type: real
units: fraction
- name: volume_fraction_of_equilibrium_soil_moisture
description: Volume fraction of equilibrium soil moisture
type: real
units: fraction
- name: volume_fraction_of_frozen_soil_moisture_for_lsm
description: Volume fraction of frozen soil moisture for land surface model
type: real
Expand All @@ -5065,6 +5069,10 @@ section:
description: volume fraction of water in liquid phase in soil at wilting point
type: real
units: m3 m-3
- name: volume_fraction_of_soil_moisture_between_soil_bottom_and_water_table
description: Volume fraction of soil moisture between soil bottom and water table
type: real
units: fraction
- name: volume_fraction_of_soil_moisture_for_lsm
description: Volume fraction of soil moisture for land surface model
type: real
Expand All @@ -5077,14 +5085,6 @@ section:
description: Volume fraction of unfrozen water in soil
type: real
units: fraction
- name: volumetric_equilibrium_soil_moisture
description: Volumetric equilibrium soil moisture
type: real
units: m3 m-3
- name: volumetric_soil_moisture_between_soil_bottom_and_water_table
description: Volumetric soil moisture between soil bottom and water table
type: real
units: m3 m-3
- name: water_storage_in_aquifer
description: Water storage in aquifer
type: real
Expand Down
2 changes: 2 additions & 0 deletions StandardNamesRules.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,8 @@ Special phrases
+------------------------+-------------------------------------------------------------------------------------+
| frozen_water | ice |
+------------------------+-------------------------------------------------------------------------------------+
| interface | The vertical boundary of a model layer. |
+------------------------+-------------------------------------------------------------------------------------+
| longwave | Longwave radiation. Defined as thermal emission of radiation from the planet. |
+------------------------+-------------------------------------------------------------------------------------+
| moisture | water in all phases contained in soil |
Expand Down
30 changes: 15 additions & 15 deletions standard_names.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,18 @@
<standard_name name="upper_bound_of_vertical_dimension_of_surface_snow" description="upper bound of of snow-related arrays for land surface model">
<type units="count">integer</type>
</standard_name>
<standard_name name="vertical_dimension" description="number of vertical layers">
<type units="count">integer</type>
</standard_name>
<standard_name name="vertical_dimension_extended_up_by_1" description="number of vertical layers extended up by 1">
<type units="count">integer</type>
</standard_name>
<standard_name name="vertical_dimension_for_radiation">
<type units="count">integer</type>
</standard_name>
<standard_name name="vertical_dimension_minus_one">
<type units="count">integer</type>
</standard_name>
<standard_name name="vertical_dimension_of_sea_ice">
<type units="count">integer</type>
</standard_name>
Expand All @@ -425,15 +434,6 @@
<standard_name name="vertical_interface_dimension_interstitial">
<type units="count">integer</type>
</standard_name>
<standard_name name="vertical_layer_dimension" description="number of vertical layers">
<type units="count">integer</type>
</standard_name>
<standard_name name="vertical_layer_dimension_extended_up_by_1" description="number of vertical layers extended up by 1">
<type units="count">integer</type>
</standard_name>
<standard_name name="vertical_layer_dimension_minus_one">
<type units="count">integer</type>
</standard_name>
</section>
<section name="Constants" comment="Constant parameters that should be identical across a full modeling system">
<standard_name name="avogadro_number">
Expand Down Expand Up @@ -3588,6 +3588,9 @@
<cfname>volume_fraction_of_condensed_water_in_soil</cfname>
<type units="fraction">real</type>
</standard_name>
<standard_name name="volume_fraction_of_equilibrium_soil_moisture">
<type units="fraction">real</type>
</standard_name>
<standard_name name="volume_fraction_of_frozen_soil_moisture_for_lsm" description="Volume fraction of frozen soil moisture for land surface model">
<type units="fraction">real</type>
</standard_name>
Expand All @@ -3600,6 +3603,9 @@
<standard_name name="volume_fraction_of_liquid_water_in_soil_at_wilting_point" description="volume fraction of water in liquid phase in soil at wilting point">
<type units="m3 m-3">real</type>
</standard_name>
<standard_name name="volume_fraction_of_soil_moisture_between_soil_bottom_and_water_table">
<type units="fraction">real</type>
</standard_name>
<standard_name name="volume_fraction_of_soil_moisture_for_lsm" description="Volume fraction of soil moisture for land surface model">
<type units="fraction">real</type>
</standard_name>
Expand All @@ -3609,12 +3615,6 @@
<standard_name name="volume_fraction_of_unfrozen_water_in_soil">
<type units="fraction">real</type>
</standard_name>
<standard_name name="volumetric_equilibrium_soil_moisture">
<type units="m3 m-3">real</type>
</standard_name>
<standard_name name="volumetric_soil_moisture_between_soil_bottom_and_water_table">
<type units="m3 m-3">real</type>
</standard_name>
<standard_name name="water_storage_in_aquifer">
<type units="mm">real</type>
</standard_name>
Expand Down
18 changes: 6 additions & 12 deletions tools/lib/xml_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,20 @@ def validate_xml_file(filename, schema_file, logger, error_on_noxmllint=False):
"""
# Check the filename
if not os.path.isfile(filename):
raise ValueError(f"validate_xml_file: Filename, '{filename}', does not exist")
if not os.access(filename, os.R_OK):
raise ValueError(f"validate_xml_file: Cannot open '{filename}'")
raise FileNotFoundError(f"validate_xml_file: Filename, '{filename}', does not exist")
if not os.path.isfile(schema_file):
raise ValueError(f"validate_xml_file: Cannot find schema file {schema_file}")
if not os.access(schema_file, os.R_OK):
emsg = "validate_xml_file: Cannot open schema, '{}'"
raise ValueError(emsg.format(schema_file))
raise FileNotFoundError(f"validate_xml_file: Cannot find schema file {schema_file}")
if _XMLLINT is not None:
if logger is not None:
lmsg = "Checking file {} against schema {}"
logger.debug(lmsg.format(filename, schema_file))
logger.debug(f"Checking file {filename} against schema {schema_file}")
cmd = [_XMLLINT, '--noout', '--schema', schema_file, filename]
result = call_command(cmd, logger)
return result
lmsg = "xmllint not found, could not validate file {}"
lmsg = f"xmllint not found, could not validate file {filename}"
if error_on_noxmllint:
raise ValueError("validate_xml_file: " + lmsg.format(filename))
raise ImportError("validate_xml_file: " + lmsg)
if logger is not None:
logger.warning(lmsg.format(filename))
logger.warning(lmsg)
return True # We could not check but still need to proceed

###############################################################################
Expand Down
3 changes: 1 addition & 2 deletions tools/write_standard_name_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ def parse_section(snl, sec, level='##'):
units = item.get('units')
snl.write(f' * `{txt}`: units = {units}\n')
else:
emsg = "Unknown standard name property, '{}'"
raise ValueError(emsg.format(item.tag))
raise ValueError(f"Unknown standard name property, '{item.tag}'")


def convert_xml_to_yaml(root, library_name, yaml_file):
Expand Down
Loading