Skip to content

make modelingtoolkitize more robust to weird arrays #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 13, 2021
Merged

make modelingtoolkitize more robust to weird arrays #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3548b7
make modelingtoolkitize more robust to weird arrays
ChrisRackauckas Feb 12, 2021
0f41b7d
vec before Vector
ChrisRackauckas Feb 13, 2021
51a8ec8
add missing package for tests
ChrisRackauckas Feb 13, 2021
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
21 changes: 17 additions & 4 deletions src/systems/diffeqs/modelingtoolkitize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function modelingtoolkitize(prob::DiffEqBase.ODEProblem)
end

var(x, i) = Num(Sym{FnType{Tuple{symtype(t)}, Real}}(nameof(Variable(x, i))))
vars = reshape([var(:x, i)(value(t)) for i in eachindex(prob.u0)],size(prob.u0))
vars = ArrayInterface.restructure(prob.u0,[var(:x, i)(ModelingToolkit.value(t)) for i in eachindex(prob.u0)])
params = p isa DiffEqBase.NullParameters ? [] :
reshape([Num(Sym{Real}(nameof(Variable(:α, i)))) for i in eachindex(p)],size(p))

Expand All @@ -31,7 +31,14 @@ function modelingtoolkitize(prob::DiffEqBase.ODEProblem)
end

eqs = vcat([rhs[i] ~ lhs[i] for i in eachindex(prob.u0)]...)
de = ODESystem(eqs,t,vec(vars),vec(params))

params = if ndims(params) == 0
[params[1]]
else
Vector(vec(params))
end

de = ODESystem(eqs,t,Vector(vec(vars)),params)

de
end
Expand All @@ -53,7 +60,7 @@ function modelingtoolkitize(prob::DiffEqBase.SDEProblem)
p = prob.p
end
var(x, i) = Num(Sym{FnType{Tuple{symtype(t)}, Real}}(nameof(Variable(x, i))))
vars = reshape([var(:x, i)(value(t)) for i in eachindex(prob.u0)],size(prob.u0))
vars = ArrayInterface.restructure(prob.u0,[var(:x, i)(ModelingToolkit.value(t)) for i in eachindex(prob.u0)])
params = p isa DiffEqBase.NullParameters ? [] :
reshape([Num(Sym{Real}(nameof(Variable(:α, i)))) for i in eachindex(p)],size(p))

Expand Down Expand Up @@ -83,7 +90,13 @@ function modelingtoolkitize(prob::DiffEqBase.SDEProblem)
end
deqs = vcat([rhs[i] ~ lhs[i] for i in eachindex(prob.u0)]...)

de = SDESystem(deqs,neqs,t,vec(vars),vec(params))
params = if ndims(params) == 0
[params[1]]
else
Vector(vec(params))
end

de = SDESystem(deqs,neqs,t,Vector(vec(vars)),params)

de
end
Expand Down
21 changes: 20 additions & 1 deletion test/modelingtoolkitize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using OrdinaryDiffEq, ModelingToolkit, Test
using GalacticOptim, Optim
using GalacticOptim, Optim, RecursiveArrayTools

N = 32
const xyd_brusselator = range(0,stop=1,length=N)
Expand Down Expand Up @@ -141,3 +141,22 @@ problem = ODEProblem(SIRD_ac!, ℬ, 𝒯, 𝒫)
sys = modelingtoolkitize(problem)
fast_problem = ODEProblem(sys,ℬ, 𝒯, 𝒫 )
@time solution = solve(fast_problem, Tsit5(), saveat = 1:final_time)

## Issue #778

r0 = [1131.340, -2282.343, 6672.423]
v0 = [-5.64305, 4.30333, 2.42879]
Δt = 86400.0*365
μ = 398600.4418
rv0 = ArrayPartition(r0,v0)

function f(dy, y, μ, t)
r = sqrt(sum(y[1,:].^2))
dy[1,:] = y[2,:]
dy[2,:] = -μ .* y[1,:] / r^3
end

prob = ODEProblem(f, rv0, (0.0, Δt), μ)
sol = solve(prob, Vern8())

modelingtoolkitize(prob)