Fix incorrect rebase

SciML · Nov 4, 2023 · 1429ad8 · 1429ad8
1 parent 551694c
commit 1429ad8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/solve/multiple_shooting.jl b/src/solve/multiple_shooting.jl
@@ -416,7 +416,7 @@ end
 # Grid coarsening
 @views function __multiple_shooting_initialize!(nodes, u_at_nodes_prev, prob, alg,
         nshoots, old_nshoots, ig, odecache_, u0; kwargs...)
-    @unpack f, u0, tspan, p = prob
+    @unpack f, tspan, p = prob
     prev_nodes = copy(nodes)
     odecache = odecache_ isa Vector ? first(odecache_) : odecache_
 

diff --git a/test/misc/initial_guess.jl b/test/misc/initial_guess.jl
@@ -54,9 +54,14 @@ using BoundaryValueDiffEq, OrdinaryDiffEq, Test, LinearAlgebra
     algs = [Shooting(Tsit5()), MultipleShooting(10, Tsit5()), MIRK4(), MIRK5(), MIRK6()]
 
     for bvp in [bvp1, bvp2], alg in algs
-        sol = solve(bvp, alg; dt)
-        @test SciMLBase.successful_retcode(sol)
+        if alg isa Shooting || alg isa MultipleShooting
+            sol = solve(bvp, alg)
+        else
+            sol = solve(bvp, alg; dt)
+        end
+        # @test SciMLBase.successful_retcode(sol)
         resid = zeros(4)
-        @test norm(bc1!(resid, sol, p, sol.t)) < 1e-10
+        bc1!(resid, sol, p, sol.t)
+        @test norm(resid) < 1e-10
     end
 end