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.

Sign up for GitHub

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

Jump to bottom

Update CICE for E3SM Icepack modifications #879

Merged
merged 35 commits into from
Oct 5, 2023
Merged

Update CICE for E3SM Icepack modifications #879

merged 35 commits into from
Oct 5, 2023

Commits on Sep 30, 2022

  1. Update CICE to run with eclare108213/Icepack branch snicar (#100) 

    * 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
    @apcraig
    apcraig committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    3ca3a81 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2022

  1. Add E3SM namelists for CICE. (#101) 

    * New e3sm and e3smbgc namelist options

* Update E3SM test options

* Add a simple e3sm test suite

* atmbndy is not actually different

* Additional changes
    @dabail10
    dabail10 committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    2b6c6c4 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2022

  1. Merge branch 'main' of https://github.com/cice-consortium/cice into E… 

    …3SMIcepackDEV

Oct 9, 2022
    @apcraig
    apcraig committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    14c8157 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2022

  1. Merge pull request #102 from apcraig/upd01 

    Update to CICE-Consortium main #422117fc5d Oct 9, 2022
    @apcraig
    apcraig committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    9689489 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2022

  1. add Tliquidus_max namelist parameter to CICE

    @eclare108213
    eclare108213 committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    62b4720 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2022

  1. Merge pull request #104 from eclare108213/Tliquidus_max 

    add Tliquidus_max namelist parameter to CICE
    @apcraig
    apcraig committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    59bffba View commit details
    Browse the repository at this point in the history

  2. Add Tf argument to icepack interfaces

    @dabail10 @apcraig
    dabail10 authored and apcraig committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    920c34a View commit details
    Browse the repository at this point in the history

  3. Add constant option for tfrz_option

    @dabail10 @apcraig
    dabail10 authored and apcraig committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    47e5b00 View commit details
    Browse the repository at this point in the history

  4. Fix some diagnostic prints and add to additional drivers

    @dabail10 @apcraig
    dabail10 authored and apcraig committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    70fc307 View commit details
    Browse the repository at this point in the history

  5. Update messages and change option in alt01

    @dabail10 @apcraig
    dabail10 authored and apcraig committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    40d4874 View commit details
    Browse the repository at this point in the history

  6. Update implementation for latest version of Icepack 

    - Update tfrz_option, add _old options for backwards bit-for-bit
- Fix unittests
- Add hi_min to namelist and tests
    @apcraig
    apcraig committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    95ad3cb View commit details
    Browse the repository at this point in the history

  7. Update Icepack

    @apcraig
    apcraig committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    218c051 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2022

  1. Merge pull request #103 from apcraig/tfrz 

    Add Tf to icepack interface calls and constant tfrz_option.
    @apcraig
    apcraig committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    8ac3804 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. Merge branch 'main' of https://github.com/cice-consortium/cice into e… 

    …3smup1

Merge #cb58257857d Nov 20, 2022
    @apcraig
    apcraig committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    d14a3a7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #105 from apcraig/e3smup1 

    Update from CICE Consortium main #cb58257857
    @apcraig
    apcraig committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    ec8632f View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2022

  1. Merge branch 'main' of https://github.com/apcraig/cice into e3sm_upd641 

    Update to CICE-Consortium main, CICE6.4.1 release, #f813294, Dec 9, 2022
    @apcraig
    apcraig committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    8df2d7b View commit details
    Browse the repository at this point in the history

  2. Update to E3SM-Project/Icepack/cice-consortium/E3SM-icepack-initial-i… 

    …ntegration including Icepack1.3.3 release, Dec 15, 2022.
    @apcraig
    apcraig committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    b28511b View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. Merge pull request #106 from apcraig/e3sm_upd641 

    Update to CICE-Consortium main, CICE6.4.1 release, #f813294, Dec 9, 2022
    @apcraig
    apcraig committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    a324099 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. Merge branch 'main' of https://github.com/cice-consortium/cice into c… 

    …ice230202

Merge CICE-Consortium CICE main #b946a95ea460 to E3SMIcepackDEV branch, Feb 2, 2023
    @apcraig
    apcraig committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    6263881 View commit details
    Browse the repository at this point in the history

  2. Update Icepack to E3SM-Project/Icepack #87db73ba6d93747a9, current he… 

    …ad of cice-consortium/E3SM-icepack-initial-integration Feb 3, 2023
    @apcraig
    apcraig committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    25d1456 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #107 from apcraig/cice230202 

    Merge Consortium CICE main #b946a95ea460 and update Icepack to #87db73ba6d93747a9
    @apcraig
    apcraig committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    0f0e0b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Merge commit '7df80ba' into icep230317 

    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
    @apcraig
    apcraig committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    b69d7e4 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2023

  1. Merge pull request #108 from apcraig/icep230317 

    Update Icepack and CICE, March 17, 2023, from Consortium main
    @apcraig
    apcraig committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    9990713 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Merge branch 'main' of https://github.com/cice-consortium/cice into i… 

    …cep230524

Update to CICE-Consortium main #6703bc533, May 24, 2023
Includes Icepack update from same date
    @apcraig
    apcraig committed May 26, 2023
    Configuration menu
    Copy the full SHA
    407a5c3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #109 from apcraig/icep230524 

    Update branch from CICE main #6703bc533
    @apcraig
    apcraig committed May 26, 2023
    Configuration menu
    Copy the full SHA
    a093b13 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Merge branch 'main' of https://github.com/cice-consortium/cice into E… 

    …3SMIcepackDEV

Merge CICE-Consortium #8322416793ae2b76c2 Aug 18, 2023 and Update Icepack to E3SM Icepack #e7510221a315ab Aug 21, 2023
    @apcraig
    apcraig committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    95a797c View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Merge pull request #110 from apcraig/e3smup2 

    Merge CICE-Consortium #8322416793ae2b76c2 Aug 18, 2023 and Update Icepack to E3SM Icepack #e7510221a315ab Aug 21, 2023
    @apcraig
    apcraig committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    5f84e7a View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Merge branch 'main' of https://github.com/cice-consortium/cice into e… 

    …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
    @apcraig
    apcraig committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    fd44996 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #111 from apcraig/e3smup3 

    Update CICE from Consortium Main and Icepack from E3SM Icepack
    @apcraig
    apcraig committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    0ab1ad0 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. Merge branch 'main' of https://github.com/cice-consortium/cice into u… 

    …pd231004
    @apcraig
    apcraig committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    7603016 View commit details
    Browse the repository at this point in the history

  2. Update boxchan1e and boxchan1n tests to tfrz_option = 'mushy_old' to … 

    …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
    @apcraig
    apcraig committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    cc880b4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #112 from apcraig/upd231004 

    Update CICE and Icepack to latest versions, Oct 4, 2023
    @apcraig
    apcraig committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    b046d22 View commit details
    Browse the repository at this point in the history

  4. remove icepack

    @apcraig
    apcraig committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    0893c5b View commit details
    Browse the repository at this point in the history

  5. update icepack

    @apcraig
    apcraig committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    fd0549e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #113 from apcraig/icepfin 

    Update Icepack to Consortium #8fad768ce400536
    @apcraig
    apcraig committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    b3f4d66 View commit details
    Browse the repository at this point in the history