Mercurial > repos > public > sbplib_julia
changeset 100:49796ca2dfa0 cell_based_test
Introduce and use the function stringToTuple in sbpD2.jl
author | Jonatan Werpers <jonatan@werpers.com> |
---|---|
date | Wed, 06 Feb 2019 23:03:12 +0100 |
parents | 6b6d680f2e25 |
children | 19031733bbbf |
files | sbpD2.jl |
diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/sbpD2.jl Wed Feb 06 09:09:55 2019 +0100 +++ b/sbpD2.jl Wed Feb 06 23:03:12 2019 +0100 @@ -59,21 +59,21 @@ h = readSectionedFile(Hfn) # Create inner stencil - innerStencilWeights = stringToVector(Float64, d["inner_stencil"][1]) + innerStencilWeights = stringToTuple(Float64, d["inner_stencil"][1]) width = length(innerStencilWeights) r = (-div(width,2), div(width,2)) - innerStencil = Stencil(r, Tuple(innerStencilWeights)) + innerStencil = Stencil(r, innerStencilWeights) # Create boundary stencils boundarySize = length(d["boundary_stencils"]) closureStencils = Vector{typeof(innerStencil)}() # TBD: is the the right way to get the correct type? for i ∈ 1:boundarySize - stencilWeights = stringToVector(Float64, d["boundary_stencils"][i]) + stencilWeights = stringToTuple(Float64, d["boundary_stencils"][i]) width = length(stencilWeights) r = (1-i,width-i) - closureStencils = (closureStencils..., Stencil(r, Tuple(stencilWeights))) + closureStencils = (closureStencils..., Stencil(r, stencilWeights)) end d2 = D2( @@ -113,6 +113,10 @@ return sections end +function stringToTuple(T::DataType, s::String) + return Tuple(stringToVector(T,s)) +end + function stringToVector(T::DataType, s::String) return T.(eval.(Meta.parse.(split(s)))) end