Skip to content
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.

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

Merge CICE-Consortium main #23a8faf Jan 25, 2023 to E3SM Icepack #19

Conversation

apcraig
Copy link
Collaborator

@apcraig apcraig commented Jan 25, 2023

PR checklist

  • Short (1 sentence) summary of your PR:
    Merge CICE-Consortium main #23a8faf Jan 25, 2023 to E3SM Icepack
  • 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.
    Full test suite run on cheyenne with intel, gnu, and pgi with Icepack and CICE (using apcraig/E3SMIcepackDEV branch). Icepack is bit-for-bit against Icepack Consortium main #3a4d02e6e2 except for modal tests (expected). CICE is bit-for-bit in log files with CICE Consortium main #f813294108.
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on CICE or any other models?
    • 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/.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please provide any additional information or relevant details below:

dabail10 and others added 4 commits December 16, 2022 16:44
…rm1 and therm2 (CICE-Consortium#423)

* Refactor isotope implementation with respect to optional arguments
- Use argcheck design
- Eliminate local copies of optional data
- Pass optional arguments down the calling tree
- Some minor format cleanup

* - Continue update of isotope implementation in Icepack including HDO_ocn, H2_16O_ocn, H2_18O_ocn
- Modify fsloss optional argument implementation
- Modify rsnwn, smicen, smliqn optional argument implementation

* - Update fswtrhu_[vi]d[fr] optional argument implementation
- Clean up some formatting

* Create icepack_chkoptargflag function for optional argument checking
The Makefile macro file for conda on Linux was not updated when
Icepack learned to do NetCDF output in e1f3574 (Netcdf History
Capability (CICE-Consortium#368), 2021-08-30), on the macOS one was updated.
Tweak the Linux build similarly.
…o e3smicep230125

Merge CICE-Consortium main #23a8faf Jan 25, 2023 to E3SM Icepack
@apcraig apcraig requested a review from eclare108213 January 25, 2023 20:07
@eclare108213 eclare108213 merged commit ef7491f into E3SM-Project:cice-consortium/E3SM-icepack-initial-integration Jan 25, 2023
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.

None yet

4 participants