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

Merge Consortium CICE main #b946a95ea460 and update Icepack to #87db73ba6d93747a9 #107

Merged
merged 7 commits into from
Feb 3, 2023
Merged

Merge Consortium CICE main #b946a95ea460 and update Icepack to #87db73ba6d93747a9 #107

merged 7 commits into from
Feb 3, 2023

Conversation

apcraig
Copy link
Owner

@apcraig apcraig commented Feb 3, 2023

PR checklist

  • Short (1 sentence) summary of your PR:
    Merge Consoritum CICE main #b946a95ea460 and update Icepack to #87db73ba6d93747a9
  • 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 tests are bit-for-bit vs equivalent CICE-Consortium main versions except Icepack modal results.
  • 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, but this is the E3SM Icepack Dev branch
  • 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:

apcraig and others added 7 commits December 7, 2022 15:00
@apcraig
Update version to CICE 6.4.1 (CICE-Consortium#803)
f813294 
Update Icepack to latest release version
Remove trailing blank space
@daveh150 @apcraig
Adding method to check namelist in any order, tested with NAG Fortran. (
eebb350 
CICE-Consortium#801)

* Adding method to check namelist in any order. Use subroutine in ice_namelist_mod.F90 to search for namelist in ice_in.

* Moved goto_nml subroutine to ice_fileunits.F90. Removed ice_namelist_mod.F90

* Cleanup indentations with tmpstr2 use

* Cleanup spacing and intentation

* For namelist check, remove extra continuation after making ice_abort string.

Co-authored-by: Tony Craig <apcraig@users.noreply.github.com>
@dabail10
Fix OMP setup and 'setmask' (CICE-Consortium#806)
0bf0fdc 
* Fix OMP setup

* Update meshgrid
@JFLemieux73
Fix for rare instability in (probabilistic) seabed stress (CICE-Conso…
28fdbeb 
…rtium#810)

* Modified doc for Dupont et al ref

* Minor modif to v_i calculation in seabed_stress_factor_prob to prevent rare instability
@dabail10
Some small CESM updates. (CICE-Consortium#812)
b946a95 
* Fix OMP setup

* Update meshgrid

* Small updates for CESM

* Add change for UFS
@apcraig
Merge branch 'main' of https://github.com/cice-consortium/cice into c…
6263881 
…ice230202

Merge CICE-Consortium CICE main #b946a95ea460 to E3SMIcepackDEV branch, Feb 2, 2023
@apcraig
Update Icepack to E3SM-Project/Icepack #87db73ba6d93747a9, current he…
25d1456 
…ad of cice-consortium/E3SM-icepack-initial-integration Feb 3, 2023
@apcraig apcraig requested a review from eclare108213 February 3, 2023 19:22
@eclare108213 eclare108213 changed the title Merge Consoritum CICE main #b946a95ea460 and update Icepack to #87db73ba6d93747a9 Merge Consortium CICE main #b946a95ea460 and update Icepack to #87db73ba6d93747a9 Feb 3, 2023
@apcraig apcraig merged commit 0f0e0b1 into E3SMIcepackDEV Feb 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eclare108213 eclare108213 eclare108213 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@apcraig @eclare108213 @daveh150 @dabail10 @JFLemieux73