-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature-t8code-3d
- Loading branch information
Showing
598 changed files
with
35,893 additions
and
21,437 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,6 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout Actions Repository | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - name: Check spelling | ||
| uses: crate-ci/[email protected].5 | ||
| uses: crate-ci/[email protected].23 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| # 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: | ||
| - Trixi2Vtk.jl | ||
| - 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| 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.5.40-pre" | ||
| version = "0.6.5-pre" | ||
|
|
||
| [deps] | ||
| CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2" | ||
| ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9" | ||
| DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" | ||
| DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def" | ||
| EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949" | ||
| FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" | ||
|
|
@@ -52,37 +53,41 @@ TrixiMakieExt = "Makie" | |
| [compat] | ||
| CodeTracking = "1.0.5" | ||
| ConstructionBase = "1.3" | ||
| DataStructures = "0.18.15" | ||
| DiffEqCallbacks = "2.25" | ||
| EllipsisNotation = "1.0" | ||
| FillArrays = "0.13.2, 1" | ||
| ForwardDiff = "0.10.18" | ||
| HDF5 = "0.14, 0.15, 0.16" | ||
| 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" | ||
| Makie = "0.19" | ||
| MuladdMacro = "0.2.2" | ||
| Octavian = "0.3.5" | ||
| OffsetArrays = "1.3" | ||
| P4est = "0.4" | ||
| P4est = "0.4.9" | ||
| Polyester = "0.7.5" | ||
| PrecompileTools = "1.1" | ||
| Printf = "1" | ||
| RecipesBase = "1.1" | ||
| Reexport = "1.0" | ||
| Requires = "1.1" | ||
| SciMLBase = "1.90" | ||
| 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" | ||
| StaticArrays = "1" | ||
| StrideArrays = "0.1.18" | ||
| StructArrays = "0.6" | ||
| SummationByPartsOperators = "0.5.41" | ||
| T8code = "0.4.1" | ||
| TimerOutputs = "0.5" | ||
| T8code = "0.4.3, 0.5" | ||
| TimerOutputs = "0.5.7" | ||
| Triangulate = "2.0" | ||
| TriplotBase = "0.1" | ||
| TriplotRecipes = "0.1" | ||
|
|
||
Oops, something went wrong.