From 27810e955d85f108e6d6b2a7f46eba8d3f823936 Mon Sep 17 00:00:00 2001 From: Pavel Tomin Date: Thu, 12 Dec 2024 12:39:58 -0600 Subject: [PATCH 1/4] fix: remove setNextDt from SolidMechanicsLagrangeContact --- .../contact/SolidMechanicsLagrangeContact.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.cpp b/src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.cpp index 7ca9cd24c2..8de8904b18 100644 --- a/src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.cpp +++ b/src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.cpp @@ -2342,13 +2342,6 @@ bool SolidMechanicsLagrangeContact::isFractureAllInStickCondition( DomainPartiti return ( ( numNewSlip + numSlip + numOpen ) == 0 ); } -real64 SolidMechanicsLagrangeContact::setNextDt( real64 const & currentDt, - DomainPartition & domain ) -{ - GEOS_UNUSED_VAR( domain ); - return currentDt; -} - REGISTER_CATALOG_ENTRY( PhysicsSolverBase, SolidMechanicsLagrangeContact, string const &, Group * const ) } /* namespace geos */ From 7f1fd2587df966bb91985214ea200512695dec4e Mon Sep 17 00:00:00 2001 From: Pavel Tomin Date: Thu, 12 Dec 2024 12:44:20 -0600 Subject: [PATCH 2/4] missing file --- .../physicsSolvers/contact/SolidMechanicsLagrangeContact.hpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.hpp b/src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.hpp index b77fac6ef2..2b71139a5d 100644 --- a/src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.hpp +++ b/src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.hpp @@ -101,10 +101,6 @@ class SolidMechanicsLagrangeContact : public ContactSolverBase virtual void resetStateToBeginningOfStep( DomainPartition & domain ) override; - virtual real64 - setNextDt( real64 const & currentDt, - DomainPartition & domain ) override; - void updateState( DomainPartition & domain ) override final; void assembleContact( DomainPartition & domain, From c61ef92d86bc2bd4b30b12e61881526fa48c6a43 Mon Sep 17 00:00:00 2001 From: Pavel Tomin Date: Sat, 14 Dec 2024 18:47:21 -0600 Subject: [PATCH 3/4] Update .integrated_tests.yaml --- .integrated_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index 31ce96119a..09af5eafaf 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr3450-9221-37d940c + baseline: integratedTests/baseline_integratedTests-pr3490-9351-03417a1 allow_fail: all: '' streak: '' From ca375c9cd00d6b59e32fb83bfafc42177998a5be Mon Sep 17 00:00:00 2001 From: Pavel Tomin Date: Sat, 14 Dec 2024 18:48:13 -0600 Subject: [PATCH 4/4] Update BASELINE_NOTES.md --- BASELINE_NOTES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index 3b09722325..74e7e6efed 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -6,6 +6,10 @@ This file is designed to track changes to the integrated test baselines. Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining. These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD). +PR #3450 (2024-12-14) +===================== +Fix time step selecor flaw in SolidMechanicsLagrangeContact. + PR #3450 (2024-12-08) ===================== Added test for explicit runge kutta sprinslider.