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 Icepack to Consortium main 4fea17c15fb6, Aug 4, 2022 #4

Closed
wants to merge 6 commits into from
Closed

Update Icepack to Consortium main 4fea17c15fb6, Aug 4, 2022 #4

wants to merge 6 commits into from

Conversation

apcraig
Copy link
Collaborator

@apcraig apcraig commented Aug 4, 2022

PR checklist

  • Short (1 sentence) summary of your PR:
    Merge Icepack 4fea17c main Aug 4, 2022 to branch
  • 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.
    Identical code to 4fea17c, https://github.com/CICE-Consortium/Test-Results/wiki/icepack_by_hash#4fea17c15fb63e1424cd71c0ef4365e2135d32db
  • 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 CICE or any other models?
    • Yes
    • No
  • 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/.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please provide any additional information or relevant details below:

Update version number
Update interface documentation
Update Cori port

dabail10 and others added 6 commits July 31, 2022 08:54
@dabail10
Deprecate CESM pond option (CICE-Consortium#393)
5f5fec5 
* Deprecate CESM pond option

* Update comments in documentation
@eclare108213 @apcraig
Deprecate 0-layer thermodynamics (CICE-Consortium#394)
3cb1746 
* 0-layer deprecation - initial

* update doc

* update test options and abort if ktherm=0

* deprecate old ridging participation and redistribution functions

* Revert "deprecate old ridging participation and redistribution functions"

This reverts commit 8aa2f36.

Co-authored-by: Tony Craig <[email protected]>
@apcraig @dabail10 @eclare108213
Deprecate 0-layer, CESMponds; update to Consortium main (#2)
6210dbd 
* Deprecate CESM pond option (CICE-Consortium#393)

* Deprecate CESM pond option

* Update comments in documentation

* Deprecate 0-layer thermodynamics (CICE-Consortium#394)


* 0-layer deprecation - initial

* update doc

* update test options and abort if ktherm=0

* deprecate old ridging participation and redistribution functions

* Revert "deprecate old ridging participation and redistribution functions"

This reverts commit 8aa2f36.

Co-authored-by: Tony Craig <[email protected]>

Co-authored-by: David A. Bailey <[email protected]>
Co-authored-by: Elizabeth Hunke <[email protected]>
@apcraig
Update cori modules (CICE-Consortium#395)
fb27afa
@apcraig
Pre-release update and minor fixes (CICE-Consortium#396)
4fea17c 
* Pre-release update and minor fixes

- Update clone of Test-Results page, add depth=1
- Update documentation of optional arguments
- Update interface documentation
- Update version
@apcraig
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
e7c524a 
…o cice-consortium/E3SM-icepack-initial-integration
@apcraig
Copy link
Collaborator Author

apcraig commented Aug 4, 2022

I could not figure out how to make a clean PR without including the prior updates. Thought we might fix with force merge but decided against it. This is the compromise. Lets not squash merge this.

@apcraig apcraig closed this Aug 4, 2022
eclare108213 added a commit that referenced this pull request Sep 30, 2022
@eclare108213
Merge pull request #4 from apcraig/snicar-clean01
f03e228 
clean up trailing blanks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eclare108213 eclare108213 Awaiting requested review from eclare108213

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

Successfully merging this pull request may close these issues.
3 participants
@apcraig @dabail10 @eclare108213