CompatHelper: bump compat for RecursiveArrayTools to 4, (keep existing compat)

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"
@@ -38,10 +38,10 @@ 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, 3"
-SciMLBase = "2.78"
+SciMLBase = "2.78, 3"
 SimpleUnPack = "1.1"
 SparseArrays = "1"
 StaticArrays = "1.9.8"

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"

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"

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")

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

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

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"

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