-
Notifications
You must be signed in to change notification settings - Fork 101
feat: Augmented Lagrangian (slip and open modes) #3217
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
Merged
Merged
Changes from 35 commits
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
14095fc
Start of the implementation of slip and open modes for ALM
matteofrigo5 37ff3d0
Debuging slip mode
matteofrigo5 bff5602
Adding a new inputFile for ALM and bug (bubble functions) fixed
matteofrigo5 beff149
Bug bubble functions gradient fixed
matteofrigo5 5f5bfa3
Updating automatic penalty setting
matteofrigo5 8fc501f
Fixed the MPI bug and started cleaning up the code
matteofrigo5 dee0997
Adding initial stress contribution for bubble functions - updating la…
matteofrigo5 216c0d0
Fixing update lists of stick-slip-open elements
matteofrigo5 0a4121a
Adding nested ALM
matteofrigo5 e2b3a71
Adding simultaneous and nested ALM - bug in the jacobian fixed - clea…
matteofrigo5 074a96e
Moving traction update and traction derivatives into contact consitut…
matteofrigo5 3ef80a7
Merged develop branch and resolved conflicts
matteofrigo5 2714317
Moving the traction update into the friction model
matteofrigo5 c1f33d0
Moved contact constitutive behavior from ALM to the friction law
matteofrigo5 469abdc
Cleaning up the PR
matteofrigo5 3f6e118
Merge branch 'develop' into feature/mfrigo/ALM_slip
matteofrigo5 2ce5b2e
Merged develop
matteofrigo5 a6fc4b9
Added inputFiles for ALM
matteofrigo5 9cf7431
Fixed compilation errors
matteofrigo5 f990243
Fixed compilation errors
matteofrigo5 23ea6b3
uncrustify_style
matteofrigo5 b9def29
Fixed contactMechanics.ats
matteofrigo5 2454a4f
Update src/coreComponents/constitutive/contact/CoulombFriction.hpp
matteofrigo5 1ad12cb
Update src/coreComponents/constitutive/contact/CoulombFriction.hpp
matteofrigo5 0ad9cb6
Update src/coreComponents/physicsSolvers/contact/SolidMechanicsAugmen…
matteofrigo5 e521e3f
Update src/coreComponents/physicsSolvers/contact/SolidMechanicsAugmen…
matteofrigo5 2e9b5cb
Update src/coreComponents/physicsSolvers/contact/SolidMechanicsAugmen…
matteofrigo5 f92159d
Fixed reviewer's comments
matteofrigo5 4e64aa6
Fixed reviewer's comments (2)
matteofrigo5 4da0263
Merge branch 'develop' into feature/mfrigo/ALM_slip
matteofrigo5 5ad715f
Fixed reviewer's comments (3)
matteofrigo5 778e410
Fixed vtk-silo in the inputFiles/lagrangeContactMechanics
matteofrigo5 647efc0
Fixed vtk-silo in the inputFiles/lagrangeContactMechanics
matteofrigo5 38183f0
Merge branch 'develop' into feature/mfrigo/ALM_slip
rrsettgast 0d0d1d1
Update src/coreComponents/physicsSolvers/contact/SolidMechanicsALMKer…
CusiniM 7fa109e
Merge branch 'develop' into feature/mfrigo/ALM_slip
rrsettgast b63b9ed
fix bug
rrsettgast cdbcd8c
Update src/coreComponents/constitutive/contact/CoulombFriction.hpp
CusiniM af1dcd3
Apply suggestions from code review
CusiniM 065a962
Fixing documentation error
matteofrigo5 add8a0a
Adding doxygen comments
matteofrigo5 c2d3ab1
Merge branch 'develop' into feature/mfrigo/ALM_slip
rrsettgast 0202b50
fix documentation error:
rrsettgast 6867637
Merge branch 'feature/mfrigo/ALM_slip' of github.com:GEOS-DEV/GEOS in…
rrsettgast 78e74de
Change penalty to iterativePenalty
matteofrigo5 c7c6bff
update baselines.
CusiniM 9b4a604
Fixed bug parallel execution
matteofrigo5 bb696c1
Update baselines
matteofrigo5 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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
55 changes: 55 additions & 0 deletions
55
inputFiles/lagrangianContactMechanics/ALM_PassingCrack_smoke.xml
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,55 @@ | ||
| <?xml version="1.0" ?> | ||
|
|
||
| <Problem> | ||
| <Included> | ||
| <File | ||
| name="./PassingCrack_smoke.xml"/> | ||
| </Included> | ||
|
|
||
| <Solvers | ||
| gravityVector="{ 0.0, 0.0, 0.0 }"> | ||
| <SolidMechanicsAugmentedLagrangianContact | ||
| name="AugmentedLagrangian" | ||
| logLevel="2" | ||
| timeIntegrationOption="QuasiStatic" | ||
| discretization="FE1" | ||
| targetRegions="{ Region, Fracture }"> | ||
| <NonlinearSolverParameters | ||
| newtonTol="1.0e-6" | ||
| logLevel="2" | ||
| maxNumConfigurationAttempts="50" | ||
| newtonMaxIter="20" | ||
| lineSearchAction="None" | ||
| lineSearchMaxCuts="4"/> | ||
| <LinearSolverParameters | ||
| directParallel="0"/> | ||
| </SolidMechanicsAugmentedLagrangianContact> | ||
| </Solvers> | ||
|
|
||
| <Events | ||
| maxTime="1.0"> | ||
| <SoloEvent | ||
| name="preFracture" | ||
| target="/Solvers/SurfaceGen"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="solverApplications" | ||
| beginTime="0.0" | ||
| endTime="1.0" | ||
| forceDt="1.0" | ||
| target="/Solvers/AugmentedLagrangian"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="restarts" | ||
| timeFrequency="1.0" | ||
| targetExactTimestep="0" | ||
| target="/Outputs/restartOutput"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="outputs" | ||
| timeFrequency="1" | ||
| targetExactTimestep="0" | ||
| target="/Outputs/vtkOutput"/> | ||
| </Events> | ||
|
|
||
| </Problem> |
58 changes: 58 additions & 0 deletions
58
inputFiles/lagrangianContactMechanics/ALM_SimpleCubes_smoke.xml
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,58 @@ | ||
| <?xml version="1.0" ?> | ||
|
|
||
| <Problem> | ||
| <Included> | ||
| <File | ||
| name="./SimpleCubes_smoke.xml"/> | ||
| </Included> | ||
|
|
||
| <Solvers | ||
| gravityVector="{ 0.0, 0.0, 0.0 }"> | ||
| <SolidMechanicsAugmentedLagrangianContact | ||
| name="AugmentedLagrangian" | ||
| logLevel="2" | ||
| timeIntegrationOption="QuasiStatic" | ||
| discretization="FE1" | ||
| targetRegions="{ Region, Fracture }"> | ||
| <NonlinearSolverParameters | ||
| newtonTol="1.0e-6" | ||
| logLevel="2" | ||
| maxNumConfigurationAttempts="50" | ||
| newtonMaxIter="20" | ||
| lineSearchAction="None" | ||
| lineSearchMaxCuts="4"/> | ||
| <LinearSolverParameters | ||
| directParallel="0"/> | ||
| </SolidMechanicsAugmentedLagrangianContact> | ||
| </Solvers> | ||
|
|
||
| <Events | ||
| maxTime="10.0"> | ||
| <SoloEvent | ||
| name="initialPlot" | ||
| target="/Outputs/siloOutput"/> | ||
|
|
||
| <SoloEvent | ||
| name="preFracture" | ||
| target="/Solvers/SurfaceGen"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="solverApplications" | ||
| beginTime="0.0" | ||
| forceDt="1.0" | ||
| target="/Solvers/AugmentedLagrangian"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="restarts" | ||
| timeFrequency="5.0" | ||
| targetExactTimestep="0" | ||
| target="/Outputs/restartOutput"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="outputs" | ||
| timeFrequency="1" | ||
| targetExactTimestep="0" | ||
| target="/Outputs/siloOutput"/> | ||
| </Events> | ||
|
|
||
| </Problem> |
77 changes: 77 additions & 0 deletions
77
inputFiles/lagrangianContactMechanics/ALM_SingleFracCompression_benchmark.xml
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,77 @@ | ||
| <?xml version="1.0" ?> | ||
|
|
||
| <Problem> | ||
|
|
||
| <Included> | ||
| <File name="./SingleFracCompression_benchmark.xml"/> | ||
| </Included> | ||
|
|
||
| <Solvers | ||
| gravityVector="{ 0.0, 0.0, 0.0 }"> | ||
| <SolidMechanicsAugmentedLagrangianContact | ||
| name="AugmentedLagrangian" | ||
| logLevel="2" | ||
| timeIntegrationOption="QuasiStatic" | ||
| discretization="FE1" | ||
| targetRegions="{ Region, Fracture }"> | ||
| <NonlinearSolverParameters | ||
| newtonTol="1.0e-6" | ||
| logLevel="2" | ||
| maxNumConfigurationAttempts="50" | ||
| newtonMaxIter="20" | ||
| lineSearchAction="None" | ||
| lineSearchMaxCuts="4"/> | ||
| <LinearSolverParameters | ||
| directParallel="0"/> | ||
| </SolidMechanicsAugmentedLagrangianContact> | ||
| </Solvers> | ||
|
|
||
| <Events | ||
| maxTime="1.0"> | ||
| <SoloEvent | ||
| name="preFracture" | ||
| target="/Solvers/SurfaceGen"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="solverApplications" | ||
| beginTime="0.0" | ||
| forceDt="1.0" | ||
| target="/Solvers/AugmentedLagrangian"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="outputs" | ||
| timeFrequency="1" | ||
| targetExactTimestep="0" | ||
| target="/Outputs/vtkOutput"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="restarts" | ||
| timeFrequency="1.0" | ||
| targetExactTimestep="0" | ||
| target="/Outputs/restartOutput"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="timeHistoryCollection" | ||
| timeFrequency="1" | ||
| targetExactTimestep="1" | ||
| target="/Tasks/tractionCollection" /> | ||
|
|
||
| <PeriodicEvent | ||
| name="timeHistoryOutput" | ||
| timeFrequency="1" | ||
| targetExactTimestep="0" | ||
| target="/Outputs/timeHistoryOutput"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="timeHistoryCollection1" | ||
| timeFrequency="1" | ||
| targetExactTimestep="1" | ||
| target="/Tasks/displacementJumpCollection" /> | ||
|
|
||
| <PeriodicEvent | ||
| name="timeHistoryOutput1" | ||
| timeFrequency="1" | ||
| targetExactTimestep="0" | ||
| target="/Outputs/timeHistoryOutput1"/> | ||
| </Events> | ||
| </Problem> |
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.
Uh oh!
There was an error while loading. Please reload this page.