Add ustar_prev to while loop in icepack_atmo #341
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dabail10
reviewed
Nov 3, 2020
| @@ -271,6 +271,8 @@ psixh ! stability function at zlvl (heat and water) | |||
|
|
|||
| k = 1 | |||
| do while (abs(ustar - ustar_prev)/ustar > atmiter_conv .and. k <= natmiter) | |||
| k = k + 1 | |||
| ustar_prev = ustar | |||
There was a problem hiding this comment.
Looks like a bug fix! Thanks for catching this. Why are these two lines not at the end of the loop though?
There was a problem hiding this comment.
ustar_prev = ustar can't be at the end of the loop, because it would not be ustar_prev if it was. It doesn't matter if k=k+1 is at the start or end of the loop, but I have changed this so that it is consistent with the ocean coupling routine while loop now in CIME.
There was a problem hiding this comment.
You are correct! Looks good. Approving.
dabail10
approved these changes
Nov 3, 2020
| @@ -271,6 +271,8 @@ psixh ! stability function at zlvl (heat and water) | |||
|
|
|||
| k = 1 | |||
| do while (abs(ustar - ustar_prev)/ustar > atmiter_conv .and. k <= natmiter) | |||
| k = k + 1 | |||
| ustar_prev = ustar | |||
There was a problem hiding this comment.
You are correct! Looks good. Approving.
eclare108213
approved these changes
Nov 10, 2020
|
The code change seem to be mostly bit-for-bit but comprehensive test results can be seen here, |
apcraig
added a commit
to apcraig/CICE
that referenced
this pull request
Dec 2, 2020
Add floediam and hfrazilmin as CICE namelist. Requires latest version of Icepack. Update documentation. Icepack has two non bit-for-bit changes including - a fix to multiple declarations of floeshape (CICE-Consortium/Icepack#342) - a fix to the convergence scheme in icepack_atmo (CICE-Consortium/Icepack#341)
16 tasks
eclare108213
pushed a commit
to CICE-Consortium/CICE
that referenced
this pull request
Dec 3, 2020
Add floediam and hfrazilmin as CICE namelist. Requires latest version of Icepack. Update documentation. Icepack has two non bit-for-bit changes including - a fix to multiple declarations of floeshape (CICE-Consortium/Icepack#342) - a fix to the convergence scheme in icepack_atmo (CICE-Consortium/Icepack#341)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
This adds a necessary line for checking for convergence of the ustar loop in icepack_atmo that is missing.
Developer: @proteanplanet
Suggested Reviewers: @eclare108213 @dabail10
This is a non-BFB change. There are no dependencies, and no new test cases are added. Documentation is unchanged.