Skip to content

Commit

Permalink
Merge b150043 into 1bfde1d
Browse files Browse the repository at this point in the history
  • Loading branch information
mateuszbaran authored Mar 14, 2023
2 parents 1bfde1d + b150043 commit 57deb89
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 17 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
20 changes: 10 additions & 10 deletions src/frozen_solvers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ function perform_step!(integrator, ::ManifoldEulerCache, repeat_step = false)
k = f(u, p, t)
retract!(alg.manifold, u, u, dt * k, alg.retraction_method)

return integrator.destats.nf += 1
return integrator.stats.nf += 1
end

function initialize!(integrator, ::ManifoldEulerCache)
integrator.fsalfirst = integrator.f(integrator.uprev, integrator.p, integrator.t) # Pre-start fsal
integrator.destats.nf += 1
integrator.stats.nf += 1
integrator.kshortsize = 1
integrator.k = typeof(integrator.k)(undef, integrator.kshortsize)

Expand Down Expand Up @@ -127,7 +127,7 @@ function initialize!(integrator, cache::CG2Cache)
integrator.k = typeof(integrator.k)(undef, integrator.kshortsize)

integrator.fsalfirst = integrator.f(integrator.uprev, integrator.p, integrator.t)
integrator.destats.nf += 1
integrator.stats.nf += 1

integrator.fsallast = zero.(integrator.fsalfirst)
integrator.k[1] = integrator.fsalfirst
Expand All @@ -146,7 +146,7 @@ function perform_step!(integrator, cache::CG2Cache, repeat_step = false)
k2t = f.f.operator_vector_transport(M, cache.X2u, cache.X2, u, p, t + dt2, t)
retract!(M, u, u, dt * k2t, alg.retraction_method)

return integrator.destats.nf += 2
return integrator.stats.nf += 2
end


Expand Down Expand Up @@ -229,7 +229,7 @@ function initialize!(integrator, cache::CG2_3Cache)
integrator.k = typeof(integrator.k)(undef, integrator.kshortsize)

integrator.fsalfirst = integrator.f(integrator.uprev, integrator.p, integrator.t)
integrator.destats.nf += 1
integrator.stats.nf += 1

integrator.fsallast = zero.(integrator.fsalfirst)
integrator.k[1] = integrator.fsalfirst
Expand Down Expand Up @@ -289,7 +289,7 @@ function perform_step!(integrator, cache::CG2_3Cache, repeat_step = false)
)
end

return integrator.destats.nf += 3
return integrator.stats.nf += 3
end


Expand Down Expand Up @@ -389,15 +389,15 @@ function perform_step!(integrator, cache::CG3Cache, repeat_step = false)
X3tu = f.f.operator_vector_transport(M, cache.X3u, cache.X3, u, p, t + c3h, t)
retract!(M, u, u, b3 * X3tu, alg.retraction_method)

return integrator.destats.nf += 3
return integrator.stats.nf += 3
end

function initialize!(integrator, ::CG3Cache)
integrator.kshortsize = 2
integrator.k = typeof(integrator.k)(undef, integrator.kshortsize)

integrator.fsalfirst = integrator.f(integrator.uprev, integrator.p, integrator.t)
integrator.destats.nf += 1
integrator.stats.nf += 1

integrator.fsallast = zero.(integrator.fsalfirst)
integrator.k[1] = integrator.fsalfirst
Expand Down Expand Up @@ -575,15 +575,15 @@ function perform_step!(integrator, cache::CG4aCache, repeat_step = false)
X5tu = f.f.operator_vector_transport(M, cache.X5u, cache.X5, u, p, t + c5h, t)
retract!(M, u, u, b5 * X5tu, alg.retraction_method)

return integrator.destats.nf += 5
return integrator.stats.nf += 5
end

function initialize!(integrator, ::CG4aCache)
integrator.kshortsize = 2
integrator.k = typeof(integrator.k)(undef, integrator.kshortsize)

integrator.fsalfirst = integrator.f(integrator.uprev, integrator.p, integrator.t)
integrator.destats.nf += 1
integrator.stats.nf += 1

integrator.fsallast = zero.(integrator.fsalfirst)
integrator.k[1] = integrator.fsalfirst
Expand Down
8 changes: 4 additions & 4 deletions src/lie_solvers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ function perform_step!(integrator, cache::ManifoldLieEulerCache, repeat_step = f

retract!(alg.manifold, u, u, dt * k, alg.retraction_method)

return integrator.destats.nf += 1
return integrator.stats.nf += 1
end

function initialize!(integrator, cache::ManifoldLieEulerCache)
@unpack t, uprev, f, p, alg = integrator
X = f(uprev, p, t) # Pre-start fsal
integrator.fsalfirst = apply_diff_group(alg.action, cache.id, X, uprev)
integrator.destats.nf += 1
integrator.stats.nf += 1
integrator.kshortsize = 1
integrator.k = typeof(integrator.k)(undef, integrator.kshortsize)

Expand Down Expand Up @@ -188,14 +188,14 @@ function perform_step!(integrator, cache::RKMK4Cache, repeat_step = false)
X = apply_diff_group(action, cache.id, v, u)
retract!(alg.manifold, u, u, X, alg.retraction_method)

return integrator.destats.nf += 1
return integrator.stats.nf += 1
end

function initialize!(integrator, cache::RKMK4Cache)
@unpack t, uprev, f, p, alg = integrator
X = f(uprev, p, t) # Pre-start fsal
integrator.fsalfirst = apply_diff_group(alg.action, cache.id, X, uprev)
integrator.destats.nf += 1
integrator.stats.nf += 1
integrator.kshortsize = 1
integrator.k = typeof(integrator.k)(undef, integrator.kshortsize)

Expand Down
6 changes: 3 additions & 3 deletions src/problems.jl
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ function build_solution(
calculate_error = true,
k = nothing,
interp::InterpolationData,
retcode = :Default,
destats = nothing,
retcode = ReturnCode.Default,
stats = nothing,
kwargs...,
)
T = eltype(eltype(u))
Expand All @@ -240,7 +240,7 @@ function build_solution(
manifold_interp,
dense,
0,
destats,
stats,
nothing,
retcode,
)
Expand Down

0 comments on commit 57deb89

Please sign in to comment.