From 393a506549358b54a44bb6dd2a23ce71faf82f8e Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 17 Dec 2023 12:41:23 -0500 Subject: [PATCH 1/4] Update StaticArray tests for eltype requirements --- test/interface/static_array_tests.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/interface/static_array_tests.jl b/test/interface/static_array_tests.jl index cae40bc4f4..3622051ed7 100644 --- a/test/interface/static_array_tests.jl +++ b/test/interface/static_array_tests.jl @@ -2,7 +2,7 @@ using StaticArrays, Test using OrdinaryDiffEq using RecursiveArrayTools -u0 = [fill(2, MVector{2, Float64}), ones(MVector{2, Float64})] +u0 = VectorOfAray([fill(2, MVector{2, Float64}), ones(MVector{2, Float64})]) g(u, p, t) = SA[u[1] + u[2], u[1]] f = (du, u, p, t) -> begin for i in 1:2 @@ -17,7 +17,7 @@ sol = solve(ode, Tsit5()) sol = solve(ode, Vern9()) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) -u0 = [fill(2, SVector{2, Float64}), ones(SVector{2, Float64})] +u0 = VectorOfAray([fill(2, SVector{2, Float64}), ones(SVector{2, Float64})]) ode = ODEProblem(f, u0, (0.0, 1.0)) sol = solve(ode, Euler(), dt = 1e-2) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) @@ -28,14 +28,14 @@ sol = solve(ode, SSPRK22(), dt = 1e-2) sol = solve(ode, ROCK4()) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) -u0 = ones(MVector{2, Float64}) +u0 = VectorOfAray(ones(MVector{2, Float64})) ode = ODEProblem(g, u0, (0.0, 1.0)) sol = solve(ode, Euler(), dt = 1e-2) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) sol = solve(ode, Tsit5(), dt = 1e-2) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) -u0 = ones(SVector{2, Float64}) +u0 = VectorOfAray(ones(SVector{2, Float64})) f = (u, p, t) -> u ode = ODEProblem(f, u0, (0.0, 1.0)) sol = solve(ode, Euler(), dt = 1e-2) From f35f470be08b690beeb34271012b97a362c89705 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 17 Dec 2023 13:12:52 -0500 Subject: [PATCH 2/4] typo --- test/interface/static_array_tests.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/interface/static_array_tests.jl b/test/interface/static_array_tests.jl index 3622051ed7..5ad6c07064 100644 --- a/test/interface/static_array_tests.jl +++ b/test/interface/static_array_tests.jl @@ -2,7 +2,7 @@ using StaticArrays, Test using OrdinaryDiffEq using RecursiveArrayTools -u0 = VectorOfAray([fill(2, MVector{2, Float64}), ones(MVector{2, Float64})]) +u0 = VectorOfArray([fill(2, MVector{2, Float64}), ones(MVector{2, Float64})]) g(u, p, t) = SA[u[1] + u[2], u[1]] f = (du, u, p, t) -> begin for i in 1:2 @@ -17,7 +17,7 @@ sol = solve(ode, Tsit5()) sol = solve(ode, Vern9()) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) -u0 = VectorOfAray([fill(2, SVector{2, Float64}), ones(SVector{2, Float64})]) +u0 = VectorOfArray([fill(2, SVector{2, Float64}), ones(SVector{2, Float64})]) ode = ODEProblem(f, u0, (0.0, 1.0)) sol = solve(ode, Euler(), dt = 1e-2) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) @@ -28,14 +28,14 @@ sol = solve(ode, SSPRK22(), dt = 1e-2) sol = solve(ode, ROCK4()) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) -u0 = VectorOfAray(ones(MVector{2, Float64})) +u0 = VectorOfArray(ones(MVector{2, Float64})) ode = ODEProblem(g, u0, (0.0, 1.0)) sol = solve(ode, Euler(), dt = 1e-2) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) sol = solve(ode, Tsit5(), dt = 1e-2) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) -u0 = VectorOfAray(ones(SVector{2, Float64})) +u0 = VectorOfArray(ones(SVector{2, Float64})) f = (u, p, t) -> u ode = ODEProblem(f, u0, (0.0, 1.0)) sol = solve(ode, Euler(), dt = 1e-2) From 1ed5ccce54b54d77d0f7e17e68f0467d70d78cc5 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Mon, 18 Dec 2023 08:20:02 -0500 Subject: [PATCH 3/4] Update test/interface/static_array_tests.jl --- test/interface/static_array_tests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/interface/static_array_tests.jl b/test/interface/static_array_tests.jl index 5ad6c07064..c9e2216486 100644 --- a/test/interface/static_array_tests.jl +++ b/test/interface/static_array_tests.jl @@ -28,7 +28,7 @@ sol = solve(ode, SSPRK22(), dt = 1e-2) sol = solve(ode, ROCK4()) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) -u0 = VectorOfArray(ones(MVector{2, Float64})) +u0 = ones(MVector{2, Float64}) ode = ODEProblem(g, u0, (0.0, 1.0)) sol = solve(ode, Euler(), dt = 1e-2) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) From 8296bc3d2538f4eb85941c13928883965f430624 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Mon, 18 Dec 2023 08:20:16 -0500 Subject: [PATCH 4/4] Update test/interface/static_array_tests.jl --- test/interface/static_array_tests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/interface/static_array_tests.jl b/test/interface/static_array_tests.jl index c9e2216486..ff2bcbb3cf 100644 --- a/test/interface/static_array_tests.jl +++ b/test/interface/static_array_tests.jl @@ -35,7 +35,7 @@ sol = solve(ode, Euler(), dt = 1e-2) sol = solve(ode, Tsit5(), dt = 1e-2) @test !any(iszero.(sol(1.0))) && !any(sol(1.0) .== u0) -u0 = VectorOfArray(ones(SVector{2, Float64})) +u0 = ones(SVector{2, Float64}) f = (u, p, t) -> u ode = ODEProblem(f, u0, (0.0, 1.0)) sol = solve(ode, Euler(), dt = 1e-2)