Skip to content

Commit 15a3707

Browse files
JoshuaLampertJoshuaLampert
authored
Merge branch 'main' into IMEX
2 parents b61e48d + 950da0d commit 15a3707

File tree

81 files changed

+4798
-1022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+4798
-1022
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
- '.github/workflows/Format-check.yml'
1616
- '.github/workflows/TagBot.yml'
1717
- '.github/workflows/SpellCheck.yml'
18+
- '.github/workflows/JET.yml'
1819
- 'benchmark/**'
1920
- 'docs/**'
2021
pull_request:
@@ -29,6 +30,7 @@ on:
2930
- '.github/workflows/Format-check.yml'
3031
- '.github/workflows/TagBot.yml'
3132
- '.github/workflows/SpellCheck.yml'
33+
- '.github/workflows/JET.yml'
3234
- 'benchmark/**'
3335
- 'docs/**'
3436
workflow_dispatch:
@@ -56,8 +58,10 @@ jobs:
5658
include:
5759
- version: '1.11'
5860
os: ubuntu-latest
61+
- version: '1.12'
62+
os: ubuntu-latest
5963
steps:
60-
- uses: actions/checkout@v4
64+
- uses: actions/checkout@v5
6165
- uses: julia-actions/setup-julia@v2
6266
with:
6367
version: ${{ matrix.version }}

‎.github/workflows/DocPreviewCleanup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
contents: write
1717
steps:
1818
- name: Checkout gh-pages branch
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
ref: gh-pages
2222
- name: Delete preview and history + push changes

‎.github/workflows/Documenter.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- '.github/workflows/CI.yml'
1212
- '.github/workflows/CompatHelper.yml'
1313
- '.github/workflows/TagBot.yml'
14+
- '.github/workflows/JET.yml'
1415
- 'benchmark/**'
1516
pull_request:
1617
paths-ignore:
@@ -19,6 +20,7 @@ on:
1920
- '.github/workflows/CI.yml'
2021
- '.github/workflows/CompatHelper.yml'
2122
- '.github/workflows/TagBot.yml'
23+
- '.github/workflows/JET.yml'
2224
- 'benchmark/**'
2325
workflow_dispatch:
2426

@@ -32,7 +34,7 @@ jobs:
3234
build:
3335
runs-on: ubuntu-latest
3436
steps:
35-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3638
- uses: julia-actions/setup-julia@v2
3739
with:
3840
version: '1.10'

‎.github/workflows/Downgrade.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- '.github/workflows/Format-check.yml'
1515
- '.github/workflows/TagBot.yml'
1616
- '.github/workflows/SpellCheck.yml'
17+
- '.github/workflows/JET.yml'
1718
- 'benchmark/**'
1819
- 'docs/**'
1920
workflow_dispatch:
@@ -41,15 +42,15 @@ jobs:
4142
os:
4243
- ubuntu-latest
4344
steps:
44-
- uses: actions/checkout@v4
45+
- uses: actions/checkout@v5
4546
- uses: julia-actions/setup-julia@v2
4647
with:
4748
version: ${{ matrix.version }}
4849
- run: julia -e 'using InteractiveUtils; versioninfo(verbose=true)'
4950
- uses: julia-actions/cache@v2
5051
- uses: julia-actions/julia-downgrade-compat@v1
5152
with:
52-
skip: LinearAlgebra,Printf,SparseArrays,Test
53+
skip: LinearAlgebra,Printf,SparseArrays,DelimitedFiles,Test
5354
projects: ., test
5455
- uses: julia-actions/julia-buildpkg@v1
5556
env:

‎.github/workflows/JET.yml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: JET
2+
on:
3+
push:
4+
branches:
5+
- main
6+
tags: ['*']
7+
paths-ignore:
8+
- 'CITATION.bib'
9+
- 'LICENSE.md'
10+
- 'README.md'
11+
- '.zenodo.json'
12+
- '.github/workflows/benchmark.yml'
13+
- '.github/workflows/CompatHelper.yml'
14+
- '.github/workflows/Documenter.yml'
15+
- '.github/workflows/Format-check.yml'
16+
- '.github/workflows/TagBot.yml'
17+
- '.github/workflows/SpellCheck.yml'
18+
- 'benchmark/**'
19+
- 'docs/**'
20+
pull_request:
21+
paths-ignore:
22+
- 'CITATION.bib'
23+
- 'LICENSE.md'
24+
- 'README.md'
25+
- '.zenodo.json'
26+
- '.github/workflows/benchmark.yml'
27+
- '.github/workflows/CompatHelper.yml'
28+
- '.github/workflows/Documenter.yml'
29+
- '.github/workflows/Format-check.yml'
30+
- '.github/workflows/TagBot.yml'
31+
- '.github/workflows/SpellCheck.yml'
32+
- 'benchmark/**'
33+
- 'docs/**'
34+
workflow_dispatch:
35+
36+
concurrency:
37+
# Skip intermediate builds: always.
38+
# Cancel intermediate builds: only if it is a pull request build.
39+
group: ${{ github.workflow }}-${{ github.ref }}
40+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
41+
42+
jobs:
43+
test:
44+
if: "!contains(github.event.head_commit.message, 'skip ci')"
45+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }}
46+
runs-on: ${{ matrix.os }}
47+
strategy:
48+
fail-fast: false
49+
matrix:
50+
version:
51+
- '1.12'
52+
os:
53+
- ubuntu-latest
54+
steps:
55+
- uses: actions/checkout@v5
56+
- uses: julia-actions/setup-julia@v2
57+
with:
58+
version: ${{ matrix.version }}
59+
- run: julia -e 'using InteractiveUtils; versioninfo(verbose=true)'
60+
- uses: julia-actions/cache@v2
61+
- name: Install and run JET.jl
62+
shell: julia --project="." --color=yes {0}
63+
run: |
64+
using Pkg
65+
Pkg.add("JET")
66+
# We need to add Plots.jl to make the definition of `is_attr_supported` available
67+
# Otherwise, JET.jl fails since it is not defined for the keyword arguments in the plot recipes.
68+
Pkg.add("Plots")
69+
Pkg.instantiate()
70+
using JET
71+
import Plots
72+
using DispersiveShallowWater
73+
74+
test_package(DispersiveShallowWater;
75+
target_modules = (DispersiveShallowWater,))

‎.github/workflows/SpellCheck.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout Actions Repository
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v5
1212
- name: Check spelling
13-
uses: crate-ci/typos@v1.32.0
13+
uses: crate-ci/typos@v1.39.0

‎.github/workflows/benchmark.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@ name: Benchmark this PR
22
on:
33
pull_request_target:
44
branches: [ main ] # change to your default branch
5+
paths-ignore:
6+
- 'CITATION.bib'
7+
- 'LICENSE.md'
8+
- 'README.md'
9+
- '.zenodo.json'
10+
- '.github/workflows/CompatHelper.yml'
11+
- '.github/workflows/Documenter.yml'
12+
- '.github/workflows/Format-check.yml'
13+
- '.github/workflows/TagBot.yml'
14+
- '.github/workflows/SpellCheck.yml'
15+
- '.github/workflows/JET.yml'
16+
- 'docs/**'
517
permissions:
618
pull-requests: write # action needs to post a comment
719

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*.jl.*.cov
44
*.jl.cov
55
*.jl.mem
6-
**/Manifest.toml
6+
**/Manifest*.toml
77
out*/
88
/docs/build/
99
docs/src/changelog.md

‎.typos.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[default.extend-words]
22
ater = "ater" # Needed for {D}ispersive{S}hallow{W}ater.jl
3+
tructure = "tructure" # Needed for {S}tructure-preserving

‎.zenodo.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
{
2-
"description": "Structure-Preserving Numerical Methods for Dispersive Shallow Water Models",
2+
"description": "A Julia library of structure-preserving numerical methods for dispersive wave equations",
33
"license": "MIT",
4-
"title": "DispersiveShallowWater.jl",
4+
"title": "DispersiveShallowWater.jl: A Julia library of structure-preserving numerical methods for dispersive wave equations",
55
"upload_type": "software",
66
"creators": [
77
{
88
"affiliation": "Applied Mathematics, University of Hamburg, Germany",
99
"name": "Lampert, Joshua",
1010
"orcid": "0009-0007-0971-6709"
1111
},
12+
{
13+
"affiliation": "Numerical Mathematics, Johannes Gutenberg University Mainz, Germany",
14+
"name": "Wittenstein, Collin",
15+
"orcid": "0009-0006-8591-278X"
16+
},
1217
{
1318
"affiliation": "Numerical Mathematics, Johannes Gutenberg University Mainz, Germany",
1419
"name": "Ranocha, Hendrik",

0 commit comments

Comments
 (0)