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 CICE with latest consortium/main #1562

Merged
merged 18 commits into from
Jan 23, 2023

Conversation

DeniseWorthen
Copy link
Collaborator

@DeniseWorthen DeniseWorthen commented Jan 9, 2023

Description

Updates CICE to the latest Consortium/main.

Includes a bug-fix for ktherm=2 (mushy thermodynamics) with optional new feature to use the actual (prognostic) bulk ice salinity in place of constant (4psu) ice salinity when ktherm=2. This feature is not turned on in this PR. To enable the feature, a new namelist option should be added to the forcing_nml in ice_in:

saltflux_option = 'prognostic'

This feature should only be used with ktherm=2. Enabling it would change baselines for all ktherm=2 tests.

The cicedynB subdirectory has also be renamed to cicedyn, with associated changes in cice_files.cmake.

Top of commit queue on: TBD

Input data additions/changes

  • No changes are expected to input data.
  • There will be new input data.
  • Input data will be updated.

Anticipated changes to regression tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests:

Changes were tested on cheyenne.intel and cheyenne.gnu with the following results:

-All coupled tests (which all use ktherm=2) and the single NG-GODAS test using ktherm=2 (datm_cdeps_gfs) will change answers due to bug-fix. This was verified by running the baselines with the 2-line bug-fix reverted. Baselines using ktherm=2 reproduced in this case except the cpld_control_ciceC_p8 test. The C-grid test changes due to additional bug-fix that is only applicable to C-grid.

-All NG-GODAS tests using ktherm=1, with the exception of debug, will change answers due to code refactoring associated with new prognostic salt-flux feature.

Subcomponents involved:

  • AQM
  • CDEPS
  • CICE
  • CMEPS
  • CMakeModules
  • FV3
  • GOCART
  • HYCOM
  • MOM6
  • NOAHMP
  • WW3
  • stochastic_physics
  • none

Combined with PR's (If Applicable):

Commit Queue Checklist:

  • Link PR's from all sub-components involved
  • Confirm reviews completed in sub-component PR's
  • Add all appropriate labels to this PR.
  • Run full RT suite on either Hera/Cheyenne with both Intel/GNU compilers
  • Add list of any failed regression tests to "Anticipated changes to regression tests" section.

Linked PR's and Issues:

Depends on NOAA-EMC/CICE#56

Closes NOAA-EMC/CICE#55

Testing Day Checklist:

  • This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR.
  • Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.

Testing Log (for CM's):

  • RDHPCS
    • Intel
      • Hera
      • Orion
      • Jet
      • Gaea
      • Cheyenne
    • GNU
      • Hera
      • Cheyenne
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

DeniseWorthen and others added 4 commits January 7, 2023 00:12
* reverting the bug fix for ktherm=2 allows all cpld tests to pass
and the single datm test using ktherm=2 (datm_cdeps_gfs) to also pass
all other datm tests which use ktherm=1 fail
@DeniseWorthen DeniseWorthen added the Baseline Updates Current baselines will be updated. label Jan 9, 2023
@DeniseWorthen DeniseWorthen changed the title update cice with latest consortium/main update CICE with latest consortium/main Jan 10, 2023
@BrianCurtis-NOAA BrianCurtis-NOAA added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label Jan 17, 2023
@jkbk2004
Copy link
Collaborator

We can start testing this PR. I will try from hera.

@zach1221 zach1221 added the jenkins-ci Jenkins CI: ORT build/test on docker container label Jan 20, 2023
@zach1221
Copy link
Collaborator

Jenkins-ci ORT output
ORT 1562 Output logs.pdf

on-behalf-of @ufs-community <brian.curtis@noaa.gov>
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: gaea
Compiler: intel
Job: BL
[BL] Repo location: /lustre/f2/pdata/ncep/emc.nemspara/autort/pr/1191480151/20230120194508/ufs-weather-model
Please make changes and add the following label back: gaea-intel-BL

@BrianCurtis-NOAA
Copy link
Collaborator

Dogwood (WCOSS2) was having issues on Friday and it's going to be unavailable today. Will need to create baselines after it comes back.

@jkbk2004 jkbk2004 merged commit 70de7ef into ufs-community:develop Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Baseline Updates Current baselines will be updated. jenkins-ci Jenkins CI: ORT build/test on docker container Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Update to latest Consortium/main
4 participants