Merge remote-tracking branch 'origin/devel' · hugary1995/raccoon@a2e8014

Commit

Merge remote-tracking branch 'origin/devel'

Browse files

hugary1995 committed Aug 6, 2023

2 parents 6f14a79 + 17a1b8b commit a2e8014

+1 −3		framework/include/geomsearch/PenetrationInfo.h
+4 −2		framework/include/geomsearch/PenetrationThread.h
+4 −10		framework/src/geomsearch/PenetrationInfo.C
+10 −9		framework/src/geomsearch/PenetrationThread.C
+5 −5		modules/contact/include/constraints/MechanicalContactConstraint.h
+60 −66		modules/contact/src/constraints/MechanicalContactConstraint.C
+5 −5		modules/contact/src/dampers/ContactSlipDamper.C
+1 −1		modules/heat_conduction/include/dirackernels/GapHeatPointSourceMaster.h
+9 −12		modules/heat_conduction/src/dirackernels/GapHeatPointSourceMaster.C