Update LISIO test to include ocn-glcshelf coupling #6437
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
This PR creates a new SMS_P512_D_Ld5.T62_oEC60to30v3wLI_ais20.MPAS_LISIO_TEST.mpaso-ocn_glcshelf test that runs a G-case with the ocn_glcshelf coupling turned on. That coupling was added in PR #2726, but a test was never added.
With this fix, effective density smoothing only involves *valid* neighbors of cells.
This provides a low res ocean mesh with ice-shelf cavities to permit faster tests of the ocn-glcshelf coupling. Needed mapping files are listed but the filenames are not added yet.
This commit makes two updates to the new test: * It replaces the MPAS_LISIO_TEST compset with MPAS_LISIO_JRA1p5. The old MPAS_LISIO_TEST will no longer be supported. * It deletes the new test that was added in a previous commit to the e3sm_ocnice_stealth_features suite and instead updates the existing SMS.T62_oQU120_ais20.MPAS_LISIO_TEST in the e3sm_developer suite in a number of ways: 1. uses the updated compset 2. has glcshelf coupling enabled 3. switches from SMS to ERS 4. uses TL319_oQU240wLI_ais20 mesh
matthewhoffman
added
mpas-ocean
mpas-albany-landice
Testing
|
xylar
approved these changes
May 22, 2024
There was a problem hiding this comment.
Approved based on my code review and testing on:
E3SM-Ocean-Discussion#95
|
Refer to E3SM-Ocean-Discussion#95 for additional discussion. |
|
@matthewhoffman - we might want to make the description more obvious that we're replacing the MPAS_LISIO_TEST compset and not just updating it |
jonbob
approved these changes
May 22, 2024
jonbob
added a commit
that referenced
this pull request
May 22, 2024
…6437) Update LISIO test to include ocn-glcshelf coupling This PR replaces the MPAS_LISIO_TEST ("LandIce-SeaIce-Ocean") test with a new compset that is more up to date and updates test coverage for OCN-GLC coupling work in development. It makes the following changes: * updates compset and grid definition to use JRA1p5 data atmosphere instead of CORE II-NYF * updates ocean mesh to use oQU240wLI mesh, which is cheaper and includes ice-shelf cavities * introduces a testmod that activates ocn-glcshelf coupling. That coupling was added in PR #2726, but a test was never added. The PR also includes a small MPAS-Ocean bug fix that activating ocn-glcshelf coupling revealed. [BFB]
|
Verified that all new files are the correct format and available on the inputdata server |
|
Passes:
merged to next |
|
merged to master and new test blessed except on pm-cpu developer_gnu, which has not yet reported |
|
Also blessed new test on pm-cpu developer_gnu |
Merged
14 tasks
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 replaces the MPAS_LISIO_TEST ("LandIce-SeaIce-Ocean") test with a new compset that is more up to date and updates test coverage for OCN-GLC coupling work in development. It makes the following changes:
The PR also includes a small MPAS-Ocean bug fix that activating ocn-glcshelf coupling revealed.