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, CICE6.4.1 release, #f813294, Dec 9, 2022 #106

Merged
merged 5 commits into from
Dec 16, 2022

Conversation

apcraig
Copy link
Owner

@apcraig apcraig commented Dec 15, 2022

PR checklist

  • Short (1 sentence) summary of your PR:
    Update to CICE-Consortium main, CICE6.4.1 release, #f813294, Dec 9, 2022
  • 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.
    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.
  • 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, points to E3SM-Project/Icepack/cice-consortium/E3SM-icepack-initial-integration
  • 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 provide any additional information or relevant details below:

Includes update to E3SM-Project/Icepack/cice-consortium/E3SM-icepack-initial-integration including Icepack1.3.3 release, Dec 15, 2022.

apcraig and others added 5 commits December 2, 2022 15:35
* 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.
@apcraig apcraig requested a review from eclare108213 December 15, 2022 23:22
@apcraig apcraig self-assigned this Dec 15, 2022
@apcraig apcraig merged commit a324099 into E3SMIcepackDEV Dec 16, 2022
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.

3 participants