Skip to content

JuliaC/trim compatibility for Core and Rosenbrock #3326

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

Closed
asinghvi17 wants to merge 5 commits into from
Closed

JuliaC/trim compatibility for Core and Rosenbrock #3326

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
367e297
fix: specialize on tType in initdt
asinghvi17 Apr 2, 2026
40a91a4
fix: specialize on type of `deriv` in generic ode_interpolant
asinghvi17 Apr 2, 2026
af66504
fix: specialize on `deriv` type in `interp_at_saveat`
asinghvi17 Apr 2, 2026
e7da701
fix: specialize on type input to Rosenbrock tableaus
asinghvi17 Apr 2, 2026
1238519
fix: specialize on deriv type in `default_ode_interpolant`
asinghvi17 Apr 2, 2026
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
12 changes: 7 additions & 5 deletions lib/OrdinaryDiffEqCore/src/dense/generic_dense.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ end
return ode_addsteps!(integrator, args...)
end

@inline function ode_interpolant(Θ, integrator::SciMLBase.DEIntegrator, idxs, deriv)
@inline function ode_interpolant(
Θ, integrator::SciMLBase.DEIntegrator, idxs, ::Type{deriv}
) where {deriv}
SciMLBase.addsteps!(integrator)
if integrator.cache isa CompositeCache
val = composite_ode_interpolant(
Expand All @@ -175,8 +177,8 @@ end
end

function default_ode_interpolant(
Θ, integrator, cache::DefaultCache, alg_choice, idxs, deriv
)
Θ, integrator, cache::DefaultCache, alg_choice, idxs, ::Type{deriv}
) where {deriv}
if alg_choice == 1
return ode_interpolant(
Θ, integrator.dt, integrator.uprev,
Expand Down Expand Up @@ -220,8 +222,8 @@ end

@generated function composite_ode_interpolant(
Θ, integrator, caches::T, current, idxs,
deriv
) where {T <: Tuple}
::Type{deriv}
) where {T <: Tuple, deriv}
expr = Expr(:block)
for i in 1:length(T.types)
push!(
Expand Down
8 changes: 4 additions & 4 deletions lib/OrdinaryDiffEqCore/src/initdt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# =============================================================================

@muladd function _ode_initdt_iip(
u0, t, _tType, tdir, dtmax, abstol, reltol, internalnorm,
u0, t, ::Type{_tType}, tdir, dtmax, abstol, reltol, internalnorm,
Copy link
Copy Markdown
Member

@oscardssmith oscardssmith Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this funtion takes t we should see if we can just remove _tType entirely.

Copy link
Copy Markdown
Contributor Author

@asinghvi17 asinghvi17 Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be a bigger change though, right? I'm assuming a lot of solvers try to look at this?

Copy link
Copy Markdown
Member

@oscardssmith oscardssmith Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no. The only caller of initdit is __init so the initialization happens before any solver specific code runs.

Copy link
Copy Markdown
Member

@oscardssmith oscardssmith Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@asinghvi17 can you resolve this?

prob, g, noise_prototype, order, integrator
)
) where {_tType}
f = prob.f
p = integrator.p
oneunit_tType = oneunit(_tType)
Expand Down Expand Up @@ -307,9 +307,9 @@ function Base.showerror(io::IO, e::TypeNotConstantError)
end

@muladd function _ode_initdt_oop(
u0, t, _tType, tdir, dtmax, abstol, reltol, internalnorm,
u0, t, ::Type{_tType}, tdir, dtmax, abstol, reltol, internalnorm,
prob, g, order, integrator
)
) where {_tType}
f = prob.f
p = prob.p
oneunit_tType = oneunit(_tType)
Expand Down
2 changes: 1 addition & 1 deletion lib/OrdinaryDiffEqCore/src/integrators/integrator_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ end
# ODE: polynomial interpolation via addsteps!/ode_interpolant (always available,
# regardless of opts.dense which only controls post-solve k-array storage).
# SDE: linear interpolation between uprev and u.
function interp_at_saveat(Θ, integrator, idxs, deriv)
function interp_at_saveat(Θ, integrator, idxs, ::Type{deriv}) where {deriv}
if isnothing(_get_W(integrator))
# ODE/DDE: polynomial interpolation
SciMLBase.addsteps!(integrator)
Expand Down
72 changes: 36 additions & 36 deletions lib/OrdinaryDiffEqRosenbrock/src/rosenbrock_tableaus.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ struct Rosenbrock23Tableau{T}
d::T
end

function Rosenbrock23Tableau(T)
function Rosenbrock23Tableau(::Type{T}) where {T}
c₃₂ = convert(T, 6 + sqrt(2))
d = convert(T, 1 / (2 + sqrt(2)))
return Rosenbrock23Tableau(c₃₂, d)
Expand All @@ -14,7 +14,7 @@ struct Rosenbrock32Tableau{T}
d::T
end

function Rosenbrock32Tableau(T)
function Rosenbrock32Tableau(::Type{T}) where {T}
c₃₂ = convert(T, 6 + sqrt(2))
d = convert(T, 1 / (2 + sqrt(2)))
return Rosenbrock32Tableau(c₃₂, d)
Expand Down Expand Up @@ -72,7 +72,7 @@ The tableau for the 4th order L-stable Rosenbrock method Rodas4.
It is a 6-stage method with a built-in error estimate.
Reference: Hairer, E., Nørsett, S. P., & Wanner, G. (1996). Solving Ordinary Differential Equations II.
"""
function Rodas4Tableau(T, T2)
function Rodas4Tableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = 0.25
b = T[RODAS4A[6, 1], RODAS4A[6, 2], RODAS4A[6, 3], RODAS4A[6, 4], RODAS4A[6, 5], one(T)]
btilde = T[zero(T), zero(T), zero(T), zero(T), zero(T), one(T)]
Expand Down Expand Up @@ -108,7 +108,7 @@ A 4th order L-stable Rosenbrock method with 6 stages, often used as an alternati
Reference: Hairer, E., & Wanner, G. (1996). Solving Ordinary Differential Equations II:
Stiff and Differential-Algebraic Problems. Springer-Verlag, 2nd Edition.
"""
function Rodas42Tableau(T, T2)
function Rodas42Tableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = 0.25
b = T[RODAS42A[6, 1], RODAS42A[6, 2], RODAS42A[6, 3], RODAS42A[6, 4], RODAS42A[6, 5], one(T)]
btilde = T[zero(T), zero(T), zero(T), zero(T), zero(T), one(T)]
Expand Down Expand Up @@ -144,7 +144,7 @@ A 4th order L-stable Rosenbrock method with 6 stages, emphasizing stability for
Reference: Steinebach, G. (1995). Order-reduction of ROW-methods for DAEs and
method of lines applications. Preprint-Nr. 1741, FB Mathematik, TH Darmstadt.
"""
function Rodas4PTableau(T, T2)
function Rodas4PTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = 0.25
b = T[RODAS4PA[6, 1], RODAS4PA[6, 2], RODAS4PA[6, 3], RODAS4PA[6, 4], RODAS4PA[6, 5], one(T)]
btilde = T[zero(T), zero(T), zero(T), zero(T), zero(T), one(T)]
Expand Down Expand Up @@ -181,7 +181,7 @@ Reference: Steinebach, G. (2020). Improvement of Rosenbrock-Wanner method RODASP
In: Progress in Differential-Algebraic Equations II, pp. 165–184.
Springer, Cham.
"""
function Rodas4P2Tableau(T, T2)
function Rodas4P2Tableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = 0.25
b = T[RODAS4P2A[6, 1], RODAS4P2A[6, 2], RODAS4P2A[6, 3], RODAS4P2A[6, 4], RODAS4P2A[6, 5], one(T)]
btilde = T[zero(T), zero(T), zero(T), zero(T), zero(T), one(T)]
Expand Down Expand Up @@ -233,7 +233,7 @@ Reference: Di Marzo, G. (1993). Rodas5(4) -- Méthodes de Rosenbrock d'ordre 5(4
adaptées aux problemes différentiels-algébriques. Master's thesis,
University of Geneva.
"""
function Rodas5Tableau(T, T2)
function Rodas5Tableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = 0.19
s = size(RODAS5A, 1)
b = T[RODAS5A[s, i] for i in 1:(s - 1)]
Expand Down Expand Up @@ -284,7 +284,7 @@ Reference: Steinebach, G. (2023). Construction of Rosenbrock-Wanner method Rodas
and numerical benchmarks within the Julia Differential Equations package.
BIT Numerical Mathematics, 63, 27.
"""
function Rodas5PTableau(T, T2)
function Rodas5PTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = 0.21193756319429014
s = size(RODAS5PA, 1)
b = T[RODAS5PA[s, i] for i in 1:(s - 1)]
Expand All @@ -295,7 +295,7 @@ function Rodas5PTableau(T, T2)
end

# Rodas5Pe uses the same tableau as Rodas5P but with a custom btilde
function Rodas5PeTableau(T, T2)
function Rodas5PeTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = 0.21193756319429014
s = size(RODAS5PA, 1)
b = T[RODAS5PA[s, i] for i in 1:(s - 1)]
Expand Down Expand Up @@ -381,7 +381,7 @@ A 19-stage 6th order L-stable Rosenbrock method.
Reference: Steinebach, G. (2025). Rodas6P and Tsit5DA - two new Rosenbrock-type
methods for DAEs. arXiv:2511.21252.
"""
function Rodas6PTableau(T, T2)
function Rodas6PTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = 0.26
b = T[
RODAS6PA[16, 1], RODAS6PA[16, 2], RODAS6PA[16, 3], RODAS6PA[16, 4],
Expand All @@ -408,7 +408,7 @@ end
A 3rd order Rosenbrock method with 3 stages.
Reference: Lang, J., & Verwer, J. G. (2001). ROS3P—an accurate third-order Rosenbrock solver designed for parabolic problems. BIT Numerical Mathematics, 41, 731-738.
"""
function ROS3PRodasTableau(T, T2)
function ROS3PRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 1 / 2 + sqrt(3) / 6)
igamma = inv(gamma)
a21 = convert(T, igamma)
Expand Down Expand Up @@ -456,7 +456,7 @@ end
A 3rd order Rosenbrock method with 4 stages.
Reference: Sandu, A., et al. (1997). Benchmarking stiff ode solvers for atmospheric chemistry problems-I. implicit vs explicit. Atmospheric Environment, 31(19), 3151-3166.
"""
function Rodas3RodasTableau(T, T2)
function Rodas3RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 0)
A[3, 1] = convert(T, 2)
Expand Down Expand Up @@ -491,7 +491,7 @@ end
A 3rd order Rosenbrock method with 5 stages, including a dense output matrix H.
Reference: Steinebach, G. (2024). Rosenbrock methods within OrdinaryDiffEq.jl - Overview, recent developments and applications. Proceedings of the JuliaCon Conferences.
"""
function Rodas3PRodasTableau(T, T2)
function Rodas3PRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 1 // 3)
a21 = convert(T, 4.0 / 3.0)
a41 = convert(T, 2.90625)
Expand Down Expand Up @@ -553,7 +553,7 @@ end
A W-method variant of Rodas3P, providing 2nd order solutions with 5 stages.
Reference: Steinebach, G. (2024). Rosenbrock methods within OrdinaryDiffEq.jl - Overview, recent developments and applications. Proceedings of the JuliaCon Conferences.
"""
function Rodas23WRodasTableau(T, T2)
function Rodas23WRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 1 // 3)
a21 = convert(T, 4.0 / 3.0)
a41 = convert(T, 2.90625)
Expand Down Expand Up @@ -614,7 +614,7 @@ end

A 4th order Rosenbrock method developed by Shampine.
"""
function RosShamp4RodasTableau(T, T2)
function RosShamp4RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 1 // 2)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 2.0)
Expand Down Expand Up @@ -642,7 +642,7 @@ end

A 4th order Rosenbrock method by van Veldhuizen.
"""
function Veldd4RodasTableau(T, T2)
function Veldd4RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.2257081148225682)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 2.0)
Expand All @@ -665,7 +665,7 @@ function Veldd4RodasTableau(T, T2)
return RodasTableau(A, C, gamma, c, d, H, b, btilde)
end

function Velds4RodasTableau(T, T2)
function Velds4RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 1 // 2)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 2.0)
Expand Down Expand Up @@ -693,7 +693,7 @@ end

A 4th order Generalized Runge-Kutta (Rosenbrock) method by Kaps and Rentrop.
"""
function GRK4TRodasTableau(T, T2)
function GRK4TRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.231)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 2.0)
Expand All @@ -716,7 +716,7 @@ function GRK4TRodasTableau(T, T2)
return RodasTableau(A, C, gamma, c, d, H, b, btilde)
end

function GRK4ARodasTableau(T, T2)
function GRK4ARodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.395)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 1.108860759493671)
Expand Down Expand Up @@ -744,7 +744,7 @@ end

A 4th order L-stable Rosenbrock method.
"""
function Ros4LStabRodasTableau(T, T2)
function Ros4LStabRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.57282)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 2.0)
Expand Down Expand Up @@ -772,7 +772,7 @@ end

A 2nd order Rosenbrock method.
"""
function ROS2RodasTableau(T, T2)
function ROS2RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 1.7071067811865475)
A = zeros(T, 2, 2)
A[2, 1] = convert(T, 0.585786437626905)
Expand All @@ -786,7 +786,7 @@ function ROS2RodasTableau(T, T2)
return RodasTableau(A, C, gamma, c, d, H, b, btilde)
end

function ROS2PRRodasTableau(T, T2)
function ROS2PRRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.228155493653962)
A = zeros(T, 3, 3)
A[2, 1] = convert(T, 4.382975767906234)
Expand All @@ -809,7 +809,7 @@ end

A 2nd order Rosenbrock method with specific stability properties.
"""
function ROS2SRodasTableau(T, T2)
function ROS2SRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.292893218813452)
A = zeros(T, 3, 3)
A[2, 1] = convert(T, 2.0000000000000036)
Expand All @@ -832,7 +832,7 @@ end

A 3rd order Rosenbrock method.
"""
function ROS3RodasTableau(T, T2)
function ROS3RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.435866521508459)
A = zeros(T, 3, 3)
A[2, 1] = convert(T, 1.0)
Expand All @@ -854,7 +854,7 @@ end

A 3rd order Rosenbrock method.
"""
function ROS3PRRodasTableau(T, T2)
function ROS3PRRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.788675134594813)
A = zeros(T, 3, 3)
A[2, 1] = convert(T, 3.0000000000000018)
Expand All @@ -878,7 +878,7 @@ end
A 4th order Rosenbrock method with 7 stages by Scholz.
Reference: Scholz, S. (1989).
"""
function Scholz4_7RodasTableau(T, T2)
function Scholz4_7RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.788675134594813)
A = zeros(T, 3, 3)
A[2, 1] = convert(T, 3.0000000000000018)
Expand All @@ -902,7 +902,7 @@ end
A Rosenbrock-W method of order (3)4.
Reference: Rang, J., & Angermann, L. (2005). New Rosenbrock-W methods of order 3 and 4 for stiff problems.
"""
function ROS34PW1aRodasTableau(T, T2)
function ROS34PW1aRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.435866521508459)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 5.0905205106702045)
Expand All @@ -924,7 +924,7 @@ function ROS34PW1aRodasTableau(T, T2)
return RodasTableau(A, C, gamma, c, d, H, b, btilde)
end

function ROS34PW1bRodasTableau(T, T2)
function ROS34PW1bRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.435866521508459)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 5.0905205106702045)
Expand Down Expand Up @@ -953,7 +953,7 @@ end
A Rosenbrock-W method of order (3)4.
Reference: Rang, J., & Angermann, L. (2005).
"""
function ROS34PW2RodasTableau(T, T2)
function ROS34PW2RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.435866521508459)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 2.0)
Expand Down Expand Up @@ -983,7 +983,7 @@ end
A Rosenbrock-W method of order (3)4.
Reference: Rang, J., & Angermann, L. (2005).
"""
function ROS34PW3RodasTableau(T, T2)
function ROS34PW3RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 1.0685790213016289)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 2.3541034887609085)
Expand Down Expand Up @@ -1012,7 +1012,7 @@ end

A 3rd order Rosenbrock-W method.
"""
function ROS34PRwRodasTableau(T, T2)
function ROS34PRwRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.435866521508459)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 2.0)
Expand Down Expand Up @@ -1041,7 +1041,7 @@ end

A 3rd order low-storage Rosenbrock method.
"""
function ROS3PRLRodasTableau(T, T2)
function ROS3PRLRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.435866521508459)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 1.147140180139521)
Expand Down Expand Up @@ -1069,7 +1069,7 @@ end

A 3rd order low-storage Rosenbrock method.
"""
function ROS3PRL2RodasTableau(T, T2)
function ROS3PRL2RodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.435866521508459)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 3.000000000000007)
Expand Down Expand Up @@ -1098,7 +1098,7 @@ end
A 4th order Rosenbrock-Kaps method with 4 stages.
Reference: Kaps, P., & Rentrop, P. (1979).
"""
function ROK4aRodasTableau(T, T2)
function ROK4aRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.572816062482135)
A = zeros(T, 4, 4)
A[2, 1] = convert(T, 1.745761101158346)
Expand Down Expand Up @@ -1126,7 +1126,7 @@ end

A 6-stage 4th order Rosenbrock-W method.
"""
function RosenbrockW6S4OSRodasTableau(T, T2)
function RosenbrockW6S4OSRodasTableau(::Type{T}, ::Type{T2}) where {T, T2}
gamma = convert(T2, 0.25)
A = zeros(T, 6, 6)
A[2, 1] = convert(T, 0.5812383407115008)
Expand Down Expand Up @@ -1249,7 +1249,7 @@ const TSIT5DA_H = [
A 12-stage order 5(4) hybrid explicit/linear-implicit method for DAEs.
Reference: Steinebach (2025), arXiv:2511.21252
"""
function Tsit5DATableau(T, T2)
function Tsit5DATableau(::Type{T}, ::Type{T2}) where {T, T2}
return Tsit5DATableau{T, T2}(
TSIT5DA_A, TSIT5DA_GAMMA, convert(T2, 0.15),
TSIT5DA_b, TSIT5DA_bhat, TSIT5DA_c, TSIT5DA_d, TSIT5DA_H
Expand Down
Loading