A few improvements of TerminateSteadyState #243
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
devmotion
commented
Nov 28, 2024
| @@ -2,6 +2,11 @@ | |||
| # Terminate when all derivatives fall below a threshold or | |||
| # when derivatives are smaller than a fraction of state | |||
| function allDerivPass(integrator, abstol, reltol, min_t) | |||
| # Early exit | |||
| if min_t !== nothing && integrator.t < min_t | |||
There was a problem hiding this comment.
No need to perform all evaluations below in this case.
devmotion
commented
Nov 28, 2024
src/terminatesteadystate.jl
Outdated
| @@ -16,21 +21,25 @@ function allDerivPass(integrator, abstol, reltol, min_t) | |||
| end | |||
|
|
|||
| if integrator.u isa Array | |||
| any(abs(d) > abstol && abs(d) > reltol * abs(u) | |||
| any(abs(d) > abstol || abs(d) > reltol * abs(u) | |||
There was a problem hiding this comment.
According to the docstring the default check ensures that
all derivatives should become smaller than
abstoland the states times
reltol
There was a problem hiding this comment.
Maybe better to change the docstring though, to be consistent with isapprox.
devmotion
commented
Nov 28, 2024
src/terminatesteadystate.jl
Outdated
| return true | ||
| end | ||
|
|
||
| struct WrappedTest{T,A,R,M} |
There was a problem hiding this comment.
I think the let-trick leads to a bit ugly code 😄
devmotion
commented
Nov 28, 2024
| else | ||
| test | ||
| end | ||
| affect! = (integrator) -> terminate!(integrator) | ||
| DiscreteCallback(condition, affect!; save_positions = (true, false)) | ||
| DiscreteCallback(condition, terminate!; save_positions = (true, false)) |
There was a problem hiding this comment.
No need for a separate affect! function.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ChrisRackauckas
approved these changes
Dec 1, 2024
|
Thanks, all simple but good changes. Any tangible performance difference from the iteration change? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR contains a few suggestions with possible improvements for TerminateSteadyState.