Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisRackauckas committed Jul 15, 2018
2 parents 890a8a9 + e7e05f8 commit f79e713
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
julia 0.7-beta
julia 0.7-beta2
ODEInterface 0.1.3
DiffEqBase 3.0.0
Compat 0.17.0
Expand Down
2 changes: 1 addition & 1 deletion src/ODEInterfaceDiffEq.jl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function __init__()
global warnlist = Set(warnkeywords)
end

@compat const KW = Dict{Symbol,Any}
const KW = Dict{Symbol,Any}

include("algorithms.jl")
include("integrator_types.jl")
Expand Down
2 changes: 1 addition & 1 deletion src/algorithms.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ODEInterface.jl Algorithms

@compat abstract type ODEInterfaceAlgorithm <: DiffEqBase.AbstractODEAlgorithm end
abstract type ODEInterfaceAlgorithm <: DiffEqBase.AbstractODEAlgorithm end
struct dopri5 <: ODEInterfaceAlgorithm end
struct dop853 <: ODEInterfaceAlgorithm end
struct odex <: ODEInterfaceAlgorithm end
Expand Down
10 changes: 5 additions & 5 deletions src/solve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function DiffEqBase.__solve(
o[:OUTPUTFCN] = outputfcn
if !(typeof(callbacks_internal.continuous_callbacks)<:Tuple{}) || !isempty(saveat)
if typeof(alg) <: Union{ddeabm,ddebdf}
warn("saveat and continuous callbacks ignored for ddeabm and ddebdf")
@warn("saveat and continuous callbacks ignored for ddeabm and ddebdf")
o[:OUTPUTMODE] = ODEInterface.OUTPUTFCN_WODENSE
else
o[:OUTPUTMODE] = ODEInterface.OUTPUTFCN_DENSE
Expand Down Expand Up @@ -145,16 +145,16 @@ function DiffEqBase.__solve(

if retcode < 0
if retcode == -1
verbose && warn("Input is not consistent.")
verbose && @warn("Input is not consistent.")
return_retcode = :Failure
elseif retcode == -2
verbose && warn("Interrupted. Larger maxiters is needed.")
verbose && @warn("Interrupted. Larger maxiters is needed.")
return_retcode = :MaxIters
elseif retcode == -3
verbose && warn("Step size went too small.")
verbose && @warn("Step size went too small.")
return_retcode = :DtLessThanMin
elseif retcode == -4
verbose && warn("Interrupted. Problem is probably stiff.")
verbose && @warn("Interrupted. Problem is probably stiff.")
return_retcode = :Unstable
end
else
Expand Down

0 comments on commit f79e713

Please sign in to comment.