Skip to content

Commit 3a7d72d

Browse files
Merge branch 'main' into IMEX
2 parents aa2edf7 + 62ae745 commit 3a7d72d

40 files changed

+204
-97
lines changed

.JuliaFormatter.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ yas_style_nesting = true
66

77
# Align struct fields for better readability of large struct definitions
88
align_struct_field = true
9+
10+
always_use_return = true

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ updates:
55
directory: "/" # Location of package manifests
66
schedule:
77
interval: "monthly"
8+
groups:
9+
# Group all GitHub Actions PRs into a single PR:
10+
all-github-actions:
11+
patterns:
12+
- "*"
13+
ignore:
14+
- dependency-name: "julia-actions/julia-downgrade-compat"
15+
versions: [ ">=2.0.0" ]

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- version: '1.12'
6262
os: ubuntu-latest
6363
steps:
64-
- uses: actions/checkout@v5
64+
- uses: actions/checkout@v6
6565
- uses: julia-actions/setup-julia@v2
6666
with:
6767
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@v5
19+
uses: actions/checkout@v6
2020
with:
2121
ref: gh-pages
2222
- name: Delete preview and history + push changes

.github/workflows/Documenter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
build:
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v5
37+
- uses: actions/checkout@v6
3838
- uses: julia-actions/setup-julia@v2
3939
with:
4040
version: '1.10'

.github/workflows/Downgrade.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
os:
4343
- ubuntu-latest
4444
steps:
45-
- uses: actions/checkout@v5
45+
- uses: actions/checkout@v6
4646
- uses: julia-actions/setup-julia@v2
4747
with:
4848
version: ${{ matrix.version }}

.github/workflows/JET.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
os:
5353
- ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@v5
55+
- uses: actions/checkout@v6
5656
- uses: julia-actions/setup-julia@v2
5757
with:
5858
version: ${{ matrix.version }}

.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@v5
11+
uses: actions/checkout@v6
1212
- name: Check spelling
13-
uses: crate-ci/typos@v1.39.0
13+
uses: crate-ci/typos@v1.40.0

.zenodo.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"upload_type": "software",
66
"creators": [
77
{
8-
"affiliation": "Applied Mathematics, University of Hamburg, Germany",
8+
"affiliation": "Department of Mathematics, University of Hamburg, Germany",
99
"name": "Lampert, Joshua",
1010
"orcid": "0009-0007-0971-6709"
1111
},
1212
{
13-
"affiliation": "Numerical Mathematics, Johannes Gutenberg University Mainz, Germany",
13+
"affiliation": "Insititute of Mathematics, Johannes Gutenberg University Mainz, Germany",
1414
"name": "Wittenstein, Collin",
1515
"orcid": "0009-0006-8591-278X"
1616
},
1717
{
18-
"affiliation": "Numerical Mathematics, Johannes Gutenberg University Mainz, Germany",
18+
"affiliation": "Insititute of Mathematics, Johannes Gutenberg University Mainz, Germany",
1919
"name": "Ranocha, Hendrik",
2020
"orcid": "0000-0002-3456-2277"
2121
}

CITATION.bib

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
@misc{lampert2025dispersive,
1+
@article{lampert2025dispersive,
2+
title={DispersiveShallowWater.jl: A Julia library of structure-preserving numerical methods for dispersive wave equations},
3+
author={Lampert, Joshua and Wittenstein, Collin and Ranocha, Hendrik},
4+
journal={Journal of Open Source Software},
5+
volume={10},
6+
number={116},
7+
pages={9361},
8+
year={2025},
9+
month={12},
10+
publisher={The Open Journal},
11+
doi={10.21105/joss.09361}
12+
}
13+
14+
@misc{lampert2025dispersiveshallowwater,
215
title={{D}ispersive{S}hallow{W}ater.jl: {S}tructure-preserving numerical
316
methods for dispersive shallow water models},
417
author={Lampert, Joshua and Wittenstein, Collin and Ranocha, Hendrik},

0 commit comments

Comments
 (0)