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.

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

Fix CGVIs and some minor issues #177

Merged
merged 4 commits into from
Sep 20, 2023
Merged

Fix CGVIs and some minor issues #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e2d1fb
Refactor CGVI.
michakraus Sep 20, 2023
37d2503
Fix integrator and method exports.
michakraus Sep 20, 2023
48a9e84
Reorganise tests.
michakraus Sep 20, 2023
6365a20
Add CGVI reference to tutorial.
michakraus Sep 20, 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 Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
RungeKutta = "fb486d5c-30a0-4a8a-8415-a8b4ace5a6f7"
SharedArrays = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
SimpleSolvers = "36b790f5-6434-4fbe-b711-1f64a1e2f6a2"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Expand All @@ -45,6 +46,7 @@ QuadratureRules = "0.1"
Reexport = "1.0"
RungeKutta = "0.5"
SimpleSolvers = "0.3"
StaticArrays = "1"
julia = "1.6"

[extras]
Expand Down
2 changes: 1 addition & 1 deletion docs/src/tutorial.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ All implicit Runge-Kutta and partitioned Runge-Kutta methods can also be applied
### Integrators for Lagrangian ODEs

Regular (non-degenerate) Lagragian ODEs can be integrated with Variational Partitioned Runge-Kutta ([`VPRK`](@ref))
methods.
methods or Continuous Galerkin Variational Integrators ([`CGVI`](@ref)).

| Function | Method |
|:--------------------------------|:-------------------------------------------------------------------|
Expand Down
33 changes: 2 additions & 31 deletions src/Integrators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module Integrators
using RungeKutta.Tableaus
using RungeKutta.PartitionedTableaus
using SimpleSolvers
using StaticArrays

using ..Discontinuities
using ..Extrapolators
Expand Down Expand Up @@ -121,26 +122,10 @@ module Integrators
include("integrators/integrator.jl")


export ExplicitEuler, ImplicitEuler

include("integrators/euler/explicit_euler.jl")
include("integrators/euler/implicit_euler.jl")


export AbstractIntegratorRK, AbstractIntegratorIRK, AbstractIntegratorPRK, IntegratorRK

export ERKIntegrator
export IntegratorIRK
export IntegratorIRKimplicit
export IntegratorDIRK
#export IntegratorMidpointImplicit, IntegratorSRKimplicit

export IntegratorEPRK
export IPRKIntegrator
export IntegratorIPRKimplicit
# export IntegratorFLRK
# export IntegratorPGLRK, CoefficientsPGLRK

export get_symplectic_conjugate_coefficients, symplecticize,
check_symplecticity, symplecticity_conditions,
check_symmetry, compute_symplecticity_error
Expand Down Expand Up @@ -168,9 +153,6 @@ module Integrators


export ExactSolution,
IntegratorExactODE,
IntegratorSplitting,
IntegratorComposition,
AbstractTableauSplitting,
Composition,
Splitting,
Expand All @@ -187,8 +169,6 @@ module Integrators
include("integrators/splitting/composition_integrator.jl")


export IntegratorVPRK

include("integrators/vi/vi_methods.jl")
include("integrators/vi/position_momentum_common.jl")
include("integrators/vi/position_momentum_cache.jl")
Expand All @@ -199,21 +179,14 @@ module Integrators
include("integrators/vi/vprk_integrator.jl")


# export IntegratorCGVI, IntegratorDGVI, IntegratorDGVIEXP,
# IntegratorDGVIPI, IntegratorDGVIP0, IntegratorDGVIP1

# include("integrators/cgvi/integrators_cgvi.jl")
include("integrators/cgvi/integrators_cgvi.jl")
# include("integrators/dgvi/integrators_dgvi.jl")
# include("integrators/dgvi/integrators_dgvi_experimental.jl")
# include("integrators/dgvi/integrators_dgvi_path_integral.jl")
# include("integrators/dgvi/integrators_dgvi_projection_initial.jl")
# include("integrators/dgvi/integrators_dgvi_projection_final.jl")


export IntegratorDVIA, IntegratorDVIB,
IntegratorCMDVI, IntegratorCTDVI,
IntegratorDVRK

include("integrators/dvi/dvi_common.jl")
include("integrators/dvi/dvi_cache.jl")
include("integrators/dvi/dvi_euler.jl")
Expand All @@ -222,8 +195,6 @@ module Integrators
include("integrators/dvi/dvrk.jl")


export HPImidpointIntegrator, HPItrapezoidalIntegrator

include("integrators/hpi/hpi_common.jl")
include("integrators/hpi/hpi_cache.jl")
include("integrators/hpi/hpi_midpoint.jl")
Expand Down
Loading