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

Update to CICE-Consortium/main (2024-09-28) #93

Merged
merged 2 commits into from
Sep 30, 2024

Conversation

NickSzapiro-NOAA
Copy link
Collaborator

@NickSzapiro-NOAA NickSzapiro-NOAA commented Sep 28, 2024

For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers

PR checklist

  • Short (1 sentence) summary of your PR:
    Move pio_errorhandling call. Add ifndef __INTEL_LLVM_COMPILER (for intel oneapi) around an OMP loop that the compiler doesn't handle properly in ice_history.F90. An update to BGC and Icepack interfaces was already synced, but needs a fix for UFS to remove ncat,ntrcr in call icepack_aggregate in ice_prescribed_mod.F90 following Icepack refactor.
  • Developer(s):
    Tony Craig, Dusan Jovic, Denise Worthen, Jim Edwards, Nick Szapiro
  • 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.
    b4b in CICE and UFS RT suites
  • 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 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.

EMC/CICE sync to authoritative upstream, needed to support LLVM compiler PR (ufs-community/ufs-weather-model#2224) at top of UFS commit queue

apcraig and others added 2 commits September 27, 2024 10:42
Update derecho port

    update inteloneapi, validate, use -O1, problems with -check all.
    update cray to ncarenv/23.09 and cce/16.0.1, answers change
    update intel to ncarenv/23.09 and intel/2023.2.1, answer bit-for-bit
    update nvhpc to ncarenv/23.09 and nvhpc/23.7, answers change
    update queue so smaller jobs go into develop (shared) instead of main

Add ifndef __INTEL_LLVM_COMPILER (for intel oneapi) around an OMP loop that the compiler doesn't handle properly (reported to intel) in ice_history.F90.

Update QC documentation in the user guide to clarify where/how to run the cice.t-test.py script.
@NickSzapiro-NOAA NickSzapiro-NOAA merged commit 5e57a89 into NOAA-EMC:develop Sep 30, 2024
1 check passed
@NickSzapiro-NOAA NickSzapiro-NOAA deleted the cice_llvm branch October 7, 2024 04:32
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.

Sync with CICE-Consortium for scheduled LLVM UFS PR
4 participants