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 Main #5999551399b including snowbrinebugs #17

Merged
merged 4 commits into from
Nov 30, 2022
Merged

Merge Consortium Main #5999551399b including snowbrinebugs #17

merged 4 commits into from
Nov 30, 2022

Conversation

apcraig
Copy link
Collaborator

@apcraig apcraig commented Nov 30, 2022

PR checklist

  • Short (1 sentence) summary of your PR:
    Merge Consortium Main #5999551399b including snowbrinebugs
  • 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.
    Bit-for-bit with Consortium Main #5999551399b except modal tests (expected), https://github.com/CICE-Consortium/Test-Results/wiki/icepack_by_hash_forks#bec84e451c53fd73d59cbc2ad5e1059a34c01a7e
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit with Consortium, answers change on branch
    • 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:

Also added tab checking from Consortium main.

eclare108213 and others added 4 commits November 29, 2022 15:02
@eclare108213
bug fixes for snow grain radius, brine conservation check (CICE-Conso…
da5bb87 
…rtium#415)

* bug fixes for snow grain radius, brine conservation check

* bug fix for snow drainage; allow drainage for snow aging when meltpond water is not used
@apcraig
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
bec84e4 
…o snowbrinebugs
@apcraig
Add tab checker in source code to github actions (CICE-Consortium#417)
5999551 
* Add tab checker in source code to github actions

* remove tab
@apcraig
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
941e3c5 
…o snowbrinebugs
@apcraig apcraig requested a review from eclare108213 November 30, 2022 03:11
@eclare108213 eclare108213 merged commit 9d08355 into E3SM-Project:cice-consortium/E3SM-icepack-initial-integration Nov 30, 2022
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.
2 participants
@apcraig @eclare108213