fix ambiguity in flow methods (#51)

Author: dkarrasch

Project.toml

@@ -1,6 +1,6 @@
 name = "CoherentStructures"
 uuid = "0c1513b4-3a13-56f1-9cd2-8312eaec88c4"
-version = "0.3.2"
+version = "0.3.3"
 
 [deps]
 Arpack = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"

src/ellipticLCS.jl

@@ -1630,12 +1630,12 @@ end
 
 ### Some convenience functions
 
-function flow(odefun, u::EllipticBarrier{T}, tspan; kwargs...) where {T<:Real}
+function flow(odefun::ODE.ODEFunction, u::EllipticBarrier{T}, tspan; kwargs...) where {T<:Real}
     nt = length(tspan)
     nc = length(u.curve)
     newcurves = map(
         let odefun = odefun, tspan = tspan, kwargs = kwargs
-            x -> flow(odefun, SVector{2}(x[1], x[2]), tspan; kwargs...)
+            x -> flow(odefun, (x[1], x[2]), tspan; kwargs...)
         end,
         u.curve,
     )
@@ -1653,13 +1653,13 @@ function flow(odefun, u::EllipticBarrier{T}, tspan; kwargs...) where {T<:Real}
     ]
 end
 
-function flow(odefun, u::Singularity, tspan; kwargs...)
+function flow(odefun::ODE.ODEFunction, u::Singularity, tspan; kwargs...)
     nt = length(tspan)
     newcoords = flow(odefun, u.coords, tspan; kwargs...)
     return [Singuarity(newcoords[i], u.index) for i in 1:nt]
 end
 
-function flow(odefun, u::EllipticVortex{T}, tspan; kwargs...) where {T}
+function flow(odefun::ODE.ODEFunction, u::EllipticVortex{T}, tspan; kwargs...) where {T}
     newbarriers = [flow(odefun, b, tspan; kwargs...) for b in u.barriers]
     newbarriers2 = Vector{EllipticBarrier{T}}[]
     nt = length(tspan)

src/pullbacktensors.jl

@@ -30,10 +30,10 @@ julia> f = u -> flow((u, p, t) -> vf(u, p, t), u, range(0., stop=100, length=21)
 @inline function flow(odefun, u0, tspan; kwargs...)
     return flow(ODE.ODEFunction(odefun), u0, tspan; kwargs...)
 end
-@inline function flow(odefun::ODE.ODEFunction{true}, u0, tspan; kwargs...)
+@inline function flow(odefun::ODE.ODEFunction{true}, u0::Union{Tuple{Vararg{T}},AbstractVecOrMat{T}}, tspan; kwargs...) where {T<:Real}
     return _flow(odefun, convert(Vector, u0), tspan; kwargs...)
 end
-@inline function flow(odefun::ODE.ODEFunction{false}, u0, tspan; kwargs...)
+@inline function flow(odefun::ODE.ODEFunction{false}, u0::Union{Tuple{Vararg{T}},AbstractVecOrMat{T}}, tspan; kwargs...) where {T<:Real}
     return _flow(odefun, convert(SVector{length(u0)}, u0), tspan; kwargs...)
 end
 @inline function _flow(

test/test_elliptic.jl

@@ -103,6 +103,13 @@ end
     vortices32 = @inferred getvortices(T, [Singularity((Float32(0.25), Float32(0.5)), 1)], p; verbose=false)
     @test length(vortices32) == length(vortices)
     vortices, singularities = @inferred ellipticLCS(T, p; outermost=true, verbose=false)
+    vortex = vortices[1]
+    flowvortex = flow(rot_double_gyre, vortex, tspan)
+    @test flowvortex isa Vector{<:EllipticVortex}
+    @test length(flowvortex) == length(tspan)
+    flowbarrier = flow(rot_double_gyre, vortex.barriers[1], tspan)
+    @test flowbarrier isa Vector{<:EllipticBarrier}
+    @test length(flowbarrier) == length(tspan)
     @test sum(map(v -> length(v.barriers), vortices)) == 2
     @test singularities isa Vector{Singularity{Float64}}
     @test length(singularities) > 5