Skip to content
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.

Sign up for GitHub

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

feat: Augmented Lagrangian (slip and open modes) #3217

Merged
merged 48 commits into from
Sep 17, 2024
Merged

feat: Augmented Lagrangian (slip and open modes) #3217

Show file tree
Hide file tree
Changes from 38 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 Jul 10, 2024
37ff3d0
Debuging slip mode
matteofrigo5 Jul 16, 2024
bff5602
Adding a new inputFile for ALM and bug (bubble functions) fixed
matteofrigo5 Jul 18, 2024
beff149
Bug bubble functions gradient fixed
matteofrigo5 Aug 5, 2024
5f5bfa3
Updating automatic penalty setting
matteofrigo5 Aug 7, 2024
8fc501f
Fixed the MPI bug and started cleaning up the code
matteofrigo5 Aug 8, 2024
dee0997
Adding initial stress contribution for bubble functions - updating la…
matteofrigo5 Aug 8, 2024
216c0d0
Fixing update lists of stick-slip-open elements
matteofrigo5 Aug 13, 2024
0a4121a
Adding nested ALM
matteofrigo5 Aug 21, 2024
e2b3a71
Adding simultaneous and nested ALM - bug in the jacobian fixed - clea…
matteofrigo5 Aug 22, 2024
074a96e
Moving traction update and traction derivatives into contact consitut…
matteofrigo5 Aug 24, 2024
3ef80a7
Merged develop branch and resolved conflicts
matteofrigo5 Aug 30, 2024
2714317
Moving the traction update into the friction model
matteofrigo5 Aug 31, 2024
c1f33d0
Moved contact constitutive behavior from ALM to the friction law
matteofrigo5 Sep 4, 2024
469abdc
Cleaning up the PR
matteofrigo5 Sep 5, 2024
3f6e118
Merge branch 'develop' into feature/mfrigo/ALM_slip
matteofrigo5 Sep 5, 2024
2ce5b2e
Merged develop
matteofrigo5 Sep 5, 2024
a6fc4b9
Added inputFiles for ALM
matteofrigo5 Sep 5, 2024
9cf7431
Fixed compilation errors
matteofrigo5 Sep 5, 2024
f990243
Fixed compilation errors
matteofrigo5 Sep 6, 2024
23ea6b3
uncrustify_style
matteofrigo5 Sep 6, 2024
b9def29
Fixed contactMechanics.ats
matteofrigo5 Sep 6, 2024
2454a4f
Update src/coreComponents/constitutive/contact/CoulombFriction.hpp
matteofrigo5 Sep 6, 2024
1ad12cb
Update src/coreComponents/constitutive/contact/CoulombFriction.hpp
matteofrigo5 Sep 6, 2024
0ad9cb6
Update src/coreComponents/physicsSolvers/contact/SolidMechanicsAugmen…
matteofrigo5 Sep 6, 2024
e521e3f
Update src/coreComponents/physicsSolvers/contact/SolidMechanicsAugmen…
matteofrigo5 Sep 6, 2024
2e9b5cb
Update src/coreComponents/physicsSolvers/contact/SolidMechanicsAugmen…
matteofrigo5 Sep 6, 2024
f92159d
Fixed reviewer's comments
matteofrigo5 Sep 6, 2024
4e64aa6
Fixed reviewer's comments (2)
matteofrigo5 Sep 6, 2024
4da0263
Merge branch 'develop' into feature/mfrigo/ALM_slip
matteofrigo5 Sep 6, 2024
5ad715f
Fixed reviewer's comments (3)
matteofrigo5 Sep 7, 2024
778e410
Fixed vtk-silo in the inputFiles/lagrangeContactMechanics
matteofrigo5 Sep 7, 2024
647efc0
Fixed vtk-silo in the inputFiles/lagrangeContactMechanics
matteofrigo5 Sep 8, 2024
38183f0
Merge branch 'develop' into feature/mfrigo/ALM_slip
rrsettgast Sep 12, 2024
0d0d1d1
Update src/coreComponents/physicsSolvers/contact/SolidMechanicsALMKer…
CusiniM Sep 12, 2024
7fa109e
Merge branch 'develop' into feature/mfrigo/ALM_slip
rrsettgast Sep 13, 2024
b63b9ed
fix bug
rrsettgast Sep 13, 2024
cdbcd8c
Update src/coreComponents/constitutive/contact/CoulombFriction.hpp
CusiniM Sep 13, 2024
af1dcd3
Apply suggestions from code review
CusiniM Sep 13, 2024
065a962
Fixing documentation error
matteofrigo5 Sep 15, 2024
add8a0a
Adding doxygen comments
matteofrigo5 Sep 15, 2024
c2d3ab1
Merge branch 'develop' into feature/mfrigo/ALM_slip
rrsettgast Sep 15, 2024
0202b50
fix documentation error:
rrsettgast Sep 15, 2024
6867637
Merge branch 'feature/mfrigo/ALM_slip' of github.com:GEOS-DEV/GEOS in…
rrsettgast Sep 15, 2024
78e74de
Change penalty to iterativePenalty
matteofrigo5 Sep 16, 2024
c7c6bff
update baselines.
CusiniM Sep 16, 2024
9b4a604
Fixed bug parallel execution
matteofrigo5 Sep 17, 2024
bb696c1
Update baselines
matteofrigo5 Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ set(LAPACK_LIBRARIES "${OPENBLAS_ROOT}/lib/libopenblas.so" CACHE STRING "")
set(ENABLE_VALGRIND OFF CACHE BOOL "")
set(ENABLE_CALIPER ON CACHE BOOL "")

set(GEOS_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE)
set(GEOSX_TPL_DIR "${GEOSX_TPL_DIR}" CACHE PATH "" FORCE)
CusiniM marked this conversation as resolved.
Show resolved Hide resolved
include(${CMAKE_CURRENT_LIST_DIR}/../tpls.cmake)
115 changes: 0 additions & 115 deletions inputFiles/almContactMechanics/ALM_stickFault_base.xml
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions inputFiles/almContactMechanics/alm.ats
View file
Open in desktop

This file was deleted.

55 changes: 55 additions & 0 deletions inputFiles/lagrangianContactMechanics/ALM_PassingCrack_smoke.xml
View file
Open in desktop
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 inputFiles/lagrangianContactMechanics/ALM_SimpleCubes_smoke.xml
View file
Open in desktop
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 inputFiles/lagrangianContactMechanics/ALM_SingleFracCompression_benchmark.xml
View file
Open in desktop
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>
Loading
Loading