Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
bb359cd
remove restriction of DiffEqBase.jl (used as hotfix)
ranocha Feb 7, 2025
7ca0e1f
ODE_DEFAULT_NORM moved
ranocha Feb 7, 2025
74a9443
use ADTypes
ranocha Feb 7, 2025
b6b507d
fix another depwarn
ranocha Feb 7, 2025
a719514
bump DiffEqCallbacks
ranocha Feb 7, 2025
9b4763f
format
ranocha Feb 7, 2025
286e786
allow older version of ADTypes
ranocha Feb 7, 2025
ac03d56
Update test/Project.toml
ranocha Feb 7, 2025
f445dba
Merge branch 'main' into hr/update_DiffEq
JoshuaLampert Feb 7, 2025
a750d7d
restrict to ADTypes v1
ranocha Feb 7, 2025
bbb8cd4
bump ADTypes for NonlinearSolve.jl
ranocha Feb 7, 2025
c4446ac
fix compat bounds for Downgrade action
JoshuaLampert Feb 7, 2025
c4f5279
fix Aqua.jl issue
JoshuaLampert Feb 7, 2025
b454473
add DiffEqBase extension to fix callback issues with custom integrators
ranocha Feb 7, 2025
a76946a
ignore several run folders
ranocha Feb 7, 2025
d79b2d3
sort alphabetically
ranocha Feb 7, 2025
a9a2964
format
ranocha Feb 7, 2025
17f5abe
import fix
ranocha Feb 7, 2025
d74506f
allow v3 of DiffEqCallbacks
ranocha Feb 7, 2025
8805345
require Static.jl v1 for DiffEqBase.jl v6.154 (required for new DiffE…
ranocha Feb 7, 2025
dae8491
require StaticArrayInterface 1.5.1 for Static.jl v1
ranocha Feb 7, 2025
2c11e00
fix Aqua tests
JoshuaLampert Feb 7, 2025
12cd9f6
Merge branch 'hr/update_DiffEq' of https://github.com/trixi-framework…
JoshuaLampert Feb 7, 2025
599e1d4
fix test values
JoshuaLampert Feb 7, 2025
3760a8e
fix restart_file
JoshuaLampert Feb 7, 2025
19e1911
require Octavian.jl v0.3.28 for Static.jl
ranocha Feb 7, 2025
f407ec1
require LoopVectorization.jl v0.12.171 for Static.jl
JoshuaLampert Feb 7, 2025
da96488
require StrideArrays.jl v0.1.29 for Static.jl
JoshuaLampert Feb 7, 2025
d2f1587
require Polyester.jl v0.7.15 for Static.jl
JoshuaLampert Feb 7, 2025
1f08a5c
fix typo
ranocha Feb 7, 2025
7dba3cd
require OrdinaryDiffEq.jl v6.88 for FastBroadcast.jl version required…
ranocha Feb 7, 2025
a9b2c8c
Merge branch 'main' into hr/update_DiffEq
JoshuaLampert Feb 7, 2025
4c75667
require Polyester.jl v0.7.16 for OrdinaryDiffEqPRK.jl
JoshuaLampert Feb 7, 2025
b844ee5
require MuladdMacro v0.2.4 for OrdinaryDiffEqPRK.jl
JoshuaLampert Feb 7, 2025
832dd8d
require Static.jl v1.1.1 for OrdinaryDiffEqHighOrderRK.jl
JoshuaLampert Feb 7, 2025
2fa1327
require ADTypes.jl v1.7.1 for OrdinaryDiffEqNonlinearSolve.jl
JoshuaLampert Feb 7, 2025
eb3d778
fix documentation about PERK methods
JoshuaLampert Feb 7, 2025
b48479d
fix some more test values and tolerances
JoshuaLampert Feb 7, 2025
d0b6f1f
remove extras that are not required anymore since Julia v1.9
ranocha Feb 7, 2025
dd81e82
make DiffEqBase a regular dep instead of a weakdep
ranocha Feb 7, 2025
624c932
format
ranocha Feb 7, 2025
4a682ff
add NLsolve to docs/Project.toml
JoshuaLampert Feb 7, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/Downgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-downgrade-compat@v1
with:
skip: LinearAlgebra,Printf,SparseArrays,UUIDs,DiffEqBase,DelimitedFiles,Test,Downloads,Random
skip: LinearAlgebra,Printf,SparseArrays,UUIDs,DelimitedFiles,Test,Downloads,Random
projects: ., test
- uses: julia-actions/julia-buildpkg@v1
env:
Expand Down
4 changes: 1 addition & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949"
Expand Down Expand Up @@ -69,8 +68,7 @@ ConstructionBase = "1.5"
Convex = "0.16"
DataStructures = "0.18.15"
DelimitedFiles = "1"
DiffEqBase = "6 - 6.143"
DiffEqCallbacks = "2.35"
DiffEqCallbacks = "2.35, 4"
Downloads = "1.6"
ECOS = "1.1.2"
EllipsisNotation = "1.0"
Expand Down
5 changes: 3 additions & 2 deletions examples/tree_1d_dgsem/elixir_advection_diffusion.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using OrdinaryDiffEq
using OrdinaryDiffEq, ADTypes
using Trixi

###############################################################################
Expand Down Expand Up @@ -87,7 +87,8 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav
# OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks
time_int_tol = 1.0e-10
time_abs_tol = 1.0e-10
sol = solve(ode, KenCarp4(autodiff = false), abstol = time_abs_tol, reltol = time_int_tol,
sol = solve(ode, KenCarp4(autodiff = AutoFiniteDiff()),
abstol = time_abs_tol, reltol = time_int_tol,
save_everystep = false, callback = callbacks)

# Print the timer summary
Expand Down
5 changes: 3 additions & 2 deletions examples/tree_1d_dgsem/elixir_advection_diffusion_restart.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using OrdinaryDiffEq
using OrdinaryDiffEq, ADTypes
using Trixi

###############################################################################
Expand All @@ -22,7 +22,8 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback)
###############################################################################
# run the simulation

sol = solve(ode, KenCarp4(autodiff = false), abstol = time_abs_tol, reltol = time_int_tol,
sol = solve(ode, KenCarp4(autodiff = AutoFiniteDiff()),
abstol = time_abs_tol, reltol = time_int_tol,
save_everystep = false, callback = callbacks)

# Print the timer summary
Expand Down
2 changes: 1 addition & 1 deletion examples/tree_3d_dgsem/elixir_lbm_taylor_green_vortex.jl
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ callbacks = CallbackSet(summary_callback,
sol = solve(ode, CarpenterKennedy2N54(williamson_condition = false),
dt = 1.0, # solve needs some value here but it will be overwritten by the stepsize_callback
save_everystep = false, callback = callbacks,
save_start = false, alias_u0 = true);
save_start = false, alias = ODEAliasSpecifier(alias_u0 = true));
summary_callback() # print the timer summary
2 changes: 2 additions & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
Convex = "f65535da-76fb-5f13-bab9-19810c17039a"
Expand All @@ -21,6 +22,7 @@ StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
ADTypes = "0.2, 1.12"
Aqua = "0.8"
CairoMakie = "0.12, 0.13"
Convex = "0.16"
Expand Down
6 changes: 3 additions & 3 deletions test/test_mpi.jl
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ end # MPI

t = 0.5
let u = 1.0
@test ode_norm(u, t) ≈ OrdinaryDiffEq.ODE_DEFAULT_NORM(u, t)
@test ode_norm(u, t) ≈ OrdinaryDiffEq.DiffEqBase.ODE_DEFAULT_NORM(u, t)
end
let u = [1.0, -2.0]
@test ode_norm(u, t) ≈ OrdinaryDiffEq.ODE_DEFAULT_NORM(u, t)
@test ode_norm(u, t) ≈ OrdinaryDiffEq.DiffEqBase.ODE_DEFAULT_NORM(u, t)
end
let u = [SVector(1.0, -2.0), SVector(0.5, -0.1)]
@test ode_norm(u, t) ≈ OrdinaryDiffEq.ODE_DEFAULT_NORM(u, t)
@test ode_norm(u, t) ≈ OrdinaryDiffEq.DiffEqBase.ODE_DEFAULT_NORM(u, t)
end
end # MPI supporting functionality

Expand Down
4 changes: 2 additions & 2 deletions test/test_parabolic_1d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ end
# Create a CallbackSet to collect all callbacks such that they can be passed to the ODE solver
callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback,
amr_callback)
sol = solve(ode, KenCarp4(autodiff = false), abstol = time_abs_tol,
reltol = time_int_tol,
sol = solve(ode, KenCarp4(autodiff = AutoFiniteDiff()),
abstol = time_abs_tol, reltol = time_int_tol,
save_everystep = false, callback = callbacks)
l2_error, linf_error = analysis_callback(sol)
@test l2_error ≈ [6.4878111416468355e-6]
Expand Down
Loading