diff --git a/src/OrdinaryDiffEq.jl b/src/OrdinaryDiffEq.jl index d154d120e3..99caa3f8fa 100644 --- a/src/OrdinaryDiffEq.jl +++ b/src/OrdinaryDiffEq.jl @@ -7,7 +7,7 @@ using Reexport @reexport using DiffEqBase import OrdinaryDiffEqCore: trivial_limiter!, CompositeAlgorithm, alg_order, ShampineCollocationInit, BrownBasicInit -export CompositeAlgorithm, ShampineCollocationInit, BrownBasicInit +export CompositeAlgorithm, ShampineCollocationInit, BrownFullBasicInit import OrdinaryDiffEqDifferentiation using OrdinaryDiffEqDifferentiation: _alg_autodiff, resize_grad_config!, dolinsolve, wrapprecs, UJacobianWrapper, build_jac_config, WOperator, FirstAutodiffJacError, calc_J!, calc_W!, calc_J, calc_W, jacobian2W! diff --git a/test/integrators/ode_cache_tests.jl b/test/integrators/ode_cache_tests.jl index 930cc22255..da8e1b72e7 100644 --- a/test/integrators/ode_cache_tests.jl +++ b/test/integrators/ode_cache_tests.jl @@ -1,5 +1,6 @@ using OrdinaryDiffEq, OrdinaryDiffEqCore, DiffEqBase, Test using Random, SparseDiffTools +using OrdinaryDiffEqDefault using ElasticArrays, LinearSolve Random.seed!(213) CACHE_TEST_ALGS = [Euler(), Midpoint(), RK4(), SSPRK22(), SSPRK33(), SSPRK43(), SSPRK104(), @@ -8,7 +9,7 @@ CACHE_TEST_ALGS = [Euler(), Midpoint(), RK4(), SSPRK22(), SSPRK33(), SSPRK43(), BS3(), BS5(), DP5(), DP8(), Feagin10(), Feagin12(), Feagin14(), TanYam7(), Tsit5(), TsitPap8(), Vern6(), Vern7(), Vern8(), Vern9(), OwrenZen3(), OwrenZen4(), OwrenZen5(), AutoTsit5(Rosenbrock23()), TRBDF2(), KenCarp4(), ABDF2(), - OrdinaryDiffEqCore.DefaultODEAlgorithm()] + OrdinaryDiffEqDefault.DefaultODEAlgorithm()] broken_CACHE_TEST_ALGS = [ QNDF(), ExtrapolationMidpointHairerWanner(), diff --git a/test/interface/autodiff_error_tests.jl b/test/interface/autodiff_error_tests.jl index df4e89cc3b..7e90749fa2 100644 --- a/test/interface/autodiff_error_tests.jl +++ b/test/interface/autodiff_error_tests.jl @@ -1,5 +1,5 @@ using OrdinaryDiffEq, Test -using OrdinaryDiffEqCore +using OrdinaryDiffEqDifferentiation const a = Float64[1.0] @@ -13,7 +13,7 @@ end u0 = [1.0; 0.0; 0.0] tspan = (0.0, 1.0) prob = ODEProblem(lorenz, u0, tspan) -@test_throws OrdinaryDiffEqCore.OrdinaryDiffEqDifferentiation.FirstAutodiffJacError solve(prob, Rosenbrock23()) +@test_throws OrdinaryDiffEqDifferentiation.FirstAutodiffJacError solve(prob, Rosenbrock23()) function lorenz(u, p, t) du1 = 10.0(u[2] - u[1]) @@ -22,7 +22,7 @@ function lorenz(u, p, t) du3 = u[1] * u[2] - (8 / 3) * u[3] [du1, du2, du3] end -@test_throws OrdinaryDiffEqCore.OrdinaryDiffEqDifferentiation.FirstAutodiffTgradError solve(prob, Rosenbrock23()) +@test_throws OrdinaryDiffEqDifferentiation.FirstAutodiffTgradError solve(prob, Rosenbrock23()) function lorenz!(du, u, p, t) du[1] = 10.0(u[2] - u[1]) diff --git a/test/interface/dae_initialize_integration.jl b/test/interface/dae_initialize_integration.jl index 2d09cb1a41..fd27103441 100644 --- a/test/interface/dae_initialize_integration.jl +++ b/test/interface/dae_initialize_integration.jl @@ -1,4 +1,5 @@ using ModelingToolkit, OrdinaryDiffEq, Test +using @parameters t g e b @variables v(t) w(t) F(t)