update CICE with latest consortium/main #1562
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
changed the title
BrianCurtis-NOAA
added
the
Ready for Commit Queue
|
We can start testing this PR. I will try from hera. |
|
Jenkins-ci ORT output |
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
|
Automated RT Failure Notification |
jkbk2004
requested review from
SadeghTabas-NOAA,
zach1221,
BrianCurtis-NOAA and
jkbk2004
|
Dogwood (WCOSS2) was having issues on Friday and it's going to be unavailable today. Will need to create baselines after it comes back. |
BrianCurtis-NOAA
approved these changes
Jan 23, 2023
zach1221
approved these changes
Jan 23, 2023
jkbk2004
approved these changes
Jan 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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_nmlin 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
cicedynBsubdirectory has also be renamed tocicedyn, with associated changes incice_files.cmake.Top of commit queue on: TBD
Input data additions/changes
Anticipated changes to regression 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 thecpld_control_ciceC_p8test. 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:
Combined with PR's (If Applicable):
Commit Queue Checklist:
Linked PR's and Issues:
Depends on NOAA-EMC/CICE#56
Closes NOAA-EMC/CICE#55
Testing Day Checklist:
Testing Log (for CM's):