Clean up rebase

Author: avik-pal

Project.toml

@@ -42,7 +42,7 @@ Aqua = "0.7"
 ArrayInterface = "7"
 BandedMatrices = "1"
 ConcreteStructs = "0.2"
-DiffEqBase = "6.135"
+DiffEqBase = "6.138"
 ForwardDiff = "0.10"
 LinearAlgebra = "1.9"
 LinearSolve = "2"

README.md

@@ -48,12 +48,13 @@ Precompilation can be controlled via `Preferences.jl`
   - `PrecompileMIRK` -- Precompile the MIRK2 - MIRK6 algorithms (default: `true`).
   - `PrecompileShooting` -- Precompile the single shooting algorithms (default: `true`). This is triggered when `OrdinaryDiffEq` is loaded.
   - `PrecompileMultipleShooting` -- Precompile the multiple shooting algorithms (default: `true`). This is triggered when `OrdinaryDiffEq` is loaded.
-<<<<<<< HEAD
+    <<<<<<< HEAD
   - `PrecompileMIRKNLLS` -- Precompile the MIRK2 - MIRK6 algorithms for under-determined and over-determined BVPs (default: `true` on Julia Version 1.10 and above).
   - `PrecompileShootingNLLS` -- Precompile the single shooting algorithms for under-determined and over-determined BVPs (default: `true` on Julia Version 1.10 and above). This is triggered when `OrdinaryDiffEq` is loaded.
   - `PrecompileMultipleShootingNLLS` -- Precompile the multiple shooting algorithms for under-determined and over-determined BVPs (default: `true` on Julia Version 1.10 and above). This is triggered when `OrdinaryDiffEq` is loaded.
-=======
->>>>>>> 5d53c01 (Add documentation about the solvers)
+    =======
+
+> > > > > > > 5d53c01 (Add documentation about the solvers)
 
 To set these preferences before loading the package, do the following (replacing `PrecompileShooting` with the preference you want to set, or pass in multiple pairs to set them together):
 

src/BoundaryValueDiffEq.jl

@@ -22,31 +22,6 @@ end
 
 @reexport using ADTypes, DiffEqBase, NonlinearSolve, SparseDiffTools, SciMLBase
 
-# TODO: Upstream
-# For BVPs we want to propagate even a function u0
-function DiffEqBase.get_concrete_u0(prob::BVProblem, isadapt, t0, kwargs)
-    if haskey(kwargs, :u0)
-        u0 = kwargs[:u0]
-    else
-        u0 = prob.u0
-    end
-
-    isadapt && eltype(u0) <: Integer && (u0 = float.(u0))
-
-    _u0 = DiffEqBase.handle_distribution_u0(u0)
-
-    if isinplace(prob) && (_u0 isa Number || _u0 isa DiffEqBase.SArray)
-        throw(DiffEqBase.IncompatibleInitialConditionError())
-    end
-
-    if _u0 isa Tuple
-        throw(DiffEqBase.TupleStateError())
-    end
-
-    return _u0
-end
-# End of Upstream
-
 include("types.jl")
 include("utils.jl")
 include("algorithms.jl")

src/solve/multiple_shooting.jl

@@ -2,7 +2,8 @@ function __solve(prob::BVProblem, _alg::MultipleShooting{true}; odesolve_kwargs
         nlsolve_kwargs = (;), ensemblealg = EnsembleThreads(), verbose = true, kwargs...)
     # For TwoPointBVPs there is nothing to do. Forward to general multiple shooting
     prob.problem_type isa TwoPointBVProblem &&
-        return __solve_internal(prob, _alg; kwargs...)
+        return __solve_internal(prob, _alg; odesolve_kwargs, nlsolve_kwargs, ensemblealg,
+            verbose, kwargs...)
 
     # Extract the time-points used in BC
     _prob = ODEProblem{isinplace(prob)}(prob.f, prob.u0, prob.tspan, prob.p)