Cover more tests

Signed-off-by: ErikQQY <2283984853@qq.com>

Author: ErikQQY

ext/NonlinearSolveSIAMFANLEquationsExt.jl

@@ -4,13 +4,12 @@ using NonlinearSolve, SciMLBase
 using SIAMFANLEquations
 import ConcreteStructs: @concrete
 import UnPack: @unpack
-import FiniteDiff, ForwardDiff
 
 function SciMLBase.__solve(prob::NonlinearProblem, alg::SIAMFANLEquationsJL, args...; abstol = nothing,
         reltol = nothing, alias_u0::Bool = false, maxiters = 1000, termination_condition = nothing, kwargs...)
     @assert (termination_condition === nothing) || (termination_condition isa AbsNormTerminationMode) "SIAMFANLEquationsJL does not support termination conditions!"
 
-    @unpack method, autodiff, show_trace, delta, linsolve = alg
+    @unpack method, show_trace, delta, linsolve = alg
 
     iip = SciMLBase.isinplace(prob)
     T = eltype(prob.u0)
@@ -52,8 +51,6 @@ function SciMLBase.__solve(prob::NonlinearProblem, alg::SIAMFANLEquationsJL, arg
         u = NonlinearSolve.__maybe_unaliased(prob.u0, alias_u0)
     end
 
-    fu = NonlinearSolve.evaluate_f(prob, u)
-
     if iip
         f! = function (du, u)
             prob.f(du, u, prob.p)

src/extension_algs.jl

@@ -331,8 +331,6 @@ end
 ### Keyword Arguments
 
   - `method`: the choice of method for solving the nonlinear system.
-  - `autodiff`: the choice of method for generating the Jacobian. Defaults to `:central` or
-    central differencing via FiniteDiff.jl. The other choices are `:forward`.
   - `show_trace`: whether to show the trace.
   - `delta`: initial pseudo time step, default is 1e-3.
   - `linsolve` : JFNK linear solvers, choices are `gmres` and `bicgstab`.
@@ -345,15 +343,14 @@ end
 """
 @concrete struct SIAMFANLEquationsJL <: AbstractNonlinearAlgorithm
     method::Symbol
-    autodiff::Symbol
     show_trace::Bool
     delta
     linsolve::Union{Symbol, Nothing}
 end
 
-function SIAMFANLEquationsJL(; method = :newton, autodiff = :central, show_trace = false, delta = 1e-3, linsolve = nothing)
+function SIAMFANLEquationsJL(; method = :newton, show_trace = false, delta = 1e-3, linsolve = nothing)
     if Base.get_extension(@__MODULE__, :NonlinearSolveSIAMFANLEquationsExt) === nothing
         error("SIAMFANLEquationsJL requires SIAMFANLEquations.jl to be loaded")
     end
-  return SIAMFANLEquationsJL(method, autodiff, show_trace, delta, linsolve)
+  return SIAMFANLEquationsJL(method, show_trace, delta, linsolve)
 end

test/siamfanlequations.jl

@@ -70,11 +70,21 @@ for alg in [SIAMFANLEquationsJL()]
     @test maximum(du) < 1e-6
 end
 
-# tolerance tests
+# tolerance tests for scalar equation solvers
 f_tol(u, p) = u^2 - 2
 prob_tol = NonlinearProblem(f_tol, 1.0)
 for tol in [1e-1, 1e-3, 1e-6, 1e-10, 1e-11]
-    sol = solve(prob_tol, SIAMFANLEquationsJL(), abstol = tol)
+    for method = [:newton, :pseudotransient, :secant]
+        sol = solve(prob_tol, SIAMFANLEquationsJL(method = method), abstol = tol)
+        @test abs(sol.u[1] - sqrt(2)) < tol
+    end
+end
+
+# Test the JFNK technique
+f_jfnk(u, p) = u^2 - 2
+prob_jfnk = NonlinearProblem(f_jfnk, 1.0)
+for tol in [1e-1, 1e-3, 1e-6, 1e-10, 1e-11]
+    sol = solve(prob_jfnk, SIAMFANLEquationsJL(linsolve = :gmres), abstol = tol)
     @test abs(sol.u[1] - sqrt(2)) < tol
 end
 
@@ -85,7 +95,7 @@ function f!(fvec, x, p)
 end
 
 prob = NonlinearProblem{true}(f!, [0.1; 1.2])
-sol = solve(prob, SIAMFANLEquationsJL(autodiff = :central))
+sol = solve(prob, SIAMFANLEquationsJL())
 
 du = zeros(2)
 f!(du, sol.u, nothing)
@@ -98,7 +108,7 @@ function f!(fvec, x, p)
 end
 
 prob = NonlinearProblem{true}(f!, [0.1; 1.2])
-sol = solve(prob, SIAMFANLEquationsJL(autodiff = :forward))
+sol = solve(prob, SIAMFANLEquationsJL())
 
 du = zeros(2)
 f!(du, sol.u, nothing)
@@ -131,7 +141,9 @@ f = NonlinearFunction(f!, jac = j!)
 p = A
 
 ProbN = NonlinearProblem(f, init, p)
-sol = solve(ProbN, SIAMFANLEquationsJL(), reltol = 1e-8, abstol = 1e-8)
+for method = [:newton, :pseudotransient]
+    sol = solve(ProbN, SIAMFANLEquationsJL(method = method), reltol = 1e-8, abstol = 1e-8)
+end
 
 #= doesn't support complex numbers handling
 init = ones(Complex{Float64}, 152);