Skip to content

Update Icepack, update documentation, minor bibtex and gptl updates#1015

Merged
apcraig merged 4 commits intoCICE-Consortium:mainfrom
apcraig:doc
Apr 9, 2025
Merged

Update Icepack, update documentation, minor bibtex and gptl updates#1015
apcraig merged 4 commits intoCICE-Consortium:mainfrom
apcraig:doc

Conversation

@apcraig
Copy link
Copy Markdown
Contributor

@apcraig apcraig commented Apr 8, 2025

PR checklist

  • Short (1 sentence) summary of your PR:
    Update Icepack, update documentation, minor bibtex and gptl updates
  • Developer(s):
    apcraig
  • Suggest PR reviewers from list in the column to the right.
  • Please copy the PR test results link or provide a summary of testing completed below.
    Bit-for-bit on derecho full test suite except BGC cases due to Icepack silicate fix (expected), https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#0355cef27d6d8765b711a2e0a5974eff83fdedf1
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit except BGC
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on Icepack or any other models?
    • Yes
    • No
  • Does this PR update the Icepack submodule? If so, the Icepack submodule must point to a hash on Icepack's main branch.
    • Yes
    • No
  • Does this PR add any new test cases?
    • Yes
    • No
  • Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/. A test build of the technical docs will be performed as part of the PR testing.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please document the changes in detail, including why the changes are made. This will become part of the PR commit log.

Update Icepack to #51695d08d92c20 April 4, 2025. Includes
- Update derecho gnu and code coverage capability
- Update Copyright
- Fix bug with calc_Tsfc=F, set_sfcflux arguments reversed in icepack_therm_vertical.F90
- Fix negative silicate bgc bug
- Update of Mosaic forcing option

Comment out gptl pid check in ice_memusage_gptl.c. The check is not needed, and the arbitrary value of 999999 occasionally fails because on many systems the upper limit is higher. This has not come up in CICE, but it has been noted in other models' use of gptl, https://cerfacs.fr/site-oasis/forum/oa_main.php?c=177.

Update documentation regarding history variable units and cona and conb history variable conversion terms.

Update sphinx-bibtex version in doc requirements. Readthedocs now works with the latest version.

Closes #546
Closes #1014

apcraig added 3 commits April 7, 2025 13:26
- Update derecho gnu and code coverage capability
- Update Copyright
- Fix bug with calc_Tsfc=F, set_sfcflux arguments reversed in icepack_therm_vertical.F90
- Fix negative silicate bgc bug
- Update of Mosaic forcing option

Comment out gptl pid check in ice_memusage_gptl.c.  The check is not needed, and the
arbitrary value of 999999 occasionally fails because on many systems the upper
limit is higher.  This has not come up in CICE, but it has been noted in
other models' use of gptl, https://cerfacs.fr/site-oasis/forum/oa_main.php?c=177.

Update documentation regarding history variable units and cona and
conb history variable conversion terms.
Copy link
Copy Markdown
Contributor

@eclare108213 eclare108213 left a comment

Choose a reason for hiding this comment

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

One small correction in the docs, otherwise looks great. Thanks -

Comment thread doc/source/cice_index.rst Outdated
"coldice", "value for constant albedo parameterization", "0.70"
"coldsnow", "value for constant albedo parameterization", "0.81"
"cona", "history units converion variable, multiplication term", "1.0"
"conb", "history units converion variable, additive term", "0.0"
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.

correct spelling of conversion, both lines

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

good catch, I corrected it.

Comment thread icepack
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.

Why are there all these changes to the source code?

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.

This PR updates CICE with the newest Icepack, with all its changes.

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.

Oh, I missed the icepack PR.

@apcraig apcraig merged commit ce8cc30 into CICE-Consortium:main Apr 9, 2025
2 checks passed
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 on units for output sphinx bibtex changes

3 participants