Allow for using the initializeprob with OverrideInit #2151
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
Comment on lines
65
to
+84
| function _initialize_dae!(integrator, prob::ODEProblem, | ||
| alg::DefaultInit, x::Val{true}) | ||
| _initialize_dae!(integrator, prob, | ||
| BrownFullBasicInit(integrator.opts.abstol), x) | ||
| if SciMLBase.has_initializeprob(prob.f) | ||
| _initialize_dae!(integrator, prob, | ||
| OverrideInit(integrator.opts.abstol), x) | ||
| else | ||
| _initialize_dae!(integrator, prob, | ||
| BrownFullBasicInit(integrator.opts.abstol), x) | ||
| end | ||
| end | ||
|
|
||
| function _initialize_dae!(integrator, prob::ODEProblem, | ||
| alg::DefaultInit, x::Val{false}) | ||
| _initialize_dae!(integrator, prob, | ||
| BrownFullBasicInit(integrator.opts.abstol), x) | ||
| if SciMLBase.has_initializeprob(prob.f) | ||
| _initialize_dae!(integrator, prob, | ||
| OverrideInit(integrator.opts.abstol), x) | ||
| else | ||
| _initialize_dae!(integrator, prob, | ||
| BrownFullBasicInit(integrator.opts.abstol), x) | ||
| end |
There was a problem hiding this comment.
can't these be combined?
There was a problem hiding this comment.
maybe, since it wasn't already I assumed that it's potentially due to some ambiguity and with such a big change going on I don't want to touch that at the same time.
4 tasks
ChrisRackauckas
commented
Feb 26, 2024
src/initialize_dae.jl
Outdated
| if isinplace === Val{true}() | ||
| integrator.u .= prob.f.initializeprobmap(sol.u) | ||
| integrator.u .= nlsol[Main.ModelingToolkit.unknowns(prob.f.sys)] # prob.f.initializeprobmap(sol) |
There was a problem hiding this comment.
shouldn't this depend on SII rather than MTK directly?
There was a problem hiding this comment.
oh that shouldn't've made it in there, that was my testing and it should just use the getu
5 tasks
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.
Uses the latest addition to SciMLBase so that if an ODEProblem or DAEProblem tags a nonlinear system for the initialization then it will use it.