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

fix: remove setNextDt from SolidMechanicsLagrangeContact #3490

Merged
merged 5 commits into from
Dec 15, 2024
Merged

fix: remove setNextDt from SolidMechanicsLagrangeContact #3490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27810e9
fix: remove setNextDt from SolidMechanicsLagrangeContact
Dec 12, 2024
7f1fd25
missing file
Dec 12, 2024
03417a1
Merge branch 'develop' into pt/remove-setNextDt
paveltomin Dec 14, 2024
c61ef92
Update .integrated_tests.yaml
paveltomin Dec 15, 2024
ca375c9
Update BASELINE_NOTES.md
paveltomin Dec 15, 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 .integrated_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: ''
4 changes: 4 additions & 0 deletions BASELINE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 0 additions & 7 deletions src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2359,13 +2359,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 */
4 changes: 0 additions & 4 deletions src/coreComponents/physicsSolvers/contact/SolidMechanicsLagrangeContact.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,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,
Expand Down
Loading