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

E3SM CICE mods to Consortium for E3SM Icepack #874

Closed
wants to merge 35 commits into from

Conversation

apcraig
Copy link
Contributor

@apcraig apcraig commented Sep 26, 2023

No description provided.

apcraig and others added 27 commits September 30, 2022 16:46
* Update CICE to run with eclare108213/Icepack branch snicar

- including eclare108213/Icepack#13, Sept 11, 2022
- Passes full CICE test suite on cheyenne with 3 compilers except alt04 changes
  answers for all compilers and all tests.  CICE #fea412a55f was baseline.
- Icepack submodule still points to standard version on main, need to be
  swapped manually to appropriate development version.

* Remove faero_optics

* update ciceexe string to account for USE_SNICARHC CPP

* Update documentation

* Update test suite to add modal testing

* Point Icepack submodule to cice-consortium/E3SM-icepack-initial-integration

Update to snicar branch merge, #8aef3f785ce
* New e3sm and e3smbgc namelist options

* Update E3SM test options

* Add a simple e3sm test suite

* atmbndy is not actually different

* Additional changes
Update to CICE-Consortium main #422117fc5d Oct 9, 2022
add Tliquidus_max namelist parameter to CICE
- Update tfrz_option, add _old options for backwards bit-for-bit
- Fix unittests
- Add hi_min to namelist and tests
Add Tf to icepack interface calls and constant tfrz_option.
Update from CICE Consortium main #cb58257857
Update to CICE-Consortium main, CICE6.4.1 release, #f813294, Dec 9, 2022
…ntegration including Icepack1.3.3 release, Dec 15, 2022.
Update to CICE-Consortium main, CICE6.4.1 release, #f813294, Dec 9, 2022
…ice230202

Merge CICE-Consortium CICE main #b946a95ea460 to E3SMIcepackDEV branch, Feb 2, 2023
…ad of cice-consortium/E3SM-icepack-initial-integration Feb 3, 2023
Merge Consortium CICE main #b946a95ea460 and update Icepack to #87db73ba6d93747a9
Merge CICE 7df80ba from CICE-Consortium main to branch, March 24, 2023
Includes Icepack 5f4cd195b7
Required update to CICE_InitMod.F90 in unittests due to changes in Icepack interface, Tf
Update Icepack and CICE, March 17, 2023, from Consortium main
…cep230524

Update to CICE-Consortium main #6703bc533, May 24, 2023
Includes Icepack update from same date
Update branch from CICE main #6703bc533
…3SMIcepackDEV

Merge CICE-Consortium #8322416793ae2b76c2 Aug 18, 2023 and Update Icepack to E3SM Icepack #e7510221a315ab Aug 21, 2023
Merge CICE-Consortium #8322416793ae2b76c2 Aug 18, 2023 and Update Icepack to E3SM Icepack #e7510221a315ab Aug 21, 2023
Copy link
Contributor

@eclare108213 eclare108213 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks scary, but I think careful documentation in the PR (and readthedocs as needed) will help clarify what's happening. Namelist and history/diagnostic changes in this icepack PR haven't been implemented in CICE yet: CICE-Consortium/Icepack#458. @dabail10 was working on that. There might be other things like that.

apcraig and others added 2 commits September 28, 2023 10:43
…3smup3

Update Branch to Consortium CICE main #55342ca7cb4a1be511ade6249e349cb8a8095881, Sept 27, 2023

Update Icepack to E3SM-Project Icepack cice-consortium/E3SM-icepack-initial-integration #78286bfa0b2f8a9dc446f61a76e7a57499c96715, Sept 26, 2023
Update CICE from Consortium Main and Icepack from E3SM Icepack
apcraig and others added 3 commits October 4, 2023 09:26
…recover Consortium main results

Update Icepack to the latest hash on E3SM-Project Icepack cice-consortium/E3SM-icepack-initial-integration, #96f2fc707fc743d7

Prior commit was a merge from CICE Consortium Main, #d466031001cf447bcd64220c842dcd2707f61e9, Sept 29, 2023
Update CICE and Icepack to latest versions, Oct 4, 2023
@apcraig apcraig marked this pull request as ready for review October 4, 2023 22:07
@apcraig apcraig changed the title DO NOT MERGE: E3SM CICE mods to Consortium for E3SM Icepack E3SM CICE mods to Consortium for E3SM Icepack Oct 4, 2023
@apcraig apcraig self-assigned this Oct 4, 2023
@apcraig apcraig added the Icepack label Oct 4, 2023
Update Icepack to Consortium #8fad768ce400536
@apcraig
Copy link
Contributor Author

apcraig commented Oct 4, 2023

Closing, with create new PR.

@apcraig apcraig closed this Oct 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants