Skip to content
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

Jump to bottom

resolve method ambiguity with SciMLOperators #1766

Merged
merged 7 commits into from
Sep 22, 2022
Merged

resolve method ambiguity with SciMLOperators #1766

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c9ddb0d
resolve method ambiguity
vpuri3 Sep 21, 2022
1d6ab83
fix
vpuri3 Sep 21, 2022
edcae7c
fix
vpuri3 Sep 21, 2022
188133d
weird ambiguity
vpuri3 Sep 21, 2022
69cb21a
ambig with scimlops
vpuri3 Sep 21, 2022
26edd9f
comments
vpuri3 Sep 21, 2022
576f5b1
comment
vpuri3 Sep 21, 2022
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
17 changes: 14 additions & 3 deletions src/derivative_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct StaticWOperator{isinv, T}
end
end
isinv(W::StaticWOperator{S}) where {S} = S
Base.:\(W::StaticWOperator, v) = isinv(W) ? W.W * v : W.W \ v
Base.:\(W::StaticWOperator, v::AbstractArray) = isinv(W) ? W.W * v : W.W \ v

function calc_tderivative!(integrator, cache, dtd1, repeat_step)
@inbounds begin
Expand Down Expand Up @@ -355,7 +355,8 @@ function Base.convert(::Type{Number}, W::WOperator)
end
return W._concrete_form
end
Base.size(W::WOperator, args...) = size(W.J, args...)
Base.size(W::WOperator) = size(W.J)
Base.size(W::WOperator, d::Integer) = d <= 2 ? size(W)[d] : 1
function Base.getindex(W::WOperator, i::Int)
if W.transform
-W.mass_matrix[i] / W.gamma + W.J[i]
Expand All @@ -370,7 +371,14 @@ function Base.getindex(W::WOperator, I::Vararg{Int, N}) where {N}
-W.mass_matrix[I...] + W.gamma * W.J[I...]
end
end
function Base.:*(W::WOperator, x::Union{AbstractVecOrMat, Number})
function Base.:*(W::WOperator, x::AbstractVecOrMat)
if W.transform
(W.mass_matrix * x) / -W.gamma + W.J * x
else
-W.mass_matrix * x + W.gamma * (W.J * x)
end
end
function Base.:*(W::WOperator, x::Number)
if W.transform
(W.mass_matrix * x) / -W.gamma + W.J * x
else
Expand Down Expand Up @@ -827,6 +835,9 @@ end

function build_J_W(alg, u, uprev, p, t, dt, f::F, ::Type{uEltypeNoUnits},
::Val{IIP}) where {IIP, uEltypeNoUnits, F}
# TODO - make J, W AbstractSciMLOperators (lazily defined with scimlops functionality)
# TODO - if jvp given, make it SciMLOperators.FunctionOperator
# TODO - make mass matrix a SciMLOperator so it can be updated with time. Default to IdentityOperator
islin, isode = islinearfunction(f, alg)
if f.jac_prototype isa DiffEqBase.AbstractDiffEqLinearOperator
W = WOperator{IIP}(f, u, dt)
Expand Down