Merge branch 'surface_pressure_forces' of https://github.com/Arpit-Ba…

…bbar/Trixi.jl into ArpitBabbarForces

.github/workflows/Downgrade.yml

@@ -0,0 +1,86 @@
+name: Downgrade
+
+on:
+  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:
+  downgrade_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: Downgrade ${{ matrix.trixi_test }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1.9'
+          # - '~1.9.0-0' # including development versions
+          # - 'nightly'
+        os:
+          - ubuntu-latest
+        arch:
+          - x64
+        trixi_test:
+          # - tree_part1
+          # - tree_part2
+          # - tree_part3
+          # - tree_part4
+          # - tree_part5
+          # - tree_part6
+          # - structured
+          # - p4est_part1
+          # - p4est_part2
+          # - t8code_part1
+          # - unstructured_dgmulti
+          # - parabolic
+          # - paper_self_gravitating_gas_dynamics
+          # - misc_part1
+          # - misc_part2
+          # - performance_specializations_part1
+          # - performance_specializations_part2
+          # - mpi
+          - threaded
+    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-downgrade-compat@v1
+        with:
+          skip: LinearAlgebra,Printf,SparseArrays,UUIDs,DiffEqBase
+          projects: ., test
+      - uses: julia-actions/julia-buildpkg@v1
+        env:
+          PYTHON: ""
+      - name: Run tests without coverage
+        uses: julia-actions/julia-runtest@v1
+        with:
+          coverage: false
+        env:
+          PYTHON: ""
+          TRIXI_TEST: ${{ matrix.trixi_test }}

.github/workflows/SpellCheck.yml

@@ -10,4 +10,4 @@ jobs:
       - name: Checkout Actions Repository
         uses: actions/checkout@v4
       - name: Check spelling
-        uses: crate-ci/[email protected].0
+        uses: crate-ci/[email protected].2

NEWS.md

@@ -4,14 +4,39 @@ Trixi.jl follows the interpretation of [semantic versioning (semver)](https://ju
 used in the Julia ecosystem. Notable changes will be documented in this file
 for human readability.
 
+## Changes in the v0.7 lifecycle
+
+#### Added
+- Implementation of `TimeSeriesCallback` for curvilinear meshes on `UnstructuredMesh2D`.
+
+
+## Changes when updating to v0.7 from v0.6.x
+
+#### Added
+
+#### Changed
+
+- The default wave speed estimate used within `flux_hll` is now `min_max_speed_davis`
+  instead of `min_max_speed_naive`.
+
+#### Deprecated
+
+#### Removed
+- Some specialized shallow water specific features are no longer available directly in
+  Trixi.jl, but are moved to a dedicated repository: [TrixiShallowWater.jl](https://github.com/trixi-framework/TrixiShallowWater.jl). This includes all features related to wetting and drying, as well as the `ShallowWaterTwoLayerEquations1D` and `ShallowWaterTwoLayerEquations2D`.
+  However, the basic shallow water equations are still part of Trixi.jl. We'll also be updating the TrixiShallowWater.jl documentation with instructions on how to use these relocated features in the future.
+
+
 ## Changes in the v0.6 lifecycle
 
 #### Added
 - AMR for hyperbolic-parabolic equations on 3D `P4estMesh`
 - `flux_hllc` on non-cartesian meshes for `CompressibleEulerEquations{2,3}D`
-- Different boundary conditions for quad/hex meshes in Abaqus format, even if not generated by HOHQMesh, 
+- Different boundary conditions for quad/hex meshes in Abaqus format, even if not generated by HOHQMesh,
   can now be digested by Trixi in 2D and 3D.
 - Subcell (positivity) limiting support for nonlinear variables in 2D for `TreeMesh`
+- Added Lighthill-Whitham-Richards (LWR) traffic model
+
 
 ## Changes when updating to v0.6 from v0.5.x
 
@@ -21,7 +46,7 @@ for human readability.
 #### Changed
 
 - The wave speed estimates for `flux_hll`, `FluxHLL()` are now consistent across equations.
-  In particular, the functions `min_max_speed_naive`, `min_max_speed_einfeldt` are now 
+  In particular, the functions `min_max_speed_naive`, `min_max_speed_einfeldt` are now
   conceptually identical across equations.
   Users, who have been using `flux_hll` for MHD have now to use `flux_hlle` in order to use the
   Einfeldt wave speed estimate.

Project.toml

@@ -1,7 +1,7 @@
 name = "Trixi"
 uuid = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
 authors = ["Michael Schlottke-Lakemper <[email protected]>", "Gregor Gassner <[email protected]>", "Hendrik Ranocha <[email protected]>", "Andrew R. Winters <[email protected]>", "Jesse Chan <[email protected]>"]
-version = "0.6.10-pre"
+version = "0.7.4-pre"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
@@ -25,6 +25,7 @@ OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 P4est = "7d669430-f675-4ae7-b43e-fab78ec5a902"
 Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588"
 PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
+Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -46,6 +47,7 @@ Triangulate = "f7e6ffb2-c36d-4f8f-a77e-16e897189344"
 TriplotBase = "981d1d27-644d-49a2-9326-4793e63143c3"
 TriplotRecipes = "808ab39a-a642-4abf-81ff-4cb34ebbffa3"
 TrixiBase = "9a0f1c46-06d5-4909-a5a3-ce25d3fa3284"
+UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [weakdeps]
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
@@ -62,41 +64,43 @@ DiffEqCallbacks = "2.25"
 Downloads = "1.6"
 EllipsisNotation = "1.0"
 FillArrays = "0.13.2, 1"
-ForwardDiff = "0.10.18"
-HDF5 = "0.14, 0.15, 0.16, 0.17"
+ForwardDiff = "0.10.24"
+HDF5 = "0.16.10, 0.17"
 IfElse = "0.1"
 LinearAlgebra = "1"
 LinearMaps = "2.7, 3.0"
-LoopVectorization = "0.12.118"
+LoopVectorization = "0.12.151"
 MPI = "0.20"
 Makie = "0.19, 0.20"
 MuladdMacro = "0.2.2"
-Octavian = "0.3.5"
-OffsetArrays = "1.3"
+Octavian = "0.3.21"
+OffsetArrays = "1.12"
 P4est = "0.4.9"
 Polyester = "0.7.5"
 PrecompileTools = "1.1"
+Preferences = "1.3"
 Printf = "1"
 RecipesBase = "1.1"
 Reexport = "1.0"
 Requires = "1.1"
 SciMLBase = "1.90, 2"
-Setfield = "0.8, 1"
+Setfield = "1"
 SimpleUnPack = "1.1"
 SparseArrays = "1"
-StartUpDG = "0.17"
-Static = "0.3, 0.4, 0.5, 0.6, 0.7, 0.8"
+StartUpDG = "0.17.7"
+Static = "0.8.7"
 StaticArrayInterface = "1.4"
-StaticArrays = "1"
-StrideArrays = "0.1.18"
-StructArrays = "0.6"
+StaticArrays = "1.5"
+StrideArrays = "0.1.26"
+StructArrays = "0.6.11"
 SummationByPartsOperators = "0.5.41"
 T8code = "0.4.3, 0.5"
 TimerOutputs = "0.5.7"
-Triangulate = "2.0"
+Triangulate = "2.2"
 TriplotBase = "0.1"
 TriplotRecipes = "0.1"
 TrixiBase = "0.1.1"
+UUIDs = "1.6"
 julia = "1.8"
 
 [extras]

README.md

@@ -53,7 +53,7 @@ installation and postprocessing procedures. Its features include:
   * Hyperbolic diffusion equations for elliptic problems
   * Lattice-Boltzmann equations (D2Q9 and D3Q27 schemes)
   * Shallow water equations
-  * Several scalar conservation laws (e.g., linear advection, Burgers' equation)
+  * Several scalar conservation laws (e.g., linear advection, Burgers' equation, LWR traffic flow)
 * Multi-physics simulations
   * [Self-gravitating gas dynamics](https://github.com/trixi-framework/paper-self-gravitating-gas-dynamics)
 * Shared-memory parallelization via multithreading

benchmark/Project.toml

@@ -8,4 +8,4 @@ Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
 BenchmarkTools = "0.5, 0.7, 1.0"
 OrdinaryDiffEq = "5.65, 6"
 PkgBenchmark = "0.2.10"
-Trixi = "0.4, 0.5, 0.6"
+Trixi = "0.4, 0.5, 0.6, 0.7"

benchmark/benchmarks.jl

@@ -2,6 +2,9 @@
 # readability
 #! format: off
 
+using Pkg
+Pkg.activate(@__DIR__)
+
 using BenchmarkTools
 using Trixi
 
@@ -47,13 +50,14 @@ end
 let
   SUITE["latency"] = BenchmarkGroup()
   SUITE["latency"]["default_example"] = @benchmarkable run(
-    `$(Base.julia_cmd()) -e 'using Trixi; trixi_include(default_example())'`) seconds=60
+    `$(Base.julia_cmd()) --project=$(@__DIR__) -e 'using Trixi; trixi_include(default_example())'`) seconds=60
   for polydeg in [3, 7]
     command = "using Trixi; trixi_include(joinpath(examples_dir(), \"tree_2d_dgsem\", \"elixir_advection_extended.jl\"), tspan=(0.0, 1.0e-10), polydeg=$(polydeg), save_restart=TrivialCallback(), save_solution=TrivialCallback())"
-    SUITE["latency"]["polydeg_$polydeg"] = @benchmarkable run($`$(Base.julia_cmd()) -e $command`) seconds=60
+    SUITE["latency"]["polydeg_$polydeg"] = @benchmarkable run(
+      $`$(Base.julia_cmd()) --project=$(@__DIR__) -e $command`) seconds=60
   end
   SUITE["latency"]["euler_2d"] = @benchmarkable run(
-    `$(Base.julia_cmd()) -e 'using Trixi; trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_euler_kelvin_helmholtz_instability.jl"), tspan=(0.0, 1.0e-10), save_restart=TrivialCallback(), save_solution=TrivialCallback())'`) seconds=60
+    `$(Base.julia_cmd()) --project=$(@__DIR__) -e 'using Trixi; trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_euler_kelvin_helmholtz_instability.jl"), tspan=(0.0, 1.0e-10), save_solution=TrivialCallback())'`) seconds=60
   SUITE["latency"]["mhd_2d"] = @benchmarkable run(
-    `$(Base.julia_cmd()) -e 'using Trixi; trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_mhd_blast_wave.jl"), tspan=(0.0, 1.0e-10), save_solution=TrivialCallback())'`) seconds=60
+    `$(Base.julia_cmd()) --project=$(@__DIR__) -e 'using Trixi; trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_mhd_blast_wave.jl"), tspan=(0.0, 1.0e-10), save_solution=TrivialCallback())'`) seconds=60
 end

benchmark/run_benchmarks.jl

@@ -1,3 +1,7 @@
+using Pkg
+Pkg.activate(@__DIR__)
+Pkg.develop(PackageSpec(path = dirname(@__DIR__)))
+Pkg.instantiate()
 
 using PkgBenchmark
 using Trixi