Skip to content
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.

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

Update Runge-Kutta ODE solver #919

Merged
merged 30 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
47fdb14
Adding RK tables
oriolcg Jul 9, 2023
f67a9f0
Testing ODE solvers in TransientFEOperators (temporary commit)
oriolcg Jul 9, 2023
fbffcc4
updates in RungeKutta.jl (not working yet)
oriolcg Jul 10, 2023
cb13aff
Added TransientRungeKuttaFEOperator
oriolcg Jul 10, 2023
ebba14e
Added rhs! function for ODE operators
oriolcg Jul 10, 2023
590bd08
Added rhs function in TransientFEOperatorFromWeakForm
oriolcg Jul 10, 2023
31002ee
Fixing RungeKutta.jl
oriolcg Jul 11, 2023
1cf9ba1
Cleaning ODESolversTests.jl
oriolcg Jul 11, 2023
d9006a5
Cleaning RungeKutta.jl
oriolcg Jul 11, 2023
0eaf379
Further fixes in RungeKutta.jl
oriolcg Jul 12, 2023
a200d7a
Updating tests
oriolcg Jul 12, 2023
174e9a4
Fixing tests
oriolcg Jul 12, 2023
60d48f0
Fixes for AutoDiff in RungeKutta schemes
oriolcg Jul 14, 2023
30fbc19
Fixes in RungeKutta.jl
oriolcg Jul 14, 2023
c60885e
Additional linear solver for the final update in the RK scheme.
oriolcg Jul 14, 2023
4065ca7
Adding lhs! function and update solver
oriolcg Jul 24, 2023
0b94ee2
Fixing ODESolversTests
oriolcg Jul 25, 2023
bf220c1
Cleaning RungeKutta.jl
oriolcg Jul 25, 2023
15eda07
Removed debugging prints
oriolcg Jul 25, 2023
626d09b
Further developments in RungeKutta.jl
oriolcg Jul 26, 2023
9776ffe
Adding RK tables
oriolcg Jul 27, 2023
4314512
Started implementation of IMEX-RK methods
oriolcg Jul 29, 2023
12739cf
RK Tableaus in a new file
oriolcg Aug 3, 2023
76e0728
Further devs in IMEXRK
oriolcg Aug 3, 2023
d9580d6
Fixes, passing ODESolversTests
oriolcg Aug 3, 2023
a6015b5
First implementation of IMEX RK
oriolcg Aug 5, 2023
bde2d33
Adding IMEX-RK tables
oriolcg Aug 7, 2023
5963fff
Minor changes in IMEXRK
oriolcg Sep 5, 2023
d5d1b19
Merge branch 'master' of https://github.com/gridap/Gridap.jl into Upd…
oriolcg Sep 5, 2023
5d71179
Updated NEWS.md
oriolcg Sep 5, 2023
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
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- Block assembly now generalised to work with `AbstractBlockArrays`, to include changes in GridapDistributed. Since PR [939](https://github.com/gridap/Gridap.jl/pull/939).
- Implici-Explicit Runge-Kutta ODE solvers. Since PR [#919](https://github.com/gridap/Gridap.jl/pull/919).

### Fixed

- Using Broadcasting(\circ) instead of \circ in one of the lazy_maps used to transform a coarse field into a fine field. Since PR [#938](https://github.com/gridap/Gridap.jl/pull/938).
- Better infinite norm computation in `Algebra._check_convergence`. Now works for any `AbstractArray` type, including `PVector`. Since PR [#940](https://github.com/gridap/Gridap.jl/pull/940).
- Updated Runge-Kutta solver. Since PR [#919](https://github.com/gridap/Gridap.jl/pull/919).

## [0.17.19] - 2023-08-23

Expand Down
3 changes: 3 additions & 0 deletions src/ODEs/Exports.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ end
@publish_gridapodes ODETools MidPoint
@publish_gridapodes ODETools ThetaMethod
@publish_gridapodes ODETools RungeKutta
@publish_gridapodes ODETools IMEXRungeKutta
@publish_gridapodes ODETools Newmark
@publish_gridapodes ODETools GeneralizedAlpha
@publish_gridapodes ODETools ∂t
Expand All @@ -23,3 +24,5 @@ end
@publish_gridapodes TransientFETools TransientAffineFEOperator
@publish_gridapodes TransientFETools TransientConstantFEOperator
@publish_gridapodes TransientFETools TransientConstantMatrixFEOperator
@publish_gridapodes TransientFETools TransientRungeKuttaFEOperator
@publish_gridapodes TransientFETools TransientIMEXRungeKuttaFEOperator
267 changes: 267 additions & 0 deletions src/ODEs/ODETools/IMEXRungeKutta.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,267 @@
"""
Implicit-Explicit Runge-Kutta ODE solver.

This struct defines an ODE solver for the system of ODEs

M(u,t)du/dt = f(u,t) + g(u,t)

where `f` is a nonlinear function of `u` and `t` that will treated implicitly and
`g` is a nonlinear function of `u` and `t` that will be treated explicitly.
The ODE is solved using an implicit-explicit Runge-Kutta method.
"""
struct IMEXRungeKutta <: ODESolver
nls_stage::NonlinearSolver
nls_update::NonlinearSolver
dt::Float64
tableau::IMEXButcherTableau
function IMEXRungeKutta(nls_stage::NonlinearSolver, nls_update::NonlinearSolver, dt, type::Symbol)
bt = IMEXButcherTableau(type)
new(nls_stage, nls_update, dt, bt)
end
end

"""
solve_step!(uf,odesol,op,u0,t0,cache)

Solve one step of the ODE problem defined by `op` using the ODE solver `odesol`
with initial solution `u0` at time `t0`. The solution is stored in `uf` and
the final time in `tf`. The cache is used to store the solution of the
nonlinear system of equations and auxiliar variables.
"""
function solve_step!(uf::AbstractVector,
solver::IMEXRungeKutta,
op::ODEOperator,
u0::AbstractVector,
t0::Real,
cache)

# Unpack variables
dt = solver.dt
s = solver.tableau.s
aᵢ = solver.tableau.aᵢ
bᵢ = solver.tableau.bᵢ
aₑ = solver.tableau.aₑ
bₑ = solver.tableau.bₑ
c = solver.tableau.c
d = solver.tableau.d

# Create cache if not there
if cache === nothing
ode_cache = allocate_cache(op)
vi = similar(u0)
fi = Vector{typeof(u0)}(undef,0)
gi = Vector{typeof(u0)}(undef,0)
for i in 1:s
push!(fi,similar(u0))
push!(gi,similar(u0))
end
nls_stage_cache = nothing
nls_update_cache = nothing
else
ode_cache, vi, fi, gi, nls_stage_cache, nls_update_cache = cache
end

# Create RKNL stage operator
nlop_stage = IMEXRungeKuttaStageNonlinearOperator(op,t0,dt,u0,ode_cache,vi,fi,gi,0,aᵢ,aₑ)

# Compute intermediate stages
for i in 1:s

# Update time
ti = t0 + c[i]*dt
ode_cache = update_cache!(ode_cache,op,ti)
update!(nlop_stage,ti,fi,gi,i)

if(aᵢ[i,i]==0)
# Skip stage solve if a_ii=0 => u_i=u_0, f_i = f_0, gi = g_0
@. uf = u0
else
# solve at stage i
nls_stage_cache = solve!(uf,solver.nls_stage,nlop_stage,nls_stage_cache)
end

# Update RHS at stage i using solution at u_i
rhs!(nlop_stage, uf)
explicit_rhs!(nlop_stage, uf)

end

# Update final time
tf = t0+dt

# Skip final update if not necessary
if !(c[s]==1.0 && aᵢ[s,:] == bᵢ && aₑ[s,:] == bₑ)

# Create RKNL final update operator
ode_cache = update_cache!(ode_cache,op,tf)
nlop_update = IMEXRungeKuttaUpdateNonlinearOperator(op,tf,dt,u0,ode_cache,vi,fi,gi,s,bᵢ,bₑ)

# solve at final update
nls_update_cache = solve!(uf,solver.nls_update,nlop_update,nls_update_cache)

end

# Update final cache
cache = (ode_cache, vi, fi, gi, nls_stage_cache, nls_update_cache)

return (uf, tf, cache)

end

"""
IMEXRungeKuttaStageNonlinearOperator <: NonlinearOperator

Nonlinear operator for the implicit-explicit Runge-Kutta stage.
At a given stage `i` it represents the nonlinear operator A(t,u_i,(u_i-u_n)/dt) such that
```math
A(t,u_i,(u_i-u_n)/dt) = M(u_i,t)(u_i-u_n)/Δt - ∑aᵢ[i,j] * f(u_j,t_j) - ∑aₑ[i,j] * g(u_j,t_j) = 0
```
"""
mutable struct IMEXRungeKuttaStageNonlinearOperator <: RungeKuttaNonlinearOperator
odeop::ODEOperator
ti::Float64
dt::Float64
u0::AbstractVector
ode_cache
vi::AbstractVector
fi::Vector{AbstractVector}
gi::Vector{AbstractVector}
i::Int
aᵢ::Matrix{Float64}
aₑ::Matrix{Float64}
end

"""
IMEXRungeKuttaUpdateNonlinearOperator <: NonlinearOperator

Nonlinear operator for the implicit-explicit Runge-Kutta final update.
At the final update it represents the nonlinear operator A(t,u_t,(u_t-u_n)/dt) such that
```math
A(t,u_f,(u_f-u_n)/dt) = M(u_f,t)(u_f-u_n)/Δt - ∑aᵢ[i,j] * f(u_j,t_j) - ∑aₑ[i,j] * g(u_j,t_j) = 0
```
"""
mutable struct IMEXRungeKuttaUpdateNonlinearOperator <: RungeKuttaNonlinearOperator
odeop::ODEOperator
ti::Float64
dt::Float64
u0::AbstractVector
ode_cache
vi::AbstractVector
fi::Vector{AbstractVector}
gi::Vector{AbstractVector}
s::Int
bᵢ::Vector{Float64}
bₑ::Vector{Float64}
end

"""
residual!(b,op::IMEXRungeKuttaStageNonlinearOperator,x)

Compute the residual of the IMEXR Runge-Kutta nonlinear operator `op` at `x` and
store it in `b` for a given stage `i`.
```math
b = A(t,x,(x-x₀)/dt) = ∂ui/∂t - ∑aᵢ[i,j] * f(xj,tj)
```

Uses the vector b as auxiliar variable to store the residual of the left-hand side of
the i-th stage ODE operator, then adds the corresponding contribution from right-hand side
at all earlier stages.
```math
b = M(ui,ti)∂u/∂t
b - ∑_{j<=i} aᵢ_ij * f(uj,tj) - ∑_{j<i} aₑ_ij * g(uj,tj) = 0
```
"""
function residual!(b::AbstractVector,
op::IMEXRungeKuttaStageNonlinearOperator,
x::AbstractVector)
rhs!(op,x)
lhs!(b,op,x)
for j in 1:op.i
@. b = b - op.aᵢ[op.i,j] * op.fi[j] - op.aₑ[op.i,j] * op.gi[j]
end
b
end

"""
residual!(b,op::IMEXRungeKuttaUpdateNonlinearOperator,x)

Computes the residual of the IMEX Runge-Kutta nonlinear operator `op` at `x` and
for the final update.
```math
b = A(t,x,(x-x₀)/dt) = ∂ui/∂t - ∑bᵢ[i] * f(xj,tj) - ∑bₑ[i] * g(xj,tj)
```

Uses the vector b as auxiliar variable to store the residual of the left-hand side of
the final update ODE operator, then adds the corresponding contribution from right-hand sides
at all stages.
```math
b = M(ui,ti)∂u/∂t
b - ∑_{i<=s} bᵢ[i] * f(ui,ti) - ∑_{i<s} bₑ[i] * g(ui,ti) = 0
```
"""
function residual!(b::AbstractVector,
op::IMEXRungeKuttaUpdateNonlinearOperator,
x::AbstractVector)
lhs!(b,op,x)
for i in 1:op.s
@. b = b - op.bᵢ[i] * op.fi[i] - op.bₑ[i] * op.gi[i]
end
b
end

"""
jacobian!(J,op::IMEXRungeKuttaStageNonlinearOperator,x)

Computes the Jacobian of the IMEX Runge-Kutta nonlinear operator `op` at `x` and
stores it in `J` for a given stage `i`.
```math
J = ∂A(t,x,(x-x₀)/dt)/∂x = ∂(xi/∂t)/∂xi + aᵢ[i,i] * (- ∂f(xi,ti)/∂xi )
```

It uses the function `jacobians!` to compute the Jacobian of the right-hand side (stiffness matrix)
and the jacobian of the left-hand side (mass matrix) at the current stage added together with the
coefficients `aᵢ[i,i]` and `1/Δt`, respectively. It assumes that the jacobian of the right-hand side
has already the negative sign incorporated in its calculation.
"""
function jacobian!(J::AbstractMatrix,
op::IMEXRungeKuttaStageNonlinearOperator,
x::AbstractVector)
ui = x
vi = op.vi
@. vi = (x-op.u0)/(op.dt)
z = zero(eltype(J))
fillstored!(J,z)
jacobians!(J,op.odeop,op.ti,(ui,vi),(op.aᵢ[op.i,op.i],1.0/op.dt),op.ode_cache)
end

"""
jacobian!(J,op::IMEXRungeKuttaUpdateNonlinearOperator,x)

Computes the Jacobian of the IMEX Runge-Kutta nonlinear operator `op` at `x` and
stores it in `J` for the final update. This is typically the mass matrix
"""
function jacobian!(J::AbstractMatrix,
op::IMEXRungeKuttaUpdateNonlinearOperator,
x::AbstractVector)
uf = x
vf = op.vi
@. vf = (x-op.u0)/(op.dt)
z = zero(eltype(J))
fillstored!(J,z)
jacobian!(J,op.odeop,op.ti,(uf,vf),2,1.0/(op.dt),op.ode_cache)
end

function explicit_rhs!(op::RungeKuttaNonlinearOperator, x::AbstractVector)
u = x
v = op.vi
@. v = (x-op.u0)/(op.dt)
g = op.gi
explicit_rhs!(g[op.i],op.odeop,op.ti,(u,v),op.ode_cache)
end

function update!(op::RungeKuttaNonlinearOperator,ti::Float64,fi::AbstractVector,gi::AbstractVector,i::Int)
op.ti = ti
op.fi = fi
op.gi = gi
op.i = i
end
4 changes: 4 additions & 0 deletions src/ODEs/ODETools/ODESolvers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ end

# Specialization

include("Tableaus.jl")

include("ForwardEuler.jl")

include("ThetaMethod.jl")
Expand All @@ -53,6 +55,8 @@ include("AffineThetaMethod.jl")

include("RungeKutta.jl")

include("IMEXRungeKutta.jl")

include("Newmark.jl")

include("AffineNewmark.jl")
Expand Down
6 changes: 5 additions & 1 deletion src/ODEs/ODETools/ODETools.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using Test
using DocStringExtensions

using ForwardDiff
using LinearAlgebra: fillstored!
using LinearAlgebra: fillstored!, rmul!
using SparseArrays: issparse

const ϵ = 100*eps()
Expand Down Expand Up @@ -54,6 +54,9 @@ export jacobian!
export jacobian_t!
export jacobian_and_jacobian_t!
export test_ode_operator
export lhs!
export rhs!
export explicit_rhs!

export ODESolver
export solve_step!
Expand All @@ -67,6 +70,7 @@ export ForwardEuler
export MidPoint
export ThetaMethod
export RungeKutta
export IMEXRungeKutta
export Newmark
export GeneralizedAlpha

Expand Down
Loading
Loading