Add regularized coulomb & debris friction tests for MISMIP+#938
Open
matthewhoffman wants to merge 9 commits intoMPAS-Dev:mainfrom
Open
Add regularized coulomb & debris friction tests for MISMIP+#938matthewhoffman wants to merge 9 commits intoMPAS-Dev:mainfrom
matthewhoffman wants to merge 9 commits intoMPAS-Dev:mainfrom
Conversation
Also add it to the full integration suite
* shorten smoke test length * add fallback for core_per_node
matthewhoffman
added
land ice
in progress
Refactor smoke_test and run_model for MISMIP+ case to support 3 variants: weertman, regularized coulomb, debris friction Each has a different yaml file, which is selected based on the variant.
matthewhoffman
changed the title
matthewhoffman
force-pushed
the
landice/mismipplus-debrisfriction
branch
from
8e98237 to
2d041e8
Compare
mperego
reviewed
Mar 3, 2026
mperego
reviewed
Mar 3, 2026
Member
Author
TestingI ran the 3 variants of the smoke test and got reasonable results for the velocity solution at the initial time for all 3. This was run on the Docker container on my Mac m1 (but compiled for amd64) and run with 10 tasks. Weertman
Regularized Coulomb
Debris Friction
|
Member
Author
|
Update: this is ready to merge, barring any further adjustments from @mperego and @jeremy-brooks-1 . But we will wait to merge until the MALI-Dev/E3SM PR is merged and the submodule can be updated. That, in turn, is waiting on an updated compass env with spack bringing in the required updated versions of Albany and Trilinos. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 new MALI tests for the new debris friction law capability and the existing regularized coulomb capability. It adds variants to the MISMIP+ smoke test for these friction laws and the existing weertman friction law. Each of three variants have separate yaml files appropriate for that friction law. The standard input file consisting of a spunup 2km state is modified for the regularized coulomb and debris friction variants to use appropriate parameters values as input fields. These are not meant to be consistent with the spunup glacier state in the file, but allow the smoke test to test each of the 3 friction laws for a reasonable glacier state. The PR also adds the RC and DF variants to the full_integration suite so that we have test coverage for those friction laws.
Checklist
api.rst) has any new or modified class, method and/or functions listedMALI-Devsubmodule has been updated with relevant MALI changesTestingin this PR) any testing that was used to verify the changes