use SciMLMessage

Author: jClugstor

lib/BracketingNonlinearSolve/src/bisection.jl

@@ -45,9 +45,9 @@ function SciMLBase.__solve(
     end
 
     if sign(fl) == sign(fr)
-        verbose &&
-            @warn "The interval is not an enclosing interval, opposite signs at the \
-                   boundaries are required."
+        @SciMLMessage("The interval is not an enclosing interval, opposite signs at the \
+        boundaries are required.",
+        nonlinear_verbose[], :non_enclosing_interval, :error_control)
         return SciMLBase.build_solution(
             prob, alg, left, fl; retcode = ReturnCode.InitialFailure, left, right
         )

lib/BracketingNonlinearSolve/src/brent.jl

@@ -33,9 +33,9 @@ function SciMLBase.__solve(
     end
 
     if sign(fl) == sign(fr)
-        verbose &&
-            @warn "The interval is not an enclosing interval, opposite signs at the \
-                   boundaries are required."
+        @SciMLMessage("The interval is not an enclosing interval, opposite signs at the \
+        boundaries are required.",
+            nonlinear_verbose[], :non_enclosing_interval, :error_control)
         return SciMLBase.build_solution(
             prob, alg, left, fl; retcode = ReturnCode.InitialFailure, left, right
         )

lib/BracketingNonlinearSolve/src/falsi.jl

@@ -32,9 +32,9 @@ function SciMLBase.__solve(
     end
 
     if sign(fl) == sign(fr)
-        verbose &&
-            @warn "The interval is not an enclosing interval, opposite signs at the \
-                   boundaries are required."
+        @SciMLMessage("The interval is not an enclosing interval, opposite signs at the \
+        boundaries are required.",
+            nonlinear_verbose[], :non_enclosing_interval, :error_control)
         return SciMLBase.build_solution(
             prob, alg, left, fl; retcode = ReturnCode.InitialFailure, left, right
         )

lib/BracketingNonlinearSolve/src/itp.jl

@@ -83,9 +83,9 @@ function SciMLBase.__solve(
     end
 
     if sign(fl) == sign(fr)
-        verbose &&
-            @warn "The interval is not an enclosing interval, opposite signs at the \
-                   boundaries are required."
+        @SciMLMessage("The interval is not an enclosing interval, opposite signs at the \
+        boundaries are required.",
+            nonlinear_verbose[], :non_enclosing_interval, :error_control)
         return SciMLBase.build_solution(
             prob, alg, left, fl; retcode = ReturnCode.InitialFailure, left, right
         )

lib/BracketingNonlinearSolve/src/ridder.jl

@@ -32,9 +32,9 @@ function SciMLBase.__solve(
     end
 
     if sign(fl) == sign(fr)
-        verbose &&
-            @warn "The interval is not an enclosing interval, opposite signs at the \
-                   boundaries are required."
+        @SciMLMessage("The interval is not an enclosing interval, opposite signs at the \
+        boundaries are required.",
+            nonlinear_verbose[], :non_enclosing_interval, :error_control)
         return SciMLBase.build_solution(
             prob, alg, left, fl; retcode = ReturnCode.InitialFailure, left, right
         )

lib/NonlinearSolveBase/src/descent/newton.jl

@@ -31,7 +31,6 @@ function InternalAPI.init(
         abstol = nothing, reltol = nothing,
         timer = get_timer_output(), kwargs...
 )
-    #Main.@infiltrate
     @bb δu = similar(u)
     δus = Utils.unwrap_val(shared) ≤ 1 ? nothing : map(2:Utils.unwrap_val(shared)) do i
         @bb δu_ = similar(u)

lib/NonlinearSolveBase/src/solve.jl

@@ -1,10 +1,18 @@
 function SciMLBase.__solve(
         prob::AbstractNonlinearProblem, alg::AbstractNonlinearSolveAlgorithm, args...;
-        kwargs...
+        verbose = NonlinearVerbosity(), linsolve_kwargs = (;), kwargs...
 )
-    #Main.@infiltrate
-    cache = SciMLBase.__init(prob, alg, args...; kwargs...)
-    return CommonSolve.solve!(cache)
+    if !haskey(linsolve_kwargs, :verbose)
+            linsolve_kwargs = merge(
+                linsolve_kwargs, (; verbose = verbose.linear_verbosity))
+    end
+
+    @with non_linear_verbose => verbose begin
+        cache = SciMLBase.__init(prob, alg, args...; linsolve_kwargs, kwargs...)
+        sol = CommonSolve.solve!(cache)
+    end
+
+    return sol
 end
 
 function CommonSolve.solve!(cache::AbstractNonlinearSolveCache)

lib/NonlinearSolveBase/src/verbosity.jl

@@ -1,9 +1,8 @@
-using Base.ScopedValues
-const non_linear_verbose = ScopedValue(NonlinearVerbosity())
-
 mutable struct NonlinearErrorControlVerbosity
     immutable_u0::Verbosity.Type
     non_enclosing_interval::Verbosity.Type
+    non_forward_mode::Verbosity.Type
+    ad_backend_incompatible::Verbosity.Type
 
     function NonlinearErrorControlVerbosity()
         new()