Skip to content

ForceFreeStates - BUGFIX! - Use a per-column absolute tolerance in the Riccati shooting integration #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d-burg merged 2 commits into from
Aug 21, 2026
+11 −2
Merged

ForceFreeStates - BUGFIX! - Use a per-column absolute tolerance in the Riccati shooting integration #413

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2296514
FFS - BUG FIX - Per-column absolute tolerance in the Riccati shooting…
d-burg Aug 19, 2026
362662b
Merge branch 'develop' into bugfix/riccati-shooting-ua-confinement
d-burg Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/ForceFreeStates/Riccati.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,20 +1405,29 @@ function integrate_fm_with_ua_ic(
u0 = zeros(ComplexF64, N, N, 2)
u0[:, :, 1] .= ua[:, 1:N, 1]
u0[:, :, 2] .= ua[:, 1:N, 2]
# Per-column absolute tolerance so a batch's largest column cannot set the error floor of its smallest:
# otherwise the resonant small-solution column inherits an absolute error set by the big solution's magnitude.
abstol_arr = similar(u0, Float64)
for j in 1:N
abstol_arr[:, j, :] .= max(maximum(abs, @view u0[:, j, :]), 1e-30) * rtol
end
odet_proxy.spline_hint[] = 1
odet_proxy.ffit_hint[] = 1
prob = ODEProblem(sing_der!, u0, tspan, params)
sol = solve(prob, Vern9(); reltol=rtol, save_everystep=false, save_end=true)
sol = solve(prob, Vern9(); reltol=rtol, abstol=abstol_arr, save_everystep=false, save_end=true)
result[1:N, 1:N] .= sol.u[end][:, :, 1]
result[N+1:2N, 1:N] .= sol.u[end][:, :, 2]

# Batch 2: columns N+1:2N of T (small solutions)
u0[:, :, 1] .= ua[:, N+1:2N, 1]
u0[:, :, 2] .= ua[:, N+1:2N, 2]
for j in 1:N
abstol_arr[:, j, :] .= max(maximum(abs, @view u0[:, j, :]), 1e-30) * rtol
end
odet_proxy.spline_hint[] = 1
odet_proxy.ffit_hint[] = 1
prob = ODEProblem(sing_der!, u0, tspan, params)
sol = solve(prob, Vern9(); reltol=rtol, save_everystep=false, save_end=true)
sol = solve(prob, Vern9(); reltol=rtol, abstol=abstol_arr, save_everystep=false, save_end=true)
result[1:N, N+1:2N] .= sol.u[end][:, :, 1]
result[N+1:2N, N+1:2N] .= sol.u[end][:, :, 2]

Expand Down
Loading