Merge branch 'main' into subcell-limiting-minmax

.github/workflows/downstream.yml

@@ -0,0 +1,93 @@
+# Note: this file is inspired by the downstream testing facilities in the SciML ecosystem
+# x-ref: https://github.com/SciML/SciMLBase.jl/blob/ffe68aebedee5915190623cb08160d7ef1fbcce0/.github/workflows/Downstream.yml
+
+name: Downstream
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'AUTHORS.md'
+      - 'CITATION.bib'
+      - 'CONTRIBUTING.md'
+      - 'LICENSE.md'
+      - 'NEWS.md'
+      - 'README.md'
+      - '.zenodo.json'
+      - '.github/workflows/benchmark.yml'
+      - '.github/workflows/CompatHelper.yml'
+      - '.github/workflows/TagBot.yml'
+      - 'benchmark/**'
+      # - 'docs/**'
+      - 'utils/**'
+  pull_request:
+    paths-ignore:
+      - 'AUTHORS.md'
+      - 'CITATION.bib'
+      - 'CONTRIBUTING.md'
+      - 'LICENSE.md'
+      - 'NEWS.md'
+      - 'README.md'
+      - '.zenodo.json'
+      - '.github/workflows/benchmark.yml'
+      - '.github/workflows/CompatHelper.yml'
+      - '.github/workflows/TagBot.yml'
+      - 'benchmark/**'
+      # - 'docs/**'
+      - 'utils/**'
+  workflow_dispatch:
+
+# Cancel redundant CI tests automatically
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    if: "!contains(github.event.head_commit.message, 'skip ci')"
+    # We could also include the Julia version as in
+    # name: ${{ matrix.trixi_test }} - ${{ matrix.os }} - Julia ${{ matrix.version }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    # to be more specific. However, that requires us updating the required CI tests whenever we update Julia.
+    name: ${{ matrix.package }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1.9'
+        os:
+          - ubuntu-latest
+        arch:
+          - x64
+        package:
+          - TrixiShallowWater.jl
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - run: julia -e 'using InteractiveUtils; versioninfo(verbose=true)'
+      - uses: julia-actions/cache@v1
+      - uses: julia-actions/julia-buildpkg@v1
+      - name: Retrieve downstream package
+        # Note: we retrieve the current `main` branch of the downstream package to ensure
+        # that compatibility errors we make in Trixi.jl are detected already here
+        # See also https://github.com/trixi-framework/Trixi.jl/pull/1707#discussion_r1382938895
+        uses: actions/checkout@v4
+        with:
+          repository: trixi-framework/${{ matrix.package }}
+          path: downstream
+      - name: Load upstream package into downstream environment
+        shell: julia --color=yes --project=downstream {0}
+        run: |
+          using Pkg
+          Pkg.develop(PackageSpec(path="."))
+          Pkg.update()
+      - name: Run downstream tests (without coverage)
+        shell: julia --color=yes --project=downstream {0}
+        run: |
+          using Pkg
+          Pkg.test(coverage=false)
+        env:
+          TRIXI_TEST: upstream

NEWS.md

@@ -13,6 +13,7 @@ for human readability.
 - Capability to set truly discontinuous initial conditions in 1D.
 - Wetting and drying feature and examples for 1D and 2D shallow water equations
 - Implementation of the polytropic Euler equations in 2D
+- Implementation of the quasi-1D shallow water equations
 - Subcell (positivity and local min/max) limiting support for conservative variables
   in 2D for `TreeMesh`
 - AMR for hyperbolic-parabolic equations on 2D/3D `TreeMesh`

Project.toml

@@ -58,6 +58,7 @@ FillArrays = "0.13.2, 1"
 ForwardDiff = "0.10.18"
 HDF5 = "0.14, 0.15, 0.16, 0.17"
 IfElse = "0.1"
+LinearAlgebra = "1"
 LinearMaps = "2.7, 3.0"
 LoopVectorization = "0.12.118"
 MPI = "0.20"
@@ -68,12 +69,14 @@ OffsetArrays = "1.3"
 P4est = "0.4"
 Polyester = "0.7.5"
 PrecompileTools = "1.1"
+Printf = "1"
 RecipesBase = "1.1"
 Reexport = "1.0"
 Requires = "1.1"
 SciMLBase = "1.90, 2"
 Setfield = "0.8, 1"
 SimpleUnPack = "1.1"
+SparseArrays = "1"
 StartUpDG = "0.17"
 Static = "0.3, 0.4, 0.5, 0.6, 0.7, 0.8"
 StaticArrayInterface = "1.4"

docs/Project.toml

@@ -21,4 +21,5 @@ Literate = "2.9"
 Measurements = "2.5"
 OrdinaryDiffEq = "6.49.1"
 Plots = "1.9"
+Test = "1"
 Trixi2Vtk = "0.3"

test/Project.toml

@@ -17,11 +17,16 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Aqua = "0.7"
 BSON = "0.3.3"
 CairoMakie = "0.6, 0.7, 0.8, 0.9, 0.10"
+Downloads = "1"
 Flux = "0.13.15, 0.14"
 ForwardDiff = "0.10"
+LinearAlgebra = "1"
 MPI = "0.20"
 OrdinaryDiffEq = "6.49.1"
 Plots = "1.16"
+Printf = "1"
+Random = "1"
+Test = "1"
 
 [preferences.OrdinaryDiffEq]
 PrecompileAutoSpecialize = false