MOM6: +Corrections to ice shelf-related code (includes PR#1278) #1279
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
- Call ice shelf initialization from within initialize_MOM.
- This removes suppport for rotation.
diagnostics and restarts during the call from initialize_MOM
- retains original drivers
Added the routines initialize_ice_shelf_fluxes and initialize_ice_shelf_forces which call be called from within initialize_ice_shelf or separately, which removes the need to call initialize_ice_shelf multiple times. Also added the new runtime parameters USTAR_SHELF_FROM_VEL and USTAR_SHELF_MAX, which will enable the previous answers for the ISOMIP test cases to be recovered and will facilitate the debugging or control of poorly understood instabilities related to the dynamic or lagged calculation of ustar_shelf. All answers in the usual MOM6-examples test cases are bitwise identical, and the ISOMIP test cases are working once again.
Hallberg-NOAA
changed the title
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #1279 +/- ##
=========================================
Coverage 45.88% 45.89%
=========================================
Files 225 225
Lines 71422 71400 -22
=========================================
- Hits 32774 32771 -3
+ Misses 38648 38629 -19
Continue to review full report at Codecov.
|
Removed the duplicate register_restart_field call for ISS%h_shelf under the name "_shelf". This registration call should have never been there in the first place. All answers are bitwise identical, although there are changes to the restart file contents in cases with an active ice shelf.
There was a problem hiding this comment.
@Hallberg-NOAA I agree with these changes and thank you for separating the forcing initialization which is a much simpler and cleaner solution.
Closed
|
Tests passed but doc files were changed so I'll handle this manually |
adcroft
approved these changes
Jan 4, 2021
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.
This PR adds runtime parameters that recover the answers to the ISOMIP test
cases that were changed without acknowledgement or documentation as a (small)
part of MOM6 PR#1265, and it adds in two new ice_shelf-related initialization
subroutines that remove the need to call initialize_ice_shelf multiple times.
The changes in MOM6 PR#1278 had not yet been merged into the main branch because
the full regression testing is not working, so that PR has been subsumed into
this larger PR. There are new entries in many MOM_parameter_doc.all files as
a result of this PR, and in cases with the ice shelves enabled all parameters
from the MOM_input files are once again being logged. All answers in the
MOM6-examples test suite, including those of the expensive and infrequently run
test cases, are once again back to their values prior to MOM6 PR#1265.
The self-consistency testing cases tc1-tc3 all pass, but I am still unable to
run tc4 due to python issues, and tc4 might show up as a regression failure due
to recent changes to activate the ice shelf component and the corrections to
recover prior answers in this PR.
The commits in this PR (including those that were in MOM6 PR#1278) include:
(The following commits are a part of MOM6 PR#1278):