Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@ jobs:
fail-fast: false
matrix:
version:
- '1.7'
- '1.10'
- 'nightly'
os:
- ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.version }}
- uses: actions/cache@v1
- uses: actions/cache@v4
env:
cache-name: cache-artifacts
with:
Expand All @@ -43,7 +42,7 @@ jobs:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
with:
version: '1.9'
version: '1.10'
- run: julia --project=docs -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- run: julia --project=docs docs/make.jl
env:
Expand Down
9 changes: 4 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[compat]
ColorTypes = "<0.10.1, 0.10, 0.11"
Interpolations = "0.12.10, 0.13, 0.14, 0.15"
LinearAlgebra = "1.7"
OrdinaryDiffEq = "6.50 - 6.87"
Plots = "1.40.9"
LinearAlgebra = "1.10"
OrdinaryDiffEq = "6"
RecipesBase = "1.0"
RecursiveArrayTools = "2.2 - 2.38.5, 2.38.6, 3"
Statistics = "1.7"
julia = "1.7"
Statistics = "1.10"
julia = "1.10"

[extras]
ImmersedLayers = "cdc13194-334e-4e1c-bc8d-fc3a28509c85"
Expand Down
4 changes: 2 additions & 2 deletions docs/src/manual/ftle.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ that we will compute both a forward and backward time FTLE field at `t0`, so
we need to ensure we have velocity data available from `t0 - T` to `t0 + T`.

For integration purposes we use the forward Euler method, but any time marching
method can be used.
method can be used, e.g., `ILMPostProcessing.RK4()`, etc.

````@example ftle
T = 6.0
Expand All @@ -110,7 +110,7 @@ t0 = 6.0
The forward displacement field and FTLE field

````@example ftle
xf, yf = displacement_field(velseq,x0,y0,(t0,t0+T),alg=Euler())
xf, yf = displacement_field(velseq,x0,y0,(t0,t0+T),alg=ILMPostProcessing.Euler())

fFTLE = similar(x0)
compute_FTLE!(fFTLE,xf,yf,dx,dx,T);
Expand Down
2 changes: 1 addition & 1 deletion docs/src/manual/lavd.md
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ Compute and plot the backward FTLE field
````@example lavd
T = 8.5
t0 = 8.5
xb, yb = displacement_field(velseq,x0,y0,(t0,t0-T),alg=Euler())
xb, yb = displacement_field(velseq,x0,y0,(t0,t0-T),alg=ILMPostProcessing.Euler())
fFTLE = similar(x0)
compute_FTLE!(fFTLE,xb,yb,dx,dx,T);

Expand Down
175 changes: 81 additions & 94 deletions examples/dmdtest.ipynb

Large diffs are not rendered by default.

10,566 changes: 5,285 additions & 5,281 deletions examples/ftle.ipynb

Large diffs are not rendered by default.

9,602 changes: 4,792 additions & 4,810 deletions examples/ftle_continuous.ipynb

Large diffs are not rendered by default.

23,226 changes: 11,670 additions & 11,556 deletions examples/lavd.ipynb

Large diffs are not rendered by default.

1,022 changes: 1,022 additions & 0 deletions examples/pod.ipynb

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/FTLE.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ using LinearAlgebra
T = 0.5
t0 = 0.5

xf, yf = displacement_field(vseq,x0,y0,(t0,t0+T),alg=Euler())
xb, yb = displacement_field(vseq,x0,y0,(t0,t0-T),alg=Euler())
xf, yf = displacement_field(vseq,x0,y0,(t0,t0+T),alg=ILMPostProcessing.Euler())
xb, yb = displacement_field(vseq,x0,y0,(t0,t0-T),alg=ILMPostProcessing.Euler())

#a = ILMPostProcessing.euler_forward(initial_conditions, u, v, t0, t_start, dt, T)
#b = ILMPostProcessing.euler_backward(initial_conditions, u, v, t0, t_start, dt, T)
Expand Down
4 changes: 2 additions & 2 deletions test/literate/ftle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ that we will compute both a forward and backward time FTLE field at `t0`, so
we need to ensure we have velocity data available from `t0 - T` to `t0 + T`.

For integration purposes we use the forward Euler method, but any time marching
method can be used.
method can be used, e.g., `ILMPostProcessing.RK4()`, etc.
=#

T = 6.0
Expand All @@ -105,7 +105,7 @@ t0 = 6.0
#=
The forward displacement field and FTLE field
=#
xf, yf = displacement_field(velseq,x0,y0,(t0,t0+T),alg=Euler())
xf, yf = displacement_field(velseq,x0,y0,(t0,t0+T),alg=ILMPostProcessing.Euler())

fFTLE = similar(x0)
compute_FTLE!(fFTLE,xf,yf,dx,dx,T);
Expand Down
2 changes: 1 addition & 1 deletion test/literate/lavd.jl
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ Compute and plot the backward FTLE field

T = 8.5
t0 = 8.5
xb, yb = displacement_field(velseq,x0,y0,(t0,t0-T),alg=Euler())
xb, yb = displacement_field(velseq,x0,y0,(t0,t0-T),alg=ILMPostProcessing.Euler())
fFTLE = similar(x0)
compute_FTLE!(fFTLE,xb,yb,dx,dx,T);

Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ end
if GROUP == "Notebooks"
for (root, dirs, files) in walkdir(litdir)
for file in files
#endswith(file,".jl") && startswith(file,"ftle_cont") && Literate.notebook(joinpath(root, file),notebookdir)
#endswith(file,".jl") && startswith(file,"lavd") && Literate.notebook(joinpath(root, file),notebookdir)
endswith(file,".jl") && Literate.notebook(joinpath(root, file),notebookdir)
end
end
Expand Down
12 changes: 6 additions & 6 deletions test/trajectories.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ using LinearAlgebra

pts = [ [0.5,1], [-0.5,-0.5], [0.25, -0.3]]

traj = compute_trajectory(velfcn...,pts,(0,1),alg=Tsit5())
traj = compute_trajectory(velfcn...,pts,(0,1),alg=ILMPostProcessing.Tsit5())

@test length(traj.xhistory[end]) == length(traj.yhistory[end]) == length(pts)

tsline = integrator.t
sline = compute_streamline(velfcn...,pts,(0,12),tsline,alg=Tsit5())
sline = compute_streamline(velfcn...,pts,(0,12),tsline,alg=ILMPostProcessing.Tsit5())


t_start = 0.0
Expand All @@ -50,7 +50,7 @@ using LinearAlgebra
ftle_cache = SurfaceScalarCache(ftlegrid)
x0, y0 = x_grid(ftle_cache), y_grid(ftle_cache)

traj = compute_trajectory(vseq,(x0,y0),(t_start,t_end),alg=Euler())
traj = compute_trajectory(vseq,(x0,y0),(t_start,t_end),alg=ILMPostProcessing.Euler())

@test length(traj.xhistory[end]) == length(traj.yhistory[end]) == length(x0)

Expand All @@ -65,14 +65,14 @@ end

pts = [ [0.5,1], [-0.5,-0.5], [0.25, -0.3]]

traj = compute_trajectory(ufcn,vfcn,pts,(0,1),alg=Tsit5())
traj = compute_trajectory(ufcn,vfcn,pts,(0,1),alg=ILMPostProcessing.Tsit5())

@test typeof(traj.xhistory)<:Vector && typeof(traj.yhistory)<:Vector

ufcn2(x,y,t) = 1
vfcn2(x,y,t) = sin(t)

traj = compute_trajectory(ufcn2,vfcn2,pts,(0,1),alg=Tsit5())
traj = compute_trajectory(ufcn2,vfcn2,pts,(0,1),alg=ILMPostProcessing.Tsit5())

@test typeof(traj.xhistory)<:Vector && typeof(traj.yhistory)<:Vector

Expand All @@ -81,7 +81,7 @@ end


tsline = π
sline = compute_streamline(ufcn2,vfcn2,pts,(0,10),tsline,alg=Tsit5())
sline = compute_streamline(ufcn2,vfcn2,pts,(0,10),tsline,alg=ILMPostProcessing.Tsit5())
x1, y1 = sline[2]
@test norm(y1 .- pts[2][2]) < 1e-7

Expand Down
Loading