Merge pull request #2196 from oscardssmith/os/fix-NonlinearSolveAlg-convergence-criteria

I think this fixes a few minor bugs with nonlinear convergence

Author: ChrisRackauckas

src/nlsolve/newton.jl

@@ -83,7 +83,12 @@ end
     nlcache = nlsolver.cache.cache
     step!(nlcache)
     nlsolver.ztmp = nlcache.u
-    ndz = opts.internalnorm(nlcache.fu, t)
+
+    ustep = compute_ustep(tmp, γ, z, method)
+    atmp = calculate_residuals(nlcache.fu, uprev, ustep, opts.abstol, opts.reltol,
+        opts.internalnorm, t)
+    ndz = opts.internalnorm(atmp, t)
+    #ndz = opts.internalnorm(nlcache.fu, t)
     # NDF and BDF are special because the truncation error is directly
     # proportional to the total displacement.
     if integrator.alg isa QNDF
@@ -95,12 +100,17 @@ end
 @muladd function compute_step!(nlsolver::NLSolver{<:NonlinearSolveAlg, true}, integrator)
     @unpack uprev, t, p, dt, opts = integrator
     @unpack z, tmp, ztmp, γ, α, cache, method = nlsolver
-    @unpack tstep, invγdt, ustep = cache
+    @unpack tstep, invγdt, atmp, ustep = cache
 
     nlcache = nlsolver.cache.cache
     step!(nlcache)
     @.. broadcast=false ztmp=nlcache.u
-    ndz = opts.internalnorm(nlcache.fu, t)
+
+    ustep = compute_ustep!(ustep, tmp, γ, z, method)
+    calculate_residuals!(atmp, nlcache.fu, uprev, ustep, opts.abstol, opts.reltol,
+        opts.internalnorm, t)
+    ndz = opts.internalnorm(atmp, t)
+    #ndz = opts.internalnorm(nlcache.fu, t)
     # NDF and BDF are special because the truncation error is directly
     # proportional to the total displacement.
     if integrator.alg isa QNDF

src/nlsolve/type.jl

@@ -237,6 +237,7 @@ mutable struct NonlinearSolveCache{uType, tType, rateType, tType2, P, C} <:
     ustep::uType
     tstep::tType
     k::rateType
+    atmp::uType
     invγdt::tType2
     prob::P
     cache::C

src/nlsolve/utils.jl

@@ -224,7 +224,7 @@ function build_nlsolver(
             end
             prob = NonlinearProblem(NonlinearFunction(nlf), ztmp, nlp_params)
             cache = init(prob, nlalg.alg)
-            nlcache = NonlinearSolveCache(ustep, tstep, k, invγdt, prob, cache)
+            nlcache = NonlinearSolveCache(ustep, tstep, k, atmp, invγdt, prob, cache)
         else
             nlcache = NLNewtonCache(ustep, tstep, k, atmp, dz, J, W, true,
                 true, true, tType(dt), du1, uf, jac_config,
@@ -308,7 +308,7 @@ function build_nlsolver(
             end
             prob = NonlinearProblem(NonlinearFunction(nlf), copy(ztmp), nlp_params)
             cache = init(prob, nlalg.alg)
-            nlcache = NonlinearSolveCache(nothing, tstep, nothing, invγdt, prob, cache)
+            nlcache = NonlinearSolveCache(nothing, tstep, nothing, nothing, invγdt, prob, cache)
         else
             nlcache = NLNewtonConstantCache(tstep, J, W, true, true, true, tType(dt), uf,
                 invγdt, tType(nlalg.new_W_dt_cutoff), t)