From 01712ff70f5f2c9a90306079e3b690e950a2d0cb Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Thu, 2 Apr 2026 00:49:14 +0000 Subject: [PATCH 01/11] CompatHelper: bump compat for RecursiveArrayTools to 4, (keep existing compat) --- Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 538e013d8..8de774590 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "DispersiveShallowWater" uuid = "4ab875f6-b79a-4e28-9745-4f0293954817" -authors = ["Joshua Lampert "] version = "0.10.2-DEV" +authors = ["Joshua Lampert "] [deps] BandedMatrices = "aae01518-5342-5314-be14-df237901396f" @@ -38,7 +38,7 @@ PolynomialBases = "0.4.15" PreallocationTools = "0.4.23, 1" Printf = "1" RecipesBase = "1.3.4" -RecursiveArrayTools = "3.27.2" +RecursiveArrayTools = "3.27.2, 4" Reexport = "1.2.2" Roots = "2.0.17" SciMLBase = "2.78" From df569c3a5e7315acc4ff2c882e82c18587fde10c Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Sat, 4 Apr 2026 09:34:39 +0200 Subject: [PATCH 02/11] switch author/version fields in Project.toml to make Aqua.jl happy --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index c852ddf1b..1a9e212d1 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "DispersiveShallowWater" uuid = "4ab875f6-b79a-4e28-9745-4f0293954817" -version = "0.10.2-DEV" authors = ["Joshua Lampert "] +version = "0.10.2-DEV" [deps] BandedMatrices = "aae01518-5342-5314-be14-df237901396f" From 7b9067519ebd386d2fd7d79ecf62ded406624f8e Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Wed, 8 Apr 2026 18:06:14 +0200 Subject: [PATCH 03/11] allow v3 of SciMLBase.jl --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 1a9e212d1..6f5aa13b7 100644 --- a/Project.toml +++ b/Project.toml @@ -41,7 +41,7 @@ RecipesBase = "1.3.4" RecursiveArrayTools = "3.27.2, 4" Reexport = "1.2.2" Roots = "2.0.17" -SciMLBase = "2.78" +SciMLBase = "2.78, 3" SimpleUnPack = "1.1" SparseArrays = "1" StaticArrays = "1.9.8" From 2438d23895a2f424da19a70b6a8dfae63f60fa60 Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Wed, 22 Apr 2026 09:59:02 +0200 Subject: [PATCH 04/11] allow DiffEqBase.jl v7 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 6f5aa13b7..f193e5862 100644 --- a/Project.toml +++ b/Project.toml @@ -29,7 +29,7 @@ TrixiBase = "9a0f1c46-06d5-4909-a5a3-ce25d3fa3284" [compat] BandedMatrices = "1.5" DelimitedFiles = "1" -DiffEqBase = "6.160" +DiffEqBase = "6.160, 7" FastBroadcast = "0.3.5, 1" ForwardDiff = "0.10.36, 1" Interpolations = "0.15.1, 0.16" From 9f75d248a0cc2ef9593d46908ba4a5a472c2f566 Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Sun, 26 Apr 2026 20:51:37 +0200 Subject: [PATCH 05/11] allow OrdinaryDiffEq v2 subpackages --- docs/Project.toml | 2 +- test/Project.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Project.toml b/docs/Project.toml index a9bfcdc3c..0b396a07d 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -11,7 +11,7 @@ TrixiBase = "9a0f1c46-06d5-4909-a5a3-ce25d3fa3284" [compat] Changelog = "1" Documenter = "1" -OrdinaryDiffEqTsit5 = "1" +OrdinaryDiffEqTsit5 = "1, 2" Plots = "1.9" Printf = "1" SparseArrays = "1" diff --git a/test/Project.toml b/test/Project.toml index 51c2287f7..fdcc80b22 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -17,9 +17,9 @@ TrixiTest = "0a316866-cbd0-4425-8bcb-08103b2c1f26" Aqua = "0.7, 0.8" ExplicitImports = "1.0.1" ForwardDiff = "0.10.36, 1" -OrdinaryDiffEqLowStorageRK = "1.1" -OrdinaryDiffEqRosenbrock = "1.9" -OrdinaryDiffEqTsit5 = "1.1" +OrdinaryDiffEqLowStorageRK = "1.1, 2" +OrdinaryDiffEqRosenbrock = "1.9, 2" +OrdinaryDiffEqTsit5 = "1.1, 2" Plots = "1.38.9" SparseArrays = "1" SummationByPartsOperators = "0.5.79" From a0af6e63233c3df1cb1d5f7bc7e6ffdfb20679b2 Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Sun, 26 Apr 2026 23:08:56 +0200 Subject: [PATCH 06/11] fix deprecation warnings --- src/DispersiveShallowWater.jl | 9 ++++++++- src/callbacks_step/analysis.jl | 2 +- src/callbacks_step/summary.jl | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/DispersiveShallowWater.jl b/src/DispersiveShallowWater.jl index a404ebfbb..1ab4ad33f 100644 --- a/src/DispersiveShallowWater.jl +++ b/src/DispersiveShallowWater.jl @@ -32,7 +32,6 @@ using Reexport: @reexport using Roots: AlefeldPotraShi, find_zero using SciMLBase: SciMLBase, DiscreteCallback, ODEProblem, ODESolution -import SciMLBase: u_modified! @reexport using StaticArrays: SVector using SimpleUnPack: @unpack @@ -57,6 +56,14 @@ using TimerOutputs: TimerOutputs, print_timer, reset_timer! @reexport using TrixiBase: trixi_include using TrixiBase: TrixiBase, @trixi_timeit, timer +# To keep backwards compatibility with SciMLBase v2, see +# https://github.com/trixi-framework/Trixi.jl/pull/2918#issuecomment-4233720339 +@static if isdefined(SciMLBase, :derivative_discontinuity!) + using SciMLBase: derivative_discontinuity! +else + const derivative_discontinuity! = SciMLBase.u_modified! +end + include("experimental_data.jl") include("boundary_conditions.jl") include("mesh.jl") diff --git a/src/callbacks_step/analysis.jl b/src/callbacks_step/analysis.jl index 5dec2226d..a39c0a87d 100644 --- a/src/callbacks_step/analysis.jl +++ b/src/callbacks_step/analysis.jl @@ -183,7 +183,7 @@ function (analysis_callback::AnalysisCallback)(integrator) semi) # avoid re-evaluating possible FSAL stages - u_modified!(integrator, false) + derivative_discontinuity!(integrator, false) # Return errors for EOC analysis return l2_error, linf_error diff --git a/src/callbacks_step/summary.jl b/src/callbacks_step/summary.jl index e528424fc..2d3653efb 100644 --- a/src/callbacks_step/summary.jl +++ b/src/callbacks_step/summary.jl @@ -38,7 +38,7 @@ function initialize_summary_callback(cb::DiscreteCallback, u, t, integrator) end # the summary callback does nothing when called accidentally -(cb::SummaryCallback)(integrator) = u_modified!(integrator, false) +(cb::SummaryCallback)(integrator) = derivative_discontinuity!(integrator, false) function finalize_summary_callback(cb::DiscreteCallback, u, t, integrator) io = cb.affect!.io From eac1a75bd41f8169212d9545db8d6e3a2abe3763 Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Sun, 26 Apr 2026 23:22:46 +0200 Subject: [PATCH 07/11] ignore stale implicit import for derivative_discontinuity! --- test/test_aqua.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_aqua.jl b/test/test_aqua.jl index 39144f7ab..19ed277db 100644 --- a/test/test_aqua.jl +++ b/test/test_aqua.jl @@ -8,5 +8,6 @@ # ExplicitImports.jl @test isnothing(check_no_implicit_imports(DispersiveShallowWater)) - @test isnothing(check_no_stale_explicit_imports(DispersiveShallowWater)) + @test isnothing(check_no_stale_explicit_imports(DispersiveShallowWater), + ignore = (:derivative_discontinuity!,)) end From 8a61a3d8b6afddbd1498d199406505c2fe1cc325 Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Sun, 26 Apr 2026 23:44:06 +0200 Subject: [PATCH 08/11] fix paranthesis --- test/test_aqua.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_aqua.jl b/test/test_aqua.jl index 19ed277db..ce63835c4 100644 --- a/test/test_aqua.jl +++ b/test/test_aqua.jl @@ -8,6 +8,6 @@ # ExplicitImports.jl @test isnothing(check_no_implicit_imports(DispersiveShallowWater)) - @test isnothing(check_no_stale_explicit_imports(DispersiveShallowWater), - ignore = (:derivative_discontinuity!,)) + @test isnothing(check_no_stale_explicit_imports(DispersiveShallowWater, + ignore = (:derivative_discontinuity!,))) end From 25e60ea84685c0729678ade6281cfdee397032fe Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Mon, 27 Apr 2026 09:48:15 +0200 Subject: [PATCH 09/11] also bump versions in benchmark/Project.toml --- benchmark/Project.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/benchmark/Project.toml b/benchmark/Project.toml index f00845438..a89c005f0 100644 --- a/benchmark/Project.toml +++ b/benchmark/Project.toml @@ -7,7 +7,7 @@ SummationByPartsOperators = "9f78cca6-572e-554e-b819-917d2f1cf240" [compat] BenchmarkTools = "1" -OrdinaryDiffEqLowStorageRK = "1.1" -OrdinaryDiffEqRosenbrock = "1.3" -OrdinaryDiffEqTsit5 = "1.1" +OrdinaryDiffEqLowStorageRK = "1.1, 2" +OrdinaryDiffEqRosenbrock = "1.3, 2" +OrdinaryDiffEqTsit5 = "1.1, 2" SummationByPartsOperators = "0.5.79" From 7b77496337bec9dbd205f89c0ed5cb74b6efa77a Mon Sep 17 00:00:00 2001 From: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com> Date: Wed, 29 Apr 2026 16:53:06 +0200 Subject: [PATCH 10/11] Update test/Project.toml --- test/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Project.toml b/test/Project.toml index fdcc80b22..8a1086efe 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -17,7 +17,7 @@ TrixiTest = "0a316866-cbd0-4425-8bcb-08103b2c1f26" Aqua = "0.7, 0.8" ExplicitImports = "1.0.1" ForwardDiff = "0.10.36, 1" -OrdinaryDiffEqLowStorageRK = "1.1, 2" +OrdinaryDiffEqLowStorageRK = "1.1, 2, 3" OrdinaryDiffEqRosenbrock = "1.9, 2" OrdinaryDiffEqTsit5 = "1.1, 2" Plots = "1.38.9" From fd21345af38ed5945834267db95fdee2284ca571 Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Thu, 30 Apr 2026 11:31:15 +0200 Subject: [PATCH 11/11] allow OrdinaryDiffEqLowStorageRK.jl v3 in benchmark --- benchmark/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmark/Project.toml b/benchmark/Project.toml index a89c005f0..32b143ac4 100644 --- a/benchmark/Project.toml +++ b/benchmark/Project.toml @@ -7,7 +7,7 @@ SummationByPartsOperators = "9f78cca6-572e-554e-b819-917d2f1cf240" [compat] BenchmarkTools = "1" -OrdinaryDiffEqLowStorageRK = "1.1, 2" +OrdinaryDiffEqLowStorageRK = "1.1, 2, 3" OrdinaryDiffEqRosenbrock = "1.3, 2" OrdinaryDiffEqTsit5 = "1.1, 2" SummationByPartsOperators = "0.5.79"