Merge branch 'dynamic'

src/SteadyStateDiffEq.jl

@@ -4,8 +4,8 @@ module SteadyStateDiffEq
 
 using Reexport
 @reexport using DiffEqBase
-  
-using NLsolve
+
+using NLsolve, DiffEqCallbacks
 
 using Compat
 
@@ -14,6 +14,6 @@ import DiffEqBase: solve
 include("algorithms.jl")
 include("solve.jl")
 
-export SSRootfind
+export SSRootfind, DynamicSS
 
 end # module

src/algorithms.jl

@@ -4,3 +4,10 @@ struct SSRootfind{F} <: SteadyStateDiffEqAlgorithm
   nlsolve::F
 end
 SSRootfind(;nlsolve=(f,u0,abstol) -> (res=NLsolve.nlsolve(f,u0,ftol = abstol);res.zero)) = SSRootfind(nlsolve)
+
+struct DynamicSS{A,AT,RT} <: SteadyStateDiffEqAlgorithm
+  alg::A
+  abstol::AT
+  reltol::RT
+end
+DynamicSS(alg;abstol = 1e-8, reltol = 1e-6) = DynamicSS(alg,abstol,reltol)

src/solve.jl

@@ -37,3 +37,10 @@ function solve(prob::AbstractSteadyStateProblem,alg::SteadyStateDiffEqAlgorithm,
     error("Algorithm not recognized")
   end
 end
+
+function solve(prob::AbstractSteadyStateProblem,alg::DynamicSS,args...;kwargs...)
+  _prob = ODEProblem(prob.f,prob.u0,(0.0,Inf),prob.p,
+                   mass_matrix=prob.mass_matrix,
+                   jac_prototype=prob.jac_prototype)
+  solve(_prob,alg.alg,args...;kwargs...,callback=TerminateSteadyState(alg.abstol,alg.reltol))
+end

test/runtests.jl

@@ -9,6 +9,7 @@ u0 = zeros(2)
 prob = SteadyStateProblem(f,u0)
 abstol = 1e-8
 sol = solve(prob,SSRootfind())
+p = nothing
 
 du = zeros(2)
 f(du,sol.u,nothing,0)
@@ -25,3 +26,14 @@ f(du,sol.u,nothing,0)
 sol = solve(prob,SSRootfind(nlsolve = (f,u0,abstol) -> (res=Sundials.kinsol(f,u0)) ))
 f(du,sol.u,nothing,0)
 @test du == [0,0]
+
+using OrdinaryDiffEq
+sol = solve(prob,DynamicSS(Rodas5()))
+
+f(du,sol.u[end],p,0)
+@test du ≈ [0,0] atol = 1e-7
+
+sol = solve(prob,DynamicSS(CVODE_BDF()),dt=1.0)
+
+f(du,sol.u[end],p,0)
+@test du ≈ [0,0] atol = 1e-6