Update to CICE-Consortium main, CICE6.4.1 release, #f813294, Dec 9, 2022#106
Merged
Conversation
* Update Icepack to #5999551 Update advection description in document Update f_bound setting in ice_history.F90
* Bring Consortium main into CESM * Comment out OMP initialization * Update wave-ice coupling in NUOPC/CMEPS driver * Update saltflux option to be constant and use ice_ref_salinity * Fix a couple inconsistencies with CICE Consortium master * Fix some issues * Fix some merge issues * Fix some merge issues * Fix ACC directive * Bug fixes with eap initialization * Fix evp initialization * Add warning when ktherm=1 and saltflux_option not constant * Comment out Tair initialization * Add CESMCOUPLED around OMP initialization * CESM File unit handling * Change icepack hash for PR * Some cleanup things * Move nu_diag_set to CESMCOUPLED region * Put Tair initialization in a CESMCOUPLED * New saltflux tests * Update icepack for saltflux option * Update icepack
* Update stress12T calculation for C-grid stress12T was zero. Compute stress12T in subroutine stressC_T after computing estimate of shearT by averaging shearU. minor updates to some indentation and variable names. * Update calc of stress12T and shearT for C-grid for performance, changes answers
Update to CICE-Consortium main, CICE6.4.1 release, #f813294, Dec 9, 2022
…ntegration including Icepack1.3.3 release, Dec 15, 2022.
eclare108213
approved these changes
Dec 16, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
PR checklist
Update to CICE-Consortium main, CICE6.4.1 release, #f813294, Dec 9, 2022
apcraig
All results are bit-for-bit with CICE6.4.1 release. https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#ec8632ff210525aa1569048ea80e7fb647b811d6. Many restart comparisons are different due to Tsfc at non-ice points (expected), but log files are identical in those cases.
Includes update to E3SM-Project/Icepack/cice-consortium/E3SM-icepack-initial-integration including Icepack1.3.3 release, Dec 15, 2022.