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.

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

Conversation

matteofrigo5
Copy link
Contributor

This PR introduces the following features:

@matteofrigo5 matteofrigo5 self-assigned this Jul 10, 2024
@matteofrigo5 matteofrigo5 added type: feature New feature or request flag: requires rebaseline Requires rebaseline branch in integratedTests labels Jul 10, 2024
@CusiniM CusiniM changed the title Augmented Lagrangian (slip and open modes) feat: Augmented Lagrangian (slip and open modes) Jul 12, 2024
Copy link

codecov bot commented Jul 12, 2024

Codecov Report

Attention: Patch coverage is 0% with 602 lines in your changes missing coverage. Please review.

Project coverage is 56.31%. Comparing base (3b5b5a6) to head (bb696c1).
Report is 1 commits behind head on develop.

Files with missing lines Patch % Lines
...ntact/SolidMechanicsAugmentedLagrangianContact.cpp 0.00% 257 Missing ⚠️
...omponents/constitutive/contact/CoulombFriction.hpp 0.00% 103 Missing ⚠️
...s/contact/SolidMechanicsALMSimultaneousKernels.hpp 0.00% 103 Missing ⚠️
...niteElement/elementFormulations/LagrangeBasis1.hpp 0.00% 55 Missing ⚠️
...csSolvers/contact/SolidMechanicsALMKernelsBase.hpp 0.00% 31 Missing ⚠️
...ntact/SolidMechanicsAugmentedLagrangianContact.hpp 0.00% 17 Missing ⚠️
...hysicsSolvers/contact/SolidMechanicsALMKernels.hpp 0.00% 12 Missing ⚠️
...Solvers/contact/SolidMechanicsALMBubbleKernels.hpp 0.00% 9 Missing ⚠️
...reComponents/constitutive/contact/FrictionBase.hpp 0.00% 6 Missing ⚠️
...reComponents/constitutive/ConstitutivePassThru.hpp 0.00% 2 Missing ⚠️
... and 5 more
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3217      +/-   ##
===========================================
- Coverage    56.59%   56.31%   -0.29%     
===========================================
  Files         1064     1065       +1     
  Lines        89766    90227     +461     
===========================================
  Hits         50807    50807              
- Misses       38959    39420     +461     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -118,7 +118,7 @@ class FrictionlessContact : public FrictionBase
* @brief Create an update kernel wrapper.
* @return the wrapper
*/
KernelWrapper createKernelWrapper() const;
KernelWrapper createKernelUpdates() const;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update was from the initial implementation of the concept which was originally used to wrap the material update.

@rrsettgast
Copy link
Member

@matteofrigo5 documentation errors:

/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/intersectFrac/Example.rst:72: WARNING: start-after pattern not found: <!-- SPHINX_MESH -->
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/intersectFrac/Example.rst:81: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/ContactMechanics_TFrac_base.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/intersectFrac/Example.rst:112: WARNING: end-before pattern not found: <!-- SPHINX_SOLVER_END -->
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/intersectFrac/Example.rst:127: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/ContactMechanics_TFrac_base.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/intersectFrac/Example.rst:148: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/ContactMechanics_TFrac_base.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/intersectFrac/Example.rst:174: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/ContactMechanics_TFrac_base.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/intersectFrac/Example.rst:233: WARNING: Exception occurred in plotting intersectFracFigure
 from /home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/intersectFrac/intersectFracFigure.py:
Traceback (most recent call last):
  File "/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/envs/3217/lib/python3.10/site-packages/matplotlib/sphinxext/plot_directive.py", line 552, in _run_code
    exec(code, ns)
  File "<string>", line 219, in <module>
  File "<string>", line 155, in main
  File "<string>", line 30, in getMechanicalParametersFromXML
  File "/home/docs/.asdf/installs/python/3.10.14/lib/python3.10/xml/etree/ElementTree.py", line 1222, in parse
    tree.parse(source, parser)
  File "/home/docs/.asdf/installs/python/3.10.14/lib/python3.10/xml/etree/ElementTree.py", line 569, in parse
    source = open(source, "rb")
FileNotFoundError: [Errno 2] No such file or directory: '../../../../../../../inputFiles/lagrangianContactMechanics/ContactMechanics_TFrac_base.xml'
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/singleFracCompression/Example.rst:82: WARNING: start-after pattern not found: <!-- SPHINX_MESH -->
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/singleFracCompression/Example.rst:113: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/ContactMechanics_SingleFracCompression_base.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/singleFracCompression/Example.rst:127: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/ContactMechanics_SingleFracCompression_base.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/singleFracCompression/Example.rst:148: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/ContactMechanics_SingleFracCompression_base.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/singleFracCompression/Example.rst:173: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/ContactMechanics_SingleFracCompression_base.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/singleFracCompression/Example.rst:232: WARNING: Exception occurred in plotting singleFracCompressionFigure
 from /home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/singleFracCompression/singleFracCompressionFigure.py:
Traceback (most recent call last):
  File "/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/envs/3217/lib/python3.10/site-packages/matplotlib/sphinxext/plot_directive.py", line 552, in _run_code
    exec(code, ns)
  File "<string>", line 187, in <module>
  File "<string>", line 138, in main
  File "<string>", line 38, in getMechanicalParametersFromXML
  File "/home/docs/.asdf/installs/python/3.10.14/lib/python3.10/xml/etree/ElementTree.py", line 1222, in parse
    tree.parse(source, parser)
  File "/home/docs/.asdf/installs/python/3.10.14/lib/python3.10/xml/etree/ElementTree.py", line 569, in parse
    source = open(source, "rb")
FileNotFoundError: [Errno 2] No such file or directory: '../../../../../../../inputFiles/lagrangianContactMechanics/ContactMechanics_SingleFracCompression_base.xml'
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/sneddon/Example.rst:102: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/Sneddon_contactMechanics_benchmark.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/sneddon/Example.rst:158: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/Sneddon_contactMechanics_benchmark.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/sneddon/Example.rst:212: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/Sneddon_contactMechanics_base.xml' not found or reading it failed
/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/src/docs/sphinx/advancedExamples/validationStudies/faultMechanics/sneddon/Example.rst:245: WARNING: Include file '/home/docs/checkouts/readthedocs.org/user_builds/geosx-geosx/checkouts/3217/inputFiles/lagrangianContactMechanics/Sneddon_contactMechanics_base.xml' not found or reading it failed```

@CusiniM CusiniM merged commit 7130462 into develop Sep 17, 2024
23 of 25 checks passed
@CusiniM CusiniM deleted the feature/mfrigo/ALM_slip branch September 17, 2024 17:53
rrsettgast pushed a commit that referenced this pull request Sep 17, 2024
* Implementation of slip and open modes for ALM

* Adding a new inputFile for ALM and bug (bubble functions) fixed

* Bug bubble functions gradient fixed

* Adding initial stress contribution for bubble functions - updating lambda functions

* Adding nested ALM

* Adding simultaneous and nested ALM 

* Moving the traction update into the friction model

* Moved contact constitutive behavior from ALM to the friction law
rrsettgast pushed a commit that referenced this pull request Sep 17, 2024
* Implementation of slip and open modes for ALM

* Adding a new inputFile for ALM and bug (bubble functions) fixed

* Bug bubble functions gradient fixed

* Adding initial stress contribution for bubble functions - updating lambda functions

* Adding nested ALM

* Adding simultaneous and nested ALM 

* Moving the traction update into the friction model

* Moved contact constitutive behavior from ALM to the friction law
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci: run CUDA builds Allows to triggers (costly) CUDA jobs ci: run integrated tests Allows to run the integrated tests in GEOS CI flag: ready for review flag: requires rebaseline Requires rebaseline branch in integratedTests type: feature New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants