edits, adaptivity fixed

Shreyas-Ekanathan · Oct 20, 2024 · 58baa98 · 58baa98
1 parent a193e25
commit 58baa98
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 73 deletions.
diff --git a/lib/OrdinaryDiffEqFIRK/src/alg_utils.jl b/lib/OrdinaryDiffEqFIRK/src/alg_utils.jl
@@ -1,9 +1,9 @@
-qmax_default(alg::Union{RadauIIA3, RadauIIA5, RadauIIA9}) = 8
+qmax_default(alg::Union{RadauIIA3, RadauIIA5, RadauIIA9, AdaptiveRadau}) = 8
 
 alg_order(alg::RadauIIA3) = 3
 alg_order(alg::RadauIIA5) = 5
 alg_order(alg::RadauIIA9) = 9
-alg_order(alg::AdaptiveRadau) = 5
+alg_order(alg::AdaptiveRadau) = 5 #dummy value
 
 isfirk(alg::RadauIIA3) = true
 isfirk(alg::RadauIIA5) = true
@@ -13,3 +13,6 @@ isfirk(alg::AdaptiveRadau) = true
 alg_adaptive_order(alg::RadauIIA3) = 1
 alg_adaptive_order(alg::RadauIIA5) = 3
 alg_adaptive_order(alg::RadauIIA9) = 5
+
+get_current_alg_order(alg::AdaptiveRadau, cache) = cache.num_stages * 2 - 1
+get_current_adaptive_order(alg::AdaptiveRadau, cache) = cache.num_stages
diff --git a/lib/OrdinaryDiffEqFIRK/src/controllers.jl b/lib/OrdinaryDiffEqFIRK/src/controllers.jl
@@ -1,7 +1,6 @@
 @inline function stepsize_controller!(integrator, controller::PredictiveController, alg)
     @unpack qmin, qmax, gamma = integrator.opts
     EEst = DiffEqBase.value(integrator.EEst)
-
     if iszero(EEst)
         q = inv(qmax)
     else
@@ -51,7 +50,7 @@ end
 function step_accept_controller!(integrator, controller::PredictiveController, alg::AdaptiveRadau, q)
     @unpack qmin, qmax, gamma, qsteady_min, qsteady_max = integrator.opts
     @unpack cache = integrator
-    @unpack num_stages, step, θ, θprev = cache
+    @unpack num_stages, step, iter, hist_iter = cache
 
     EEst = DiffEqBase.value(integrator.EEst)
 
@@ -69,16 +68,18 @@ function step_accept_controller!(integrator, controller::PredictiveController, a
     end
     integrator.dtacc = integrator.dt
     integrator.erracc = max(1e-2, EEst)
-
     cache.step = step + 1
-    @show cache.num_stages
+    hist_iter = hist_iter * 0.8 + iter * 0.2
+    cache.hist_iter = hist_iter
     if (step > 10)
-        Ψ = θ * θprev
-        if (Ψ <= 0.001 && num_stages < alg.max_stages)
+        if (hist_iter < 2.6 && num_stages < alg.max_stages)
             cache.num_stages += 2
-        elseif ((Ψ >= 0.1 || cache.status == VerySlowConvergence || cache.status == Divergence) && num_stages > alg.min_stages)
+            cache.step = 1
+            cache.hist_iter = iter
+        elseif ((hist_iter > 8 || cache.status == VerySlowConvergence || cache.status == Divergence) && num_stages > alg.min_stages)
             cache.num_stages -= 2 
             cache.step = 1
+            cache.hist_iter = iter
         end
     end
     return integrator.dt / qacc
@@ -88,3 +89,21 @@ function step_reject_controller!(integrator, controller::PredictiveController, a
     @unpack dt, success_iter, qold = integrator
     integrator.dt = success_iter == 0 ? 0.1 * dt : dt / qold
 end
+
+function step_reject_controller!(integrator, controller::PredictiveController, alg::AdaptiveRadau)
+    @unpack dt, success_iter, qold = integrator
+    @unpack cache = integrator 
+    @unpack num_stages, step, iter, hist_iter = cache
+    integrator.dt = success_iter == 0 ? 0.1 * dt : dt / qold
+    cache.step = step + 1
+    hist_iter = hist_iter * 0.8 + iter * 0.2
+    cache.hist_iter = hist_iter
+    if (step > 10)
+        if ((hist_iter > 8 || cache.status == VerySlowConvergence || cache.status == Divergence) && num_stages > alg.min_stages)
+            cache.num_stages -= 2 
+            cache.step = 1
+            cache.hist_iter = iter
+        end
+    end
+end
+
diff --git a/lib/OrdinaryDiffEqFIRK/src/firk_caches.jl b/lib/OrdinaryDiffEqFIRK/src/firk_caches.jl
@@ -488,8 +488,7 @@ mutable struct AdaptiveRadauConstantCache{F, Tab, Tol, Dt, U, JType} <:
     J::JType
     num_stages::Int
     step::Int
-    θ::BigFloat
-    θprev::BigFloat
+    hist_iter::Float64
 end
 
 function alg_cache(alg::AdaptiveRadau, u, rate_prototype, ::Type{uEltypeNoUnits},
@@ -515,11 +514,11 @@ function alg_cache(alg::AdaptiveRadau, u, rate_prototype, ::Type{uEltypeNoUnits}
     κ = alg.κ !== nothing ? convert(uToltype, alg.κ) : convert(uToltype, 1 // 100)
     J = false .* _vec(rate_prototype) .* _vec(rate_prototype)'
     AdaptiveRadauConstantCache(uf, tabs, κ, one(uToltype), 10000, cont, dt, dt,
-        Convergence, J, num_stages, 1, big"1.0", big"1.0")
+        Convergence, J, num_stages, 1, 0.0)
 end
 
 mutable struct AdaptiveRadauCache{uType, cuType, tType, uNoUnitsType, rateType, JType, W1Type, W2Type,
-    UF, JC, F1, F2, Tab, Tol, Dt, rTol, aTol, StepLimiter} <:
+    UF, JC, F1, F2, #=F3,=# Tab, Tol, Dt, rTol, aTol, StepLimiter} <:
                FIRKMutableCache
     u::uType
     uprev::uType
@@ -551,6 +550,7 @@ mutable struct AdaptiveRadauCache{uType, cuType, tType, uNoUnitsType, rateType,
     jac_config::JC
     linsolve1::F1 #real
     linsolve2::Vector{F2} #complex
+    #linres2::Vector{F3} 
     rtol::rTol
     atol::aTol
     dtprev::Dt
@@ -559,8 +559,7 @@ mutable struct AdaptiveRadauCache{uType, cuType, tType, uNoUnitsType, rateType,
     step_limiter!::StepLimiter
     num_stages::Int
     step::Int
-    θ::BigFloat
-    θprev::BigFloat
+    hist_iter::Float64
 end
 
 function alg_cache(alg::AdaptiveRadau, u, rate_prototype, ::Type{uEltypeNoUnits},
@@ -598,24 +597,19 @@ function alg_cache(alg::AdaptiveRadau, u, rate_prototype, ::Type{uEltypeNoUnits}
     recursivefill!.(dw2, false)
     cubuff = [similar(u, Complex{eltype(u)}) for _ in 1 : (max - 1) ÷ 2]
     recursivefill!.(cubuff, false)
-    dw = Vector{typeof(u)}(undef, max - 1)
+    dw = [zero(u) for i in 1 : max]
 
-    cont = Vector{typeof(u)}(undef, max)
-    for i in 1 : max
-        cont[i] = zero(u)
-    end
+    cont = [zero(u) for i in 1:max]
 
     derivatives = Matrix{typeof(u)}(undef, max, max)
     for i in 1 : max, j in 1 : max
         derivatives[i, j] = zero(u)
     end
 
     fsalfirst = zero(rate_prototype)
-    fw = Vector{typeof(rate_prototype)}(undef, max)
-    ks = Vector{typeof(rate_prototype)}(undef, max)
-    for i in 1: max
-        ks[i] = fw[i] = zero(rate_prototype)
-    end
+    fw = [zero(rate_prototype) for i in 1 : max]
+    ks = [zero(rate_prototype) for i in 1 : max]
+
     k = ks[1]
 
     J, W1 = build_J_W(alg, u, uprev, p, t, dt, f, uEltypeNoUnits, Val(true))
@@ -642,7 +636,14 @@ function alg_cache(alg::AdaptiveRadau, u, rate_prototype, ::Type{uEltypeNoUnits}
     linsolve2 = [
         init(LinearProblem(W2[i], _vec(cubuff[i]); u0 = _vec(dw2[i])), alg.linsolve, alias_A = true, alias_b = true,
             assumptions = LinearSolve.OperatorAssumptions(true)) for i in 1 : (max - 1) ÷ 2]
-
+    #=
+    linres_tmp = dolinsolve(nothing, linsolve2[1]; A = W2[1], b = _vec(cubuff[1]), linu = _vec(dw2[1]))
+    linres2 = Vector{typeof(linres_tmp)}(undef , (max - 1) ÷ 2)
+    linres2[1] = linres_tmp
+    for i in 2 : (num_stages - 1) ÷ 2
+        linres2[i] = dolinsolve(nothing, linsolve2[1]; A = W2[1], b = _vec(cubuff[i]), linu = _vec(dw2[i]))
+    end
+    =#
     rtol = reltol isa Number ? reltol : zero(reltol)
     atol = reltol isa Number ? reltol : zero(reltol)
 
@@ -652,7 +653,7 @@ function alg_cache(alg::AdaptiveRadau, u, rate_prototype, ::Type{uEltypeNoUnits}
         J, W1, W2,
         uf, tabs, κ, one(uToltype), 10000, tmp,
         atmp, jac_config,
-        linsolve1, linsolve2, rtol, atol, dt, dt,
-        Convergence, alg.step_limiter!, num_stages, 1, big"1.0", big"1.0")
+        linsolve1, linsolve2, #=linres2,=# rtol, atol, dt, dt,
+        Convergence, alg.step_limiter!, num_stages, 1, 0.0)
 end