-
Notifications
You must be signed in to change notification settings - Fork 132
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
Add sw_redist option to CICE #497
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like Icepack will be updated with this PR. Is that intentional?
Yes! This change was already merged in Icepack. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. This CICE PR also updates other changes to Icepack in addition to sw redistribution.
The changes in CICE here are related to turning on the new options in Icepack. There are 3 new namelist for CICE and these are basically passed to Icepack. The changes in the alt options preserve the current CICE testing where ktherm=1 sets sw_redist=.true.. That is consistent with the bl99 having this feature hardwired before and mushy not. As we move forward, we probably want to add a test where mushy turns on the sw_redist feature and bl99 does not to be more complete. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am testing this now on gordon just to make sure it's all bit-for-bit (as we expect). I will merge once that test is complete.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved!
90% of the tests are completed on gordon and everything that has run has passed, https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#91acad70660303035754f32c36eca863f00b29d1. A few are sitting in the queue, but I'm fairly confident it's all fine. I will merge this now and then update the test results when they have completed. |
For easier future lookups (it took me a while), here is the corresponding Icepack PR: CICE-Consortium/Icepack#326 |
For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers
PR checklist
This integrates the sw_redist changes from Icepack into CICE.
dabail10 (D. Bailey)
https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_mach_forks#cheyenne
The alt03 and alt04 test cases have been updated so that ktherm=1 is bfb. The default settings are such that ktherm=2 is bfb. This is the other piece to addressing issue shortwave redistribution #485 and shortwave modification for mushy thermo layers melting completely Icepack#280.