Merge pull request #907 from SciML/kwargshandle_error

Change default kwargs handle from warn to error

Author: ChrisRackauckas

src/solve.jl

@@ -88,7 +88,7 @@ const allowedkeywords = (:dense,
     :linsolve_kwargs)
 
 const KWARGWARN_MESSAGE = """
-                          Unrecognized keyword arguments found. Future versions will error.
+                          Unrecognized keyword arguments found.
                           The only allowed keyword arguments to `solve` are:
                           $allowedkeywords
 
@@ -450,8 +450,12 @@ function Base.showerror(io::IO, e::IncompatibleMassMatrixError)
     println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
-function init_call(_prob, args...; merge_callbacks = true, kwargshandle = KeywordArgWarn,
+function init_call(_prob, args...; merge_callbacks = true, kwargshandle = nothing,
     kwargs...)
+
+    kwargshandle = kwargshandle === nothing ? KeywordArgError : kwargshandle
+    kwargshandle = has_kwargs(_prob) && haskey(_prob.kwargs, :kwargshandle) ? _prob.kwargs[:kwargshandle] : kwargshandle
+
     if has_kwargs(_prob)
         if merge_callbacks && haskey(_prob.kwargs, :callback) && haskey(kwargs, :callback)
             kwargs_temp = NamedTuple{
@@ -526,8 +530,12 @@ function init_up(prob::DEProblem, sensealg, u0, p, args...; kwargs...)
     end
 end
 
-function solve_call(_prob, args...; merge_callbacks = true, kwargshandle = KeywordArgWarn,
+function solve_call(_prob, args...; merge_callbacks = true, kwargshandle = nothing,
     kwargs...)
+
+    kwargshandle = kwargshandle === nothing ? KeywordArgError : kwargshandle
+    kwargshandle = has_kwargs(_prob) && haskey(_prob.kwargs, :kwargshandle) ? _prob.kwargs[:kwargshandle] : kwargshandle
+
     if has_kwargs(_prob)
         if merge_callbacks && haskey(_prob.kwargs, :callback) && haskey(kwargs, :callback)
             kwargs_temp = NamedTuple{

test/downstream/kwarg_warn.jl

@@ -8,10 +8,9 @@ u0 = [1.0; 0.0; 0.0]
 tspan = (0.0, 100.0)
 prob = ODEProblem(lorenz, u0, tspan)
 @test_nowarn sol = solve(prob, Tsit5(), reltol = 1e-6)
-sol = solve(prob, Tsit5(), rel_tol = 1e-6)
-@test_logs (:warn, DiffEqBase.KWARGWARN_MESSAGE) sol=solve(prob, Tsit5(), rel_tol = 1e-6)
-@test_throws DiffEqBase.CommonKwargError sol=solve(prob, Tsit5(), rel_tol = 1e-6,
-    kwargshandle = DiffEqBase.KeywordArgError)
+sol = solve(prob, Tsit5(), rel_tol = 1e-6, kwargshandle = DiffEqBase.KeywordArgWarn)
+@test_logs (:warn, DiffEqBase.KWARGWARN_MESSAGE) sol=solve(prob, Tsit5(), rel_tol = 1e-6, kwargshandle = DiffEqBase.KeywordArgWarn)
+@test_throws DiffEqBase.CommonKwargError sol=solve(prob, Tsit5(), rel_tol = 1e-6)
 
-prob = ODEProblem(lorenz, u0, tspan, test = 2.0)
+prob = ODEProblem(lorenz, u0, tspan, test = 2.0, kwargshandle = DiffEqBase.KeywordArgWarn)
 @test_logs (:warn, DiffEqBase.KWARGWARN_MESSAGE) sol=solve(prob, Tsit5(), reltol = 1e-6)