Skip to content
This repository has been archived by the owner on Feb 9, 2020. It is now read-only.

Replace nan(T) with convert(T, NaN) to stop deprecation warnings in Julia v0.4 #52

Merged
merged 1 commit into from
Oct 29, 2014
Merged

Replace nan(T) with convert(T, NaN) to stop deprecation warnings in Julia v0.4 #52

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
8 changes: 4 additions & 4 deletions src/interp.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ function InterpGrid{T<:FloatingPoint, N, BC<:BoundaryCondition, IT<:InterpType}(
interp_invert!(coefs, BC, IT, 1:N)
ic = InterpGridCoefs(coefs, IT)
x = zeros(T, N)
InterpGrid{T, N, BC, IT}(coefs, ic, x, nan(T))
InterpGrid{T, N, BC, IT}(coefs, ic, x, convert(T, NaN))
end
function InterpGrid{T<:FloatingPoint, N, BC<:Union(BCnil,BCnan,BCna)}(A::Array{T, N}, ::Type{BC}, ::Type{InterpCubic})
# Cubic interpolation requires padding
coefs=pad1(copy(A),0,1:N)
interp_invert!(coefs, BC, InterpCubic, 1:N)
ic = InterpGridCoefs(coefs, InterpCubic)
x = zeros(T, N)
InterpGrid{T, N, BC, InterpCubic}(coefs, ic, x, nan(T))
InterpGrid{T, N, BC, InterpCubic}(coefs, ic, x, convert(T, NaN))
end
function InterpGrid{T<:FloatingPoint, N, IT<:InterpType}(A::Array{T, N}, f::Number, ::Type{IT})
coefs = pad1(A, f, 1:N)
Expand Down Expand Up @@ -341,7 +341,7 @@ function InterpIrregular{T<:Number, S, N, BC<:BoundaryCondition, IT<:Union(Inter
coefs = Array(S, size(A))
copy!(coefs, A)
x = zeros(T, N)
InterpIrregular{T, S, N, BC, IT}(grid, coefs, x, nan(S))
InterpIrregular{T, S, N, BC, IT}(grid, coefs, x, convert(S, NaN))
end
function InterpIrregular{IT<:InterpType}(grid, A::Array, f::Number, ::Type{IT})
iu = InterpIrregular(grid, A, BCfill, IT)
Expand Down Expand Up @@ -486,7 +486,7 @@ end
# "set_gradient_coordinate" followed by "interp" for each component.
function interp{T}(ic::InterpGridCoefs{T}, A::AbstractArray, index::Int)
if !ic.valid
return nan(T)
return convert(T, NaN)
end
coef = ic.coef
if ic.wrap
Expand Down