Skip to content

Commit

Permalink
Merge pull request #13 from JuliaGNI/compathelper/new_version/2023-05…
Browse files Browse the repository at this point in the history
…-10-00-54-43-151-04068954395

CompatHelper: bump compat for GeometricBase to 0.6, (keep existing compat)
  • Loading branch information
michakraus authored May 10, 2023
2 parents 56b6372 + 0313a7e commit 4beb621
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 50 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
[compat]
CompactBasisFunctions = "0.2"
GenericLinearAlgebra = "0.2, 0.3"
GeometricBase = "0.4, 0.5"
GeometricBase = "0.4, 0.5, 0.6"
Polynomials = "1, 2, 3"
PrettyTables = "1, 2"
Reexport = "1"
Expand Down
8 changes: 6 additions & 2 deletions src/PartitionedTableaus.jl
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
module PartitionedTableaus

using GeometricBase

import GeometricBase
import GeometricBase: description, reference

using ..RungeKutta

using .Tableaus


export description, reference


include("tableaus/prk.jl")

export TableauLobattoIIIAIIIB,
Expand Down
5 changes: 3 additions & 2 deletions src/RungeKutta.jl
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
module RungeKutta

using DelimitedFiles
using GeometricBase
using Markdown
using PrettyTables
using Reexport
using StaticArrays

import GenericLinearAlgebra
import GeometricBase
import GeometricBase: name, order, description, reference
import GeometricBase.Utils: @big, @define
import LinearAlgebra: istril
import Polynomials
Expand All @@ -27,7 +28,7 @@ module RungeKutta
isdiagonallyimplicit,
isfullyimplicit

export description, reference
export name, order, description, reference

include("order_conditions.jl")

Expand Down
8 changes: 6 additions & 2 deletions src/Tableaus.jl
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
module Tableaus

using GeometricBase

import GeometricBase
import GeometricBase: description, reference

import Polynomials
import Polynomials: Polynomial

using ..RungeKutta
using ..RungeKutta: big, @big, _legendre, _shifted_legendre


export description, reference


include("tableaus/dirk.jl")
Expand Down
8 changes: 4 additions & 4 deletions src/tableaus/dirk.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

GeometricBase.reference(::Val{:CrankNicolson}) = """
reference(::Val{:CrankNicolson}) = """
Reference:
J. Crank and P. Nicolson.
Expand Down Expand Up @@ -29,7 +29,7 @@ function TableauCrankNicolson(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:KraaijevangerSpijker}) = """
reference(::Val{:KraaijevangerSpijker}) = """
Reference:
J. F. B. M. Kraaijevanger and M. N. Spijker.
Expand Down Expand Up @@ -59,7 +59,7 @@ function TableauKraaijevangerSpijker(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:QinZhang}) = """
reference(::Val{:QinZhang}) = """
Reference:
M.-Z. Qin and M.-Q. Zhang.
Expand Down Expand Up @@ -88,7 +88,7 @@ function TableauQinZhang(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:Crouzeix}) = """
reference(::Val{:Crouzeix}) = """
Reference:
M.Crouzeix.
Expand Down
46 changes: 23 additions & 23 deletions src/tableaus/erk.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

GeometricBase.reference(::Val{:ExplicitEuler}) = """
reference(::Val{:ExplicitEuler}) = """
Reference:
Leonhard Euler.
Expand Down Expand Up @@ -30,10 +30,10 @@ end

"Alias for [`TableauExplicitEuler`](@ref)"
const TableauForwardEuler = TableauExplicitEuler
GeometricBase.reference(::Val{:ForwardEuler}) = reference(Val(:ExplicitEuler))
reference(::Val{:ForwardEuler}) = reference(Val(:ExplicitEuler))


GeometricBase.reference(::Val{:ExplicitMidpoint}) = """
reference(::Val{:ExplicitMidpoint}) = """
Reference:
Carl Runge.
Expand Down Expand Up @@ -64,7 +64,7 @@ function TableauExplicitMidpoint(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:Heun2}) = """
reference(::Val{:Heun2}) = """
Reference:
Karl Heun.
Expand Down Expand Up @@ -102,10 +102,10 @@ Alias for [`TableauHeun2`](@ref)
Page 99
"""
const TableauRK21 = TableauHeun2
GeometricBase.reference(::Val{:RK21}) = reference(Val(:Heun2))
reference(::Val{:RK21}) = reference(Val(:Heun2))


GeometricBase.reference(::Val{:Heun3}) = """
reference(::Val{:Heun3}) = """
Reference:
Karl Heun.
Expand Down Expand Up @@ -136,7 +136,7 @@ function TableauHeun3(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:Ralston2}) = """
reference(::Val{:Ralston2}) = """
Reference:
Anthony Ralston.
Expand Down Expand Up @@ -167,7 +167,7 @@ function TableauRalston2(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:Ralston3}) = """
reference(::Val{:Ralston3}) = """
Reference:
Anthony Ralston.
Expand Down Expand Up @@ -199,7 +199,7 @@ function TableauRalston3(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:Runge}) = """
reference(::Val{:Runge}) = """
Reference:
Carl Runge
Expand Down Expand Up @@ -231,7 +231,7 @@ end

"Alias for [`TableauRunge`](@ref)"
const TableauRunge2 = TableauRunge
GeometricBase.reference(::Val{:Runge2}) = reference(Val(:Runge))
reference(::Val{:Runge2}) = reference(Val(:Runge))

"""
Alias for [`TableauRunge`](@ref)
Expand All @@ -242,10 +242,10 @@ Alias for [`TableauRunge`](@ref)
Page 99
"""
const TableauRK22 = TableauRunge
GeometricBase.reference(::Val{:RK22}) = reference(Val(:Runge))
reference(::Val{:RK22}) = reference(Val(:Runge))


GeometricBase.reference(::Val{:Kutta}) = """
reference(::Val{:Kutta}) = """
Reference:
Wilhelm Kutta
Expand Down Expand Up @@ -277,7 +277,7 @@ end

"Alias for [`TableauKutta`](@ref)"
const TableauKutta3 = TableauKutta
GeometricBase.reference(::Val{:Kutta3}) = reference(Val(:Kutta))
reference(::Val{:Kutta3}) = reference(Val(:Kutta))

"""
Alias for [`TableauKutta`](@ref) according to
Expand All @@ -287,10 +287,10 @@ Alias for [`TableauKutta`](@ref) according to
Page 99
"""
const TableauRK32 = TableauKutta
GeometricBase.reference(::Val{:RK32}) = reference(Val(:Kutta))
reference(::Val{:RK32}) = reference(Val(:Kutta))


GeometricBase.reference(::Val{:RK31}) = """
reference(::Val{:RK31}) = """
Reference:
John C. Butcher
Expand Down Expand Up @@ -320,7 +320,7 @@ function TableauRK31(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:RK416}) = """
reference(::Val{:RK416}) = """
Reference:
Wilhelm Kutta
Expand Down Expand Up @@ -359,14 +359,14 @@ Alias for [`TableauRK416`](@ref) according to
Page 102
"""
const TableauRK41 = TableauRK416
GeometricBase.reference(::Val{:RK41}) = reference(Val(:RK416))
reference(::Val{:RK41}) = reference(Val(:RK416))

"Alias for [`TableauRK416`](@ref)"
const TableauRK4 = TableauRK416
GeometricBase.reference(::Val{:RK4}) = reference(Val(:RK416))
reference(::Val{:RK4}) = reference(Val(:RK416))


GeometricBase.reference(::Val{:RK42}) = """
reference(::Val{:RK42}) = """
Reference:
John C. Butcher
Expand Down Expand Up @@ -397,7 +397,7 @@ function TableauRK42(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:RK438}) = """
reference(::Val{:RK438}) = """
Reference:
Wilhelm Kutta
Expand Down Expand Up @@ -429,7 +429,7 @@ function TableauRK438(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:RK5}) = """
reference(::Val{:RK5}) = """
Reference:
John C. Butcher
Expand Down Expand Up @@ -462,7 +462,7 @@ function TableauRK5(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:SSPRK2}) = """
reference(::Val{:SSPRK2}) = """
Reference:
Chi-Wang Shu, Stanley Osher.
Expand Down Expand Up @@ -490,7 +490,7 @@ function TableauSSPRK2(args...)
end


GeometricBase.reference(::Val{:SSPRK3}) = """
reference(::Val{:SSPRK3}) = """
Reference:
Chi-Wang Shu, Stanley Osher.
Expand Down
8 changes: 4 additions & 4 deletions src/tableaus/firk.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

GeometricBase.reference(::Val{:ImplicitEuler}) = """
reference(::Val{:ImplicitEuler}) = """
Reference:
Augustin-Louis Cauchy.
Expand Down Expand Up @@ -29,10 +29,10 @@ end

"Alias for [`TableauImplicitEuler`](@ref)"
const TableauBackwardEuler = TableauImplicitEuler
GeometricBase.reference(::Val{:BackwardEuler}) = reference(Val(:ImplicitEuler))
reference(::Val{:BackwardEuler}) = reference(Val(:ImplicitEuler))


GeometricBase.reference(::Val{:ImplicitMidpoint}) = """
reference(::Val{:ImplicitMidpoint}) = """
Reference:
Augustin-Louis Cauchy.
Expand Down Expand Up @@ -61,7 +61,7 @@ function TableauImplicitMidpoint(::Type{T}=Float64) where {T}
end


GeometricBase.reference(::Val{:SRK3}) = """
reference(::Val{:SRK3}) = """
Reference:
Shan Zhao and Guo-Wei Wei.
Expand Down
2 changes: 1 addition & 1 deletion src/tableaus/gauss.jl
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ end
get_gauss_coefficients(s) = get_gauss_coefficients(BigFloat, s)


GeometricBase.reference(::Val{:Gauss}) = """
reference(::Val{:Gauss}) = """
References:
John C. Butcher.
Expand Down
14 changes: 7 additions & 7 deletions src/tableaus/lobatto.jl
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ get_lobatto_f_coefficients(s) = get_lobatto_f_coefficients(BigFloat, s)
get_lobatto_g_coefficients(s) = get_lobatto_g_coefficients(BigFloat, s)


GeometricBase.reference(::Val{:LobattoIII}) = """
reference(::Val{:LobattoIII}) = """
References:
John C. Butcher.
Expand Down Expand Up @@ -218,7 +218,7 @@ function TableauLobattoIII(::Type{T}, s) where {T}
end


GeometricBase.reference(::Val{:LobattoIIIA}) = """
reference(::Val{:LobattoIIIA}) = """
References:
Byron Leonard Ehle
Expand Down Expand Up @@ -269,7 +269,7 @@ function TableauLobattoIIIĀ(::Type{T}, s) where {T}
end


GeometricBase.reference(::Val{:LobattoIIIB}) = """
reference(::Val{:LobattoIIIB}) = """
References:
Byron Leonard Ehle.
Expand Down Expand Up @@ -320,7 +320,7 @@ function TableauLobattoIIIB̄(::Type{T}, s) where {T}
end


GeometricBase.reference(::Val{:LobattoIIIC}) = """
reference(::Val{:LobattoIIIC}) = """
References:
F. H. Chipman.
Expand Down Expand Up @@ -372,7 +372,7 @@ function TableauLobattoIIIC̄(::Type{T}, s) where {T}
end


GeometricBase.reference(::Val{:LobattoIIID}) = """
reference(::Val{:LobattoIIID}) = """
References:
R.P.K. Chan.
Expand Down Expand Up @@ -424,7 +424,7 @@ function TableauLobattoIIID̄(::Type{T}, s) where {T}
end


GeometricBase.reference(::Val{:LobattoIIIE}) = """
reference(::Val{:LobattoIIIE}) = """
References:
R.P.K. Chan.
Expand Down Expand Up @@ -477,7 +477,7 @@ function TableauLobattoIIIĒ(::Type{T}, s) where {T}
end


GeometricBase.reference(::Val{:LobattoIIIF}) = """
reference(::Val{:LobattoIIIF}) = """
References:
Wang Fangzong and Liao Xiaobing.
Expand Down
Loading

0 comments on commit 4beb621

Please sign in to comment.