From f3a3c56a7a05a841251ec00f1ee2c21821e27bc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:29:31 -0500 Subject: [PATCH 1/2] Bump crate-ci/typos from 1.28.1 to 1.29.0 (#60) Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.28.1 to 1.29.0. - [Release notes](https://github.com/crate-ci/typos/releases) - [Changelog](https://github.com/crate-ci/typos/blob/master/CHANGELOG.md) - [Commits](https://github.com/crate-ci/typos/compare/v1.28.1...v1.29.0) --- updated-dependencies: - dependency-name: crate-ci/typos dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/SpellCheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SpellCheck.yml b/.github/workflows/SpellCheck.yml index 3d557915..731d9395 100644 --- a/.github/workflows/SpellCheck.yml +++ b/.github/workflows/SpellCheck.yml @@ -10,4 +10,4 @@ jobs: - name: Checkout Actions Repository uses: actions/checkout@v4 - name: Check spelling - uses: crate-ci/typos@v1.28.1 + uses: crate-ci/typos@v1.29.0 From e7c1de737555212c3d70ab0bd0257506bad10e36 Mon Sep 17 00:00:00 2001 From: Tristan Montoya Date: Fri, 3 Jan 2025 17:51:16 -0500 Subject: [PATCH 2/2] Compatibility with Trixi.jl v0.9.9+ (Remove unused `surface_integral` from calls to `prolong2mortars!`) (#59) * no longer pass surface_integral into prolong2mortars * bump compat for Trixi from 0.9 to 0.9.9 * fix spelling --- Project.toml | 2 +- src/meshes/p4est_icosahedron_quads.jl | 2 +- src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index 7acc0d09..c99dfe24 100644 --- a/Project.toml +++ b/Project.toml @@ -29,5 +29,5 @@ Static = "0.8, 1" StaticArrayInterface = "1.5.1" StaticArrays = "1" StrideArrays = "0.1.28" -Trixi = "0.9" +Trixi = "0.9.9" julia = "1.9" diff --git a/src/meshes/p4est_icosahedron_quads.jl b/src/meshes/p4est_icosahedron_quads.jl index ed6e6f20..8cb96118 100644 --- a/src/meshes/p4est_icosahedron_quads.jl +++ b/src/meshes/p4est_icosahedron_quads.jl @@ -112,7 +112,7 @@ end # / -------->ξ | └------->ξ \ # /__________________|___________________\ # -# Each of those quadrilaterlas is subdivided into trees_per_face_dimension^2 trees. +# Each of those quadrilaterals is subdivided into trees_per_face_dimension^2 trees. # # We use the following numbering for the 12 vertices of the icosahedron # Fig 3: diff --git a/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl b/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl index 7c1a81e0..1b494eff 100644 --- a/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl +++ b/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl @@ -46,8 +46,7 @@ function Trixi.rhs!(du, u, t, # Prolong solution to mortars Trixi.@trixi_timeit Trixi.timer() "prolong2mortars" begin - Trixi.prolong2mortars!(cache, u, mesh, equations, - dg.mortar, dg.surface_integral, dg) + Trixi.prolong2mortars!(cache, u, mesh, equations, dg.mortar, dg) end # Calculate mortar fluxes