Skip to content

Commit aa436e4

Browse files
Merge pull request #2379 from SciML/os/fix-get_tmp_cache
move `get_tmp_cache` for out of place methods to the right place
2 parents 65946a8 + 708c4fe commit aa436e4

File tree

2 files changed

+4
-55
lines changed

2 files changed

+4
-55
lines changed

lib/OrdinaryDiffEqCore/src/integrators/integrator_interface.jl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,11 @@ end
107107
get_tmp_cache(integrator::ODEIntegrator, integrator.alg, integrator.cache)
108108
end
109109

110-
# avoid method ambiguity
111-
# for typ in (Union{RadauIIA3, RadauIIA5, RadauIIA7})
112-
# @eval @inline function DiffEqBase.get_tmp_cache(integrator, alg::$typ,
113-
# cache::OrdinaryDiffEqConstantCache)
114-
# nothing
115-
# end
116-
# end
117-
118110
# the ordering of the cache arrays is important!!!
111+
@inline function DiffEqBase.get_tmp_cache(integrator, alg::OrdinaryDiffEqAlgorithm,
112+
cache::OrdinaryDiffEqConstantCache)
113+
nothing
114+
end
119115
@inline function DiffEqBase.get_tmp_cache(integrator, alg::OrdinaryDiffEqAlgorithm,
120116
cache::OrdinaryDiffEqMutableCache)
121117
(cache.tmp,)

lib/OrdinaryDiffEqSSPRK/src/functions.jl

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,3 @@
1-
@eval @inline function DiffEqBase.get_tmp_cache(integrator, alg::SSPRK22,
2-
cache::OrdinaryDiffEqConstantCache)
3-
nothing
4-
end
5-
6-
@eval @inline function DiffEqBase.get_tmp_cache(integrator, alg::SSPRK33,
7-
cache::OrdinaryDiffEqConstantCache)
8-
nothing
9-
end
10-
11-
@eval @inline function DiffEqBase.get_tmp_cache(integrator, alg::SSPRK53_2N1,
12-
cache::OrdinaryDiffEqConstantCache)
13-
nothing
14-
end
15-
16-
@eval @inline function DiffEqBase.get_tmp_cache(integrator, alg::SSPRK53_2N2,
17-
cache::OrdinaryDiffEqConstantCache)
18-
nothing
19-
end
20-
21-
@eval @inline function DiffEqBase.get_tmp_cache(integrator, alg::SSPRK432,
22-
cache::OrdinaryDiffEqConstantCache)
23-
nothing
24-
end
25-
26-
@eval @inline function DiffEqBase.get_tmp_cache(integrator, alg::SSPRK932,
27-
cache::OrdinaryDiffEqConstantCache)
28-
nothing
29-
end
30-
31-
@eval @inline function DiffEqBase.get_tmp_cache(
32-
integrator, alg::OrdinaryDiffEqNewtonAdaptiveAlgorithm,
33-
cache::OrdinaryDiffEqConstantCache)
34-
nothing
35-
end
36-
37-
@eval @inline function DiffEqBase.get_tmp_cache(
38-
integrator, alg::OrdinaryDiffEqRosenbrockAdaptiveAlgorithm,
39-
cache::OrdinaryDiffEqConstantCache)
40-
nothing
41-
end
42-
43-
@eval @inline function DiffEqBase.get_tmp_cache(integrator, alg::OrdinaryDiffEqAlgorithm,
44-
cache::OrdinaryDiffEqConstantCache)
45-
nothing
46-
end
47-
481
@inline function DiffEqBase.get_tmp_cache(integrator,
492
alg::Union{SSPRK22, SSPRK33, SSPRK53_2N1,
503
SSPRK53_2N2, SSPRK43, SSPRK432,

0 commit comments

Comments
 (0)