Merge branch 'master' into kg/cbfix3

Author: kanav99

Project.toml

@@ -1,7 +1,7 @@
 name = "DiffEqBase"
 uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "6.29.2"
+version = "6.30.0"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

README.md

@@ -1,10 +1,10 @@
 # DiffEqBase.jl
 
 [![Join the chat at https://gitter.im/JuliaDiffEq/Lobby](https://badges.gitter.im/JuliaDiffEq/Lobby.svg)](https://gitter.im/JuliaDiffEq/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/JuliaDiffEq/DiffEqBase.jl.svg?branch=master)](https://travis-ci.org/JuliaDiffEq/DiffEqBase.jl)
+[![Build Status](https://travis-ci.org/SciML/DiffEqBase.jl.svg?branch=master)](https://travis-ci.org/SciML/DiffEqBase.jl)
 [![Build status](https://ci.appveyor.com/api/projects/status/f480ahs29c85m6ne?svg=true)](https://ci.appveyor.com/project/ChrisRackauckas/diffeqbase-jl-3yke2)
 [![GitlabCI](https://gitlab.com/juliadiffeq/DiffEqBase-jl/badges/master/pipeline.svg)](https://gitlab.com/juliadiffeq/DiffEqBase-jl/pipelines)
-[![Coverage Status](https://coveralls.io/repos/github/JuliaDiffEq/DiffEqBase.jl/badge.svg)](https://coveralls.io/github/JuliaDiffEq/DiffEqBase.jl)
+[![Coverage Status](https://coveralls.io/repos/github/SciML/DiffEqBase.jl/badge.svg)](https://coveralls.io/github/SciML/DiffEqBase.jl)
 [![codecov.io](http://codecov.io/github/ChrisRackauckas/DiffEqBase.jl/coverage.svg?branch=master)](http://codecov.io/github/ChrisRackauckas/DiffEqBase.jl?branch=master)
 
 DiffEqBase.jl is a component package in the DiffEq ecosystem. It holds the

src/diffeqfastbc.jl

@@ -15,7 +15,10 @@ diffeqbc(x::Array) = DiffEqBC(x)
 diffeqbc(x) = x
 
 # Ensure inlining
-@inline combine_axes(A, B) = broadcast_shape(broadcast_axes(A), broadcast_axes(B)) # Julia 1.0 compatible
+@static if VERSION < v"1.5.0-DEV.634"
+    @inline combine_axes(A, B) = broadcast_shape(broadcast_axes(A), broadcast_axes(B)) # Julia 1.0 compatible
+end
+
 @inline check_broadcast_axes(shp, A::Union{Number, Array, Broadcasted}) = check_broadcast_shape(shp, axes(A))
 
 @noinline throwfastbc(axesA, axesB) = throw(DimensionMismatch("DiffEq's fast broadcast cannot broadcast $axesA with $axesB"))

src/ensemble/ensemble_solutions.jl

@@ -110,7 +110,7 @@ end
       xlims --> (-Inf,Inf)
       ylims --> (-Inf,Inf)
       zlims --> (-Inf,Inf)
-      zcolor --> zcolors[i]
+      marker_z --> zcolors[i]
       sim[i]
     end
   end

src/integrator_interface.jl

@@ -126,7 +126,7 @@ Sets the proposed `dt` for the next timestep. If second argument isa `DEIntegrat
 first argument to match that of second one. Note that due to PI control and step acceleration this is more than matching
 the factors in most cases.
 """
-set_proposed_dt!(i::DEIntegrator) = error("modify_proposed_dt!: method has not been implemented for the integrator")
+set_proposed_dt!(i::DEIntegrator,dt) = error("set_proposed_dt!: method has not been implemented for the integrator")
 
 """
     savevalues!(integrator::DEIntegrator,

src/solve.jl

@@ -210,6 +210,12 @@ function _concrete_solve(prob::DiffEqBase.DEProblem,alg::DiffEqBase.DEAlgorithm,
   RecursiveArrayTools.DiffEqArray(sol.u,sol.t)
 end
 
+function _concrete_solve(prob::DiffEqBase.SteadyStateProblem,alg::DiffEqBase.DEAlgorithm,
+                        u0=prob.u0,p=prob.p,args...;kwargs...)
+  sol = solve(remake(prob,u0=u0,p=p),alg,args...;kwargs...)
+  RecursiveArrayTools.VectorOfArray(sol.u)
+end
+
 function ChainRulesCore.frule(::typeof(concrete_solve),prob,alg,u0,p,args...;
                      sensealg=nothing,kwargs...)
   _concrete_solve_forward(prob,alg,sensealg,u0,p,args...;kwargs...)

test/downstream/Project.toml

@@ -3,4 +3,5 @@ DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
 DiffEqProblemLibrary = "a077e3f3-b75c-5d7f-a0c6-6bc4c8ec64a9"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
+SteadyStateDiffEq = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f"
 StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"

test/downstream/concrete_solve_tests.jl

@@ -0,0 +1,18 @@
+using OrdinaryDiffEq, StochasticDiffEq, SteadyStateDiffEq, RecursiveArrayTools, Test
+
+function f!(du,u,p,t)
+  du[1] = p[1] + p[2]*u[1]
+  du[2] = p[3]*u[1] + p[4]*u[2]
+end
+u0 = zeros(2)
+p = [2.0,-2.0,1.0,-4.0]
+
+probODE = ODEProblem(f!,u0,(0.0,10.0),p)
+probSS = SteadyStateProblem(f!,u0,p)
+
+solODE = concrete_solve(probODE,Tsit5(), abstol=1e-14,reltol=1e-14)
+solSS = concrete_solve(probSS,DynamicSS(Rodas5()))
+
+@test solSS.u ≈ solODE.u[end] rtol = 1e-8
+@test length(fieldnames(typeof(solODE))) == 2
+@test length(fieldnames(typeof(solSS))) == 1

test/runtests.jl

@@ -46,6 +46,7 @@ if !is_APPVEYOR && GROUP == "Downstream"
     @time @safetestset "PSOS and Energy Conservation Event Detection" begin include("downstream/psos_and_energy_conservation.jl") end
     @time @safetestset "DE stats" begin include("downstream/destats_tests.jl") end
     @time @safetestset "DEDataArray" begin include("downstream/data_array_regression_tests.jl") end
+    @time @safetestset "Concrete_solve Tests" begin include("downstream/concrete_solve_tests.jl") end
     @time @safetestset "AD Tests" begin include("downstream/ad_tests.jl") end
 end