-
Notifications
You must be signed in to change notification settings - Fork 41
Add regularized coulomb & debris friction tests for MISMIP+ #938
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
matthewhoffman
wants to merge
9
commits into
MPAS-Dev:main
Choose a base branch
from
matthewhoffman:landice/mismipplus-debrisfriction
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
56a6510
Add landice/mismipplus/smoke_test/2000m to full_integration
matthewhoffman 68223f2
Add debris friction variant of mismip+
matthewhoffman 261abd9
mismip+ updates
matthewhoffman a789e19
Support 3 friction laws for MISMIP+
matthewhoffman b4e4627
Update docs and full_integration suite
matthewhoffman 515d4f9
Only update frictions field for smoketest
matthewhoffman dd14cd3
update api docs
matthewhoffman 2d041e8
Cleanup
matthewhoffman 3f4b38b
Updates from code review
matthewhoffman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
240 changes: 240 additions & 0 deletions
240
compass/landice/tests/mismipplus/albany_input_debrisfriction.yaml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,240 @@ | ||
| %YAML 1.1 | ||
| --- | ||
| ANONYMOUS: | ||
| Problem: | ||
| Dirichlet BCs: | ||
| SDBC on NS dirichlet for DOF U1 prescribe Field: dirichlet_field | ||
| LandIce BCs: | ||
| BC 0: | ||
| Basal Friction Coefficient: | ||
| Type: Debris Friction | ||
| Power Exponent: 0.3333333333 | ||
| Effective Pressure Type: Hydrostatic Computed at Nodes | ||
| Effective Pressure Regularization: 1.0e3 | ||
| Sliding Velocity Regularization: 5.0e2 | ||
| LandIce Viscosity: | ||
| Type: 'Glen''s Law' | ||
| Flow Rate Type: Uniform | ||
| Glen's Law A: 6.338e-25 | ||
| # # Discretization Description | ||
| # Discretization: | ||
| # Exodus Output File Name: albany_output.exo | ||
| # Side Set Discretizations: | ||
| # basalside: | ||
| # Exodus Output File Name: albany_output_basal.exo | ||
|
|
||
| Piro: | ||
| # Nonlinear Solver Information | ||
| NOX: | ||
| Nonlinear Solver: Line Search Based | ||
| Line Search: | ||
| Full Step: | ||
| Full Step: 1.0e+00 | ||
| Method: Backtrack | ||
| Solver Options: | ||
| Status Test Check Type: Minimal | ||
| Status Tests: | ||
| Test Type: Combo | ||
| Combo Type: OR | ||
| Number of Tests: 2 | ||
| Test 0: | ||
| Test Type: NormF | ||
| Norm Type: Two Norm | ||
| Scale Type: Scaled | ||
| Tolerance: 1.0e-05 | ||
| Test 1: | ||
| Test Type: MaxIters | ||
| Maximum Iterations: 50 | ||
| Printing: | ||
| Output Precision: 3 | ||
| Output Processor: 0 | ||
| Output Information: | ||
| Error: true | ||
| Warning: true | ||
| Outer Iteration: true | ||
| Parameters: false | ||
| Details: false | ||
| Linear Solver Details: false | ||
| Stepper Iteration: true | ||
| Stepper Details: true | ||
| Stepper Parameters: true | ||
|
|
||
| Direction: | ||
| Method: Newton | ||
| Newton: | ||
| Forcing Term Method: Type 2 | ||
| Rescue Bad Newton Solve: true | ||
| Linear Solver: | ||
| Write Linear System: false | ||
| Tolerance: 1.0e-8 | ||
|
|
||
| Stratimikos Linear Solver: | ||
| Stratimikos: | ||
|
|
||
| # Linear Solver Information | ||
| Linear Solver Type: Belos | ||
| Linear Solver Types: | ||
| Belos: | ||
| Solver Type: Block GMRES | ||
| Solver Types: | ||
| Block GMRES: | ||
| Output Frequency: 20 | ||
| Output Style: 1 | ||
| Verbosity: 33 | ||
| Maximum Iterations: 200 | ||
| Block Size: 1 | ||
| Num Blocks: 200 | ||
| Flexible Gmres: false | ||
| VerboseObject: | ||
| Output File: none | ||
| Verbosity Level: low | ||
|
|
||
| # Preconditioner Information | ||
| Preconditioner Type: MueLu | ||
| Preconditioner Types: | ||
|
|
||
| Ifpack2: | ||
| Overlap: 1 | ||
| Prec Type: ILUT | ||
|
|
||
| MueLu: | ||
| Matrix: | ||
| PDE equations: 2 | ||
| Factories: | ||
| myLineDetectionFact: | ||
| factory: LineDetectionFactory | ||
| 'linedetection: orientation': coordinates | ||
| mySemiCoarsenPFact1: | ||
| factory: SemiCoarsenPFactory | ||
| 'semicoarsen: coarsen rate': 14 | ||
| UncoupledAggregationFact2: | ||
| factory: UncoupledAggregationFactory | ||
| 'aggregation: ordering': graph | ||
| 'aggregation: max selected neighbors': 0 | ||
| 'aggregation: min agg size': 3 | ||
| 'aggregation: phase3 avoid singletons': true | ||
| MyCoarseMap2: | ||
| factory: CoarseMapFactory | ||
| Aggregates: UncoupledAggregationFact2 | ||
| myTentativePFact2: | ||
| 'tentative: calculate qr': true | ||
| factory: TentativePFactory | ||
| Aggregates: UncoupledAggregationFact2 | ||
| CoarseMap: MyCoarseMap2 | ||
| mySaPFact2: | ||
| 'sa: eigenvalue estimate num iterations': 10 | ||
| 'sa: damping factor': 1.33333e+00 | ||
| factory: SaPFactory | ||
| P: myTentativePFact2 | ||
| myTransferCoordinatesFact: | ||
| factory: CoordinatesTransferFactory | ||
| CoarseMap: MyCoarseMap2 | ||
| Aggregates: UncoupledAggregationFact2 | ||
| myTogglePFact: | ||
| factory: TogglePFactory | ||
| 'semicoarsen: number of levels': 2 | ||
| TransferFactories: | ||
| P1: mySemiCoarsenPFact1 | ||
| P2: mySaPFact2 | ||
| Ptent1: mySemiCoarsenPFact1 | ||
| Ptent2: myTentativePFact2 | ||
| Nullspace1: mySemiCoarsenPFact1 | ||
| Nullspace2: myTentativePFact2 | ||
| myRestrictorFact: | ||
| factory: TransPFactory | ||
| P: myTogglePFact | ||
| myToggleTransferCoordinatesFact: | ||
| factory: ToggleCoordinatesTransferFactory | ||
| Chosen P: myTogglePFact | ||
| TransferFactories: | ||
| Coordinates1: mySemiCoarsenPFact1 | ||
| Coordinates2: myTransferCoordinatesFact | ||
| myRAPFact: | ||
| factory: RAPFactory | ||
| P: myTogglePFact | ||
| R: myRestrictorFact | ||
| TransferFactories: | ||
| For Coordinates: myToggleTransferCoordinatesFact | ||
| myRepartitionHeuristicFact: | ||
| factory: RepartitionHeuristicFactory | ||
| A: myRAPFact | ||
| 'repartition: min rows per proc': 3000 | ||
| 'repartition: max imbalance': 1.327e+00 | ||
| 'repartition: start level': 1 | ||
| myZoltanInterface: | ||
| factory: ZoltanInterface | ||
| A: myRAPFact | ||
| Coordinates: myToggleTransferCoordinatesFact | ||
| number of partitions: myRepartitionHeuristicFact | ||
| myRepartitionFact: | ||
| factory: RepartitionFactory | ||
| A: myRAPFact | ||
| Partition: myZoltanInterface | ||
| 'repartition: remap parts': true | ||
| number of partitions: myRepartitionHeuristicFact | ||
| myRebalanceProlongatorFact: | ||
| factory: RebalanceTransferFactory | ||
| type: Interpolation | ||
| P: myTogglePFact | ||
| Coordinates: myToggleTransferCoordinatesFact | ||
| Nullspace: myTogglePFact | ||
| myRebalanceRestrictionFact: | ||
| factory: RebalanceTransferFactory | ||
| type: Restriction | ||
| R: myRestrictorFact | ||
| myRebalanceAFact: | ||
| factory: RebalanceAcFactory | ||
| A: myRAPFact | ||
| TransferFactories: { } | ||
| mySmoother1: | ||
| factory: TrilinosSmoother | ||
| type: LINESMOOTHING_BANDEDRELAXATION | ||
| 'smoother: pre or post': both | ||
| ParameterList: | ||
| 'relaxation: type': Gauss-Seidel | ||
| 'relaxation: sweeps': 1 | ||
| 'relaxation: damping factor': 1.0 | ||
| mySmoother3: | ||
| factory: TrilinosSmoother | ||
| type: RELAXATION | ||
| 'smoother: pre or post': both | ||
| ParameterList: | ||
| 'relaxation: type': Gauss-Seidel | ||
| 'relaxation: sweeps': 1 | ||
| 'relaxation: damping factor': 1.0 | ||
| mySmoother4: | ||
| factory: TrilinosSmoother | ||
| type: RELAXATION | ||
| 'smoother: pre or post': pre | ||
| ParameterList: | ||
| 'relaxation: type': Gauss-Seidel | ||
| 'relaxation: sweeps': 4 | ||
| 'relaxation: damping factor': 1.0 | ||
| Hierarchy: | ||
| max levels: 7 | ||
| 'coarse: max size': 2000 | ||
| verbosity: None | ||
| Finest: | ||
| Smoother: mySmoother1 | ||
| CoarseSolver: mySmoother4 | ||
| P: myRebalanceProlongatorFact | ||
| Nullspace: myRebalanceProlongatorFact | ||
| CoarseNumZLayers: myLineDetectionFact | ||
| LineDetection_Layers: myLineDetectionFact | ||
| LineDetection_VertLineIds: myLineDetectionFact | ||
| A: myRebalanceAFact | ||
| Coordinates: myRebalanceProlongatorFact | ||
| Importer: myRepartitionFact | ||
| All: | ||
| startLevel: 1 | ||
| Smoother: mySmoother4 | ||
| CoarseSolver: mySmoother4 | ||
| P: myRebalanceProlongatorFact | ||
| Nullspace: myRebalanceProlongatorFact | ||
| CoarseNumZLayers: myLineDetectionFact | ||
| LineDetection_Layers: myLineDetectionFact | ||
| LineDetection_VertLineIds: myLineDetectionFact | ||
| A: myRebalanceAFact | ||
| Coordinates: myRebalanceProlongatorFact | ||
| Importer: myRepartitionFact | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to set a uniform Flow Rate, or the default one based on the temperature is correct?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The spinup uses this uniform flow rate, it's one of the parameters set as a constant for the intercomparison project
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are the flow rate lines supposed to be in their own section
LandIce Viscosity, or is it okay to set them there underBasal Friction Coefficient?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The flow-rate lines in the
Basal Friction Coefficientsection are only used for the boundary condition. If they are not specified in theBasal Friction Coefficientsection, they are inferred from the ones in theLandIce Viscosity.