Skip to content

Conversation

@Hallberg-NOAA
Copy link
Member

Cleaned up various aspects of the units arguments to get_param() calls to follow the patterns used elsewhere in the SIS2 and MOM6 code. These include:

  • 2 instances where the units arguments were moved to be on the same line as the default arguments.
  • 6 instances where "m/s" or "g/kg" were changed to "m s-1" or "g kg-1" to align with CMIP standard syntax.
  • 8 instances where there was extra space around the name assignment of an argument (e.g., changing 'units = ...' to 'units=...').
  • 1 instance where the units of "none" were changed to "nondim"

In addition, an unused and unlogged call to read ICE_BULK_SALNITY was eliminated from ice_model_init. All solutions are bitwise identical, but there are minor formatting changes to the units logged in the SIS_parameter_doc files for some variables.

Copy link
Contributor

@MitchBushuk MitchBushuk left a comment

Choose a reason for hiding this comment

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

This PR makes some basic text and units cleanup, and looks to be all correct.

  Cleaned up various aspects of the units arguments to `get_param()` calls to
follow the patterns used elsewhere in the SIS2 and MOM6 code.  These include:

  - 2 instances where the units arguments were moved to be on the same line as the
default arguments.
  - 6 instances where "m/s" or "g/kg" were changed to "m s-1" or "g kg-1" to
    align with CMIP standard syntax.
  - 8 instances where there was extra space around the name assignment of an
    argument (e.g., changing 'units = ...' to 'units=...'.
  - 1 instance where the units of "none" were changed to "nondim"

In addition, an unused and unlogged call to read ICE_BULK_SALNITY was eliminated
from ice_model_init.  All solutions are bitwise identical, but there are minor
formatting changes to the units logged in the SIS_parameter_doc files for some
variables.
@Hallberg-NOAA Hallberg-NOAA force-pushed the units_argument_cleanup branch from d89f941 to 189dc3c Compare January 13, 2026 22:25
@Hallberg-NOAA
Copy link
Member Author

This PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/mom6ci/SIS2/-/pipelines/29838 with the expected warnings about changes to the units in the SIS_parameter_doc files.

@Hallberg-NOAA Hallberg-NOAA merged commit 833980a into NOAA-GFDL:dev/gfdl Jan 13, 2026
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.

2 participants