Skip to content

Reflecting BC for quadratic itp #20

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
tomasaschan merged 1 commit into from
Jan 2, 2015
Merged

Reflecting BC for quadratic itp #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/Interpolations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export
Line,
Free,
Periodic,
Reflect,

degree,
boundarycondition,
Expand All @@ -45,6 +46,7 @@ type Line <: BoundaryCondition end
typealias Natural Line
type Free <: BoundaryCondition end
type Periodic <: BoundaryCondition end
immutable Reflect <: BoundaryCondition end

abstract InterpolationType{D<:Degree,BC<:BoundaryCondition,GR<:GridRepresentation}

Expand Down Expand Up @@ -117,6 +119,8 @@ for IT in (
Linear{OnCell},
Quadratic{Flat,OnCell},
Quadratic{Flat,OnGrid},
Quadratic{Reflect,OnCell},
Quadratic{Reflect,OnGrid},
Quadratic{Line,OnGrid},
Quadratic{Line,OnCell},
Quadratic{Free,OnGrid},
Expand Down Expand Up @@ -186,6 +190,8 @@ gradient{T}(itp::Interpolation{T}, x...) = gradient!(Array(T,ndims(itp)), itp, x
for IT in (
Quadratic{Flat,OnCell},
Quadratic{Flat,OnGrid},
Quadratic{Reflect,OnCell},
Quadratic{Reflect,OnGrid},
Quadratic{Line,OnGrid},
Quadratic{Line,OnCell},
Quadratic{Free,OnGrid},
Expand Down
4 changes: 2 additions & 2 deletions src/quadratic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ function inner_system_diags{T}(::Type{T}, n::Int, ::Quadratic)
(dl,d,du)
end

function prefiltering_system{T}(::Type{T}, n::Int, q::Quadratic{Flat,OnCell})
function prefiltering_system{T,BC<:Union(Flat,Reflect)}(::Type{T}, n::Int, q::Quadratic{BC,OnCell})
dl,d,du = inner_system_diags(T,n,q)
d[1] = d[end] = -1
du[1] = dl[end] = 1
lufact!(Tridiagonal(dl, d, du)), zeros(T, n)
end

function prefiltering_system{T}(::Type{T}, n::Int, q::Quadratic{Flat,OnGrid})
function prefiltering_system{T,BC<:Union(Flat,Reflect)}(::Type{T}, n::Int, q::Quadratic{BC,OnGrid})
dl,d,du = inner_system_diags(T,n,q)
d[1] = d[end] = convert(T, -1)
du[1] = dl[end] = convert(T, 0)
Expand Down
2 changes: 1 addition & 1 deletion test/on-grid.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ f3(x,y,z) = f2(x,y) * log(z)
simpledegs = (Linear,Constant)
bcdegs = (Quadratic,)
gridbehvs = (OnCell,OnGrid)
bcs = (Flat,Line,Free,Periodic)
bcs = (Flat,Line,Free,Periodic,Reflect)

function OneD()
println("Testing evaluation on grid and boundary in 1D...")
Expand Down