From f9c91070390f6b75ae6d8e0afc95e1531ecd4bf0 Mon Sep 17 00:00:00 2001 From: Jesse Chan <1156048+jlchan@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:09:58 -0500 Subject: [PATCH] Bump StartUpDG.jl compat to 1.1+ (#2001) * bump compat for StartUpDg * add exception for Kronecker.KroneckerProduct type * add Kronecker package and compat * formatting * restrict StartUpDG version * adding old StartUpDG version for legacy tests * updating incorrect test values (should work with StartUpDG v1.1.4) * format rest of test_dgmulti_3d.jl * reformatting using JuliaFormatter v1.0.45 * fix erroring PlotData2D(sol) calls this is weird - Julia is loading SciMLBase v2.50.5 for me locally, which includes a `discType` parameter. https://github.com/SciML/SciMLBase.jl/blob/12f30308a4f4959dd6bbf97efc1f600621546cf4/src/solutions/ode_solutions.jl#L108C65-L109 However, I don't think any StartUpDG changes should have triggered this, so I'm not sure why these tests are failing now * Revert "add exception for Kronecker.KroneckerProduct type" This reverts commit f2909f95897beeb007005e738df664ad3479a384. * Revert "fix erroring PlotData2D(sol) calls" This reverts commit 4abd2fd3f8efc4aec4585ac034cecd740429dc21. * explicitly add RecursiveArrayTools and restrict compat to "2" * bump RecursiveArrayTools compat to try to fix Downgrade.yml * remove Kronecker now that we don't reference it anymore * remove Kronecker now that we don't reference it anymore * remove ~ compat restriction --- Project.toml | 10 ++++++---- test/test_dgmulti_3d.jl | 15 ++++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Project.toml b/Project.toml index f8be84e0ce..6a887d71d2 100644 --- a/Project.toml +++ b/Project.toml @@ -29,6 +29,7 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" Preferences = "21216c6a-2e73-6563-6e65-726566657250" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" +RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" Requires = "ae029012-a4dd-5104-9daa-d747884805df" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" @@ -50,13 +51,13 @@ TrixiBase = "9a0f1c46-06d5-4909-a5a3-ce25d3fa3284" UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [weakdeps] -Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" Convex = "f65535da-76fb-5f13-bab9-19810c17039a" ECOS = "e2685f51-7e38-5353-a97d-a921fd2c8199" +Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" [extensions] -TrixiMakieExt = "Makie" TrixiConvexECOSExt = ["Convex", "ECOS"] +TrixiMakieExt = "Makie" [compat] CodeTracking = "1.0.5" @@ -87,12 +88,13 @@ PrecompileTools = "1.1" Preferences = "1.3" Printf = "1" RecipesBase = "1.1" +RecursiveArrayTools = "2.38.10" Reexport = "1.0" Requires = "1.1" SciMLBase = "1.90, 2" SimpleUnPack = "1.1" SparseArrays = "1" -StartUpDG = "0.17.7" +StartUpDG = "0.17.7, 1.1.5" Static = "0.8.7" StaticArrayInterface = "1.4" StaticArrays = "1.5" @@ -109,6 +111,6 @@ UUIDs = "1.6" julia = "1.8" [extras] -Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" Convex = "f65535da-76fb-5f13-bab9-19810c17039a" ECOS = "e2685f51-7e38-5353-a97d-a921fd2c8199" +Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" diff --git a/test/test_dgmulti_3d.jl b/test/test_dgmulti_3d.jl index fa70b11447..d0671c0bfd 100644 --- a/test/test_dgmulti_3d.jl +++ b/test/test_dgmulti_3d.jl @@ -98,13 +98,18 @@ end @trixi_testset "elixir_euler_curved.jl (Hex elements, SBP, flux differencing)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_curved.jl"), l2=[ - 0.01835488304593566, 0.024412704052042534, - 0.02440852041608929, 0.018163145708800853, - 0.03934280550797125, + 0.0019393929700612259, + 0.003213659298633126, + 0.003203104361527826, + 0.0019407707245105426, + 0.0109274471764788, ], linf=[ - 0.14862225990793032, 0.2895236816183626, 0.291205448481636, - 0.14566031338563246, 0.33153545867790246, + 0.01914151956454324, + 0.0270195960766606, + 0.026891238631389536, + 0.019817504336972602, + 0.09645660501766873, ]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities)