Fix the setting of ocn_c2_glcshelf based on value of land_ice_flux_mode #2948
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
|
Passes ERS_P480_Ld5.T62_oEC60to30v3wLI.GMPAS-DIB-IAF-ISMF.anvil_intel |
matthewhoffman
approved these changes
May 28, 2019
jonbob
added a commit
that referenced
this pull request
May 28, 2019
Fix the setting of ocn_c2_glcshelf based on value of land_ice_flux_mode This PR fixes the value of ocn_c2_glcshelf that is passed from mpas-o to the coupler and used to determine whether or not the coupler computes ice sheet melt fluxes. It is now based on all possible values of land_ice_flux_mode and fixes issues with ocean ISMF compsets. Fixes #2947 [BFB]
|
merged to next |
jonbob
added a commit
that referenced
this pull request
May 29, 2019
Fix the setting of ocn_c2_glcshelf based on value of land_ice_flux_mode This PR fixes the value of ocn_c2_glcshelf that is passed from mpas-o to the coupler and used to determine whether or not the coupler computes ice sheet melt fluxes. It is now based on all possible values of land_ice_flux_mode and fixes issues with ocean ISMF compsets. Fixes #2947 [BFB]
|
merged to master |
jgfouca
added a commit
that referenced
this pull request
Jun 25, 2019
Improve error/exception handling throughout CIME Our default CIME error was SystemExit, which was nice for avoiding tracebacks, but very bad in that it's not a subclass of Exception. This forced us to use bare excepts and catches for BaseException. The new CIME error is CIMEError, which is both a SystemExit error and an Exception. There are still a few places where we catch BaseException, these are places where we want to do cleanup, even in the presense of a KeyboardInterrupt. These places should almost always re-raise after cleanup because keyboard interrupts should not be swallowed. Get rid of all bare excepts. Test suite: scripts_regression_tests Test baseline: Test namelist changes: Test status: [bit for bit, roundoff, climate changing] Fixes #2947 User interface changes?: Update gh-pages html (Y/N)?: Code review: @jedwards4b @billsacks
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 fixes the value of ocn_c2_glcshelf that is passed from mpas-o to the coupler and used to determine whether or not the coupler computes ice sheet melt fluxes. It is now based on all possible values of land_ice_flux_mode and fixes issues with ocean ISMF compsets.
Fixes #2947
[BFB]