Mercurial > repos > public > sbplib_julia
changeset 101:19031733bbbf cell_based_test
Convert D2 to only use tuples
author | Jonatan Werpers <jonatan@werpers.com> |
---|---|
date | Wed, 06 Feb 2019 23:08:11 +0100 |
parents | 49796ca2dfa0 |
children | f99320a459ef |
files | sbpD2.jl |
diffstat | 1 files changed, 20 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/sbpD2.jl Wed Feb 06 23:03:12 2019 +0100 +++ b/sbpD2.jl Wed Feb 06 23:08:11 2019 +0100 @@ -42,11 +42,11 @@ end struct D2{T,N,M,K} <: ConstantStencilOperator - quadratureClosure::Vector{T} + quadratureClosure::NTuple{M,T} innerStencil::Stencil{T,N} - closureStencils::NTuple{M, Stencil{T,K}} - eClosure::Vector{T} - dClosure::Vector{T} + closureStencils::NTuple{M,Stencil{T,K}} + eClosure::NTuple{M,T} + dClosure::NTuple{M,T} parity::Parity end @@ -76,12 +76,16 @@ closureStencils = (closureStencils..., Stencil(r, stencilWeights)) end + quadratureClosure = pad_tuple(stringToTuple(Float64, h["closure"][1]), boundarySize) + eClosure = pad_tuple(stringToTuple(Float64, d["e"][1]), boundarySize) + dClosure = pad_tuple(stringToTuple(Float64, d["d1"][1]), boundarySize) + d2 = D2( - stringToVector(Float64, h["closure"][1]), + quadratureClosure, innerStencil, closureStencils, - stringToVector(Float64, d["e"][1]), - stringToVector(Float64, d["d1"][1]), + eClosure, + dClosure, even ) @@ -120,3 +124,12 @@ function stringToVector(T::DataType, s::String) return T.(eval.(Meta.parse.(split(s)))) end + + +function pad_tuple(t::NTuple{N, T}, n::Integer) where {N,T} + if N >= n + return t + else + return pad_tuple((t..., zero(T)), n) + end +end