Skip to content

Commit a9ecd79

Browse files
jfrasunkjfrasunk
authored
Merge branch 'JuliaGeodynamics:main' into main
2 parents fa53244 + 4c9dd8a commit a9ecd79

File tree

117 files changed

+149692
-69510
lines changed

Some content is hidden

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

117 files changed

+149692
-69510
lines changed

‎.github/workflows/CI.yml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ on:
66
branches:
77
- main
88
tags: '*'
9+
10+
# Cancel redundant CI tests automatically
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
915
jobs:
1016
run_tests:
1117
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -16,16 +22,39 @@ jobs:
1622
version:
1723
- '1.9'
1824
- '1.10'
19-
- 'nightly'
25+
- '1.11'
26+
# - 'pre'
2027
os:
2128
- ubuntu-latest
22-
- macOS-latest
29+
- macos-13
2330
- windows-latest
2431
arch:
2532
- x64
33+
allow_failure: [false]
34+
include:
35+
- os: macOS-latest
36+
arch: aarch64
37+
version: '1.10'
38+
allow_failure: false
39+
- os: macOS-latest
40+
arch: aarch64
41+
version: '1.11'
42+
allow_failure: false
43+
- os: macOS-latest
44+
arch: aarch64
45+
version: 'pre'
46+
allow_failure: true
47+
- os: ubuntu-latest
48+
arch: x86
49+
version: 'pre'
50+
allow_failure: true
51+
- os: windows-latest
52+
arch: x86
53+
version: 'pre'
54+
allow_failure: true
2655
steps:
2756
- uses: actions/checkout@v4
28-
- uses: julia-actions/setup-julia@v1
57+
- uses: julia-actions/setup-julia@v2
2958
with:
3059
version: ${{ matrix.version }}
3160
arch: ${{ matrix.arch }}
@@ -42,7 +71,7 @@ jobs:
4271
- uses: julia-actions/julia-buildpkg@latest
4372
- uses: julia-actions/julia-runtest@latest
4473
- uses: julia-actions/julia-processcoverage@v1
45-
- uses: codecov/codecov-action@v4
74+
- uses: codecov/codecov-action@v5
4675
with:
4776
token: ${{ secrets.CODECOV_TOKEN }}
4877
fail_ci_if_error: false # or true if you want CI to fail when Codecov fails

‎.github/workflows/Documenter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- uses: actions/checkout@v4
33-
- uses: julia-actions/setup-julia@v1
33+
- uses: julia-actions/setup-julia@v2
3434
with:
3535
version: '1.9'
3636
show-versioninfo: true
37-
- uses: julia-actions/cache@v1
37+
- uses: julia-actions/cache@v2
3838
- uses: julia-actions/julia-buildpkg@v1
3939
env:
4040
PYTHON: ""

‎.github/workflows/Format.yml

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
name: 'Format'
2+
3+
on:
4+
pull_request_target:
5+
paths: ['**/*.jl']
6+
types: [opened, synchronize, reopened, ready_for_review]
7+
8+
permissions:
9+
contents: read
10+
actions: write
11+
pull-requests: write
12+
13+
jobs:
14+
runic:
15+
runs-on: ubuntu-latest
16+
if: github.event.pull_request.draft == false
17+
steps:
18+
- name: Check out repository
19+
uses: actions/checkout@v4
20+
with:
21+
ref: ${{github.event.pull_request.head.ref}}
22+
repository: ${{github.event.pull_request.head.repo.full_name}}
23+
fetch-depth: 0
24+
25+
- name: Add upstream remote
26+
run: |
27+
git remote add upstream https://github.com/${{ github.repository }}
28+
git fetch upstream
29+
30+
- name: Setup Julia
31+
uses: julia-actions/setup-julia@v2
32+
with:
33+
version: '1'
34+
arch: 'x64'
35+
- uses: julia-actions/cache@v2
36+
37+
- name: Install Runic
38+
run: |
39+
julia --project=@runic -e 'using Pkg; Pkg.add("Runic")'
40+
curl -o git-runic https://raw.githubusercontent.com/fredrikekre/Runic.jl/master/bin/git-runic
41+
chmod +x git-runic
42+
sudo mv git-runic /usr/local/bin
43+
44+
- name: Run Runic
45+
id: runic
46+
run: |
47+
set +e
48+
MERGE_BASE=$(git merge-base upstream/${{ github.base_ref }} HEAD) || exit 1
49+
DIFF=$(git runic --diff $MERGE_BASE)
50+
EXIT_CODE=$?
51+
52+
echo "exit_code=$EXIT_CODE" >> $GITHUB_OUTPUT
53+
echo "diff<<EOF" >> $GITHUB_OUTPUT
54+
echo "$DIFF" >> $GITHUB_OUTPUT
55+
echo "EOF" >> $GITHUB_OUTPUT
56+
57+
# if Runic failed, bail out
58+
[ $EXIT_CODE -eq 2 ] && exit 1 || exit 0
59+
60+
- name: Find comment
61+
uses: peter-evans/find-comment@v3
62+
id: find-comment
63+
with:
64+
issue-number: ${{ github.event.pull_request.number }}
65+
comment-author: 'github-actions[bot]'
66+
body-includes: '<!-- runic-format-summary -->'
67+
68+
- name: Comment formatting suggestions
69+
if: steps.runic.outputs.exit_code == 1
70+
uses: peter-evans/create-or-update-comment@v4
71+
with:
72+
comment-id: ${{ steps.find-comment.outputs.comment-id }}
73+
issue-number: ${{ github.event.pull_request.number }}
74+
body: |
75+
<!-- runic-format-summary -->
76+
77+
Your PR requires formatting changes to meet the project's style guidelines.
78+
Please consider running [Runic](https://github.com/fredrikekre/Runic.jl) (`git runic ${{ github.base_ref }}`) to apply these changes.
79+
80+
<details>
81+
<summary>Click here to view the suggested changes.</summary>
82+
83+
```diff
84+
${{ steps.runic.outputs.diff }}
85+
```
86+
87+
</details>
88+
edit-mode: replace
89+
90+
- name: Update stale comment
91+
if: steps.runic.outputs.exit_code == 0 && steps.find-comment.outputs.comment-id
92+
uses: peter-evans/create-or-update-comment@v4
93+
with:
94+
comment-id: ${{ steps.find-comment.outputs.comment-id }}
95+
issue-number: ${{ github.event.pull_request.number }}
96+
body: |
97+
<!-- runic-format-summary -->
98+
99+
Your PR no longer requires formatting changes. Thank you for your contribution!
100+
edit-mode: replace
101+
102+
# XXX: if Github ever supports allow-failure (actions/runner#2347)
103+
#- name: Propagate exit code
104+
# run: |
105+
# exit ${{ steps.runic.outputs.exit_code }}

‎.github/workflows/SpellCheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
- name: Checkout Actions Repository
1111
uses: actions/checkout@v4
1212
- name: Check spelling
13-
uses: crate-ci/typos@v1.18.2
13+
uses: crate-ci/typos@v1.28.1
1414
with:
1515
args: --exclude **/*.txt --exclude **/*.pvsm

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ tutorial/test.tiff
2020
*.vtr
2121
*.vts
2222
*.jld2
23+
*.swm
24+
*.swn
25+
*.swo
2326
*.tiff
2427
*.nc
2528
!/test/test_files/ISCTest.xml

‎.typos.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
MOR = "MOR"
33
dum = "dum"
44
Shepard = "Shepard"
5+
arange = "arange"
6+
iy = "iy"
7+
nin = "nin"
8+
tect = "tect"
59

610
[files]
7-
extend-exclude = ["tutorials/*.pvsm"]
11+
extend-exclude = ["tutorials/*.pvsm","docs/paper/paper.bib"]

‎AUTHORS.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ provided substantial additions or modifications. Together, these two groups form
1414

1515

1616
## Contributors
17-
The following people contributed major additions or modifications to `GeophysicalModelGenerator.jl` and
18-
are listed in alphabetical order:
17+
The following people contributed major additions or modifications to `GeophysicalModelGenerator.jl` and are listed in alphabetical order:
1918

2019
* Pascal Aellig
2120
* Albert De Montserrat

‎CITATION.cff

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
cff-version: "1.2.0"
2+
authors:
3+
- family-names: Kaus
4+
given-names: Boris J. P.
5+
orcid: "https://orcid.org/0000-0002-0247-8660"
6+
- family-names: Thielmann
7+
given-names: Marcel
8+
orcid: "https://orcid.org/0000-0003-1185-3730"
9+
- family-names: Aellig
10+
given-names: Pascal
11+
orcid: "https://orcid.org/0009-0008-9039-5646"
12+
- family-names: Montserrat
13+
given-names: Albert
14+
name-particle: de
15+
orcid: "https://orcid.org/0000-0003-1694-3735"
16+
- family-names: Siena
17+
given-names: Luca
18+
name-particle: de
19+
orcid: "https://orcid.org/0000-0002-3615-5923"
20+
- family-names: Frasukiewicz
21+
given-names: Jacob
22+
orcid: "https://orcid.org/0009-0002-5049-4259"
23+
- family-names: Fuchs
24+
given-names: Lukas
25+
orcid: "https://orcid.org/0000-0002-9165-6384"
26+
- family-names: Piccolo
27+
given-names: Andrea
28+
orcid: "https://orcid.org/0000-0003-3074-6041"
29+
- family-names: Ranocha
30+
given-names: Hendrik
31+
orcid: "https://orcid.org/0000-0002-3456-2277"
32+
- family-names: Riel
33+
given-names: Nicolas
34+
orcid: "https://orcid.org/0000-0002-5037-5519"
35+
- family-names: Schuler
36+
given-names: Christian
37+
orcid: "https://orcid.org/0009-0004-9873-9774"
38+
- family-names: Spang
39+
given-names: Arne
40+
- family-names: Weiler
41+
given-names: Tatjana
42+
doi: 10.5281/zenodo.13993948
43+
message: If you use this software, please cite our article in the
44+
Journal of Open Source Software.
45+
preferred-citation:
46+
authors:
47+
- family-names: Kaus
48+
given-names: Boris J. P.
49+
orcid: "https://orcid.org/0000-0002-0247-8660"
50+
- family-names: Thielmann
51+
given-names: Marcel
52+
orcid: "https://orcid.org/0000-0003-1185-3730"
53+
- family-names: Aellig
54+
given-names: Pascal
55+
orcid: "https://orcid.org/0009-0008-9039-5646"
56+
- family-names: Montserrat
57+
given-names: Albert
58+
name-particle: de
59+
orcid: "https://orcid.org/0000-0003-1694-3735"
60+
- family-names: Siena
61+
given-names: Luca
62+
name-particle: de
63+
orcid: "https://orcid.org/0000-0002-3615-5923"
64+
- family-names: Frasukiewicz
65+
given-names: Jacob
66+
orcid: "https://orcid.org/0009-0002-5049-4259"
67+
- family-names: Fuchs
68+
given-names: Lukas
69+
orcid: "https://orcid.org/0000-0002-9165-6384"
70+
- family-names: Piccolo
71+
given-names: Andrea
72+
orcid: "https://orcid.org/0000-0003-3074-6041"
73+
- family-names: Ranocha
74+
given-names: Hendrik
75+
orcid: "https://orcid.org/0000-0002-3456-2277"
76+
- family-names: Riel
77+
given-names: Nicolas
78+
orcid: "https://orcid.org/0000-0002-5037-5519"
79+
- family-names: Schuler
80+
given-names: Christian
81+
orcid: "https://orcid.org/0009-0004-9873-9774"
82+
- family-names: Spang
83+
given-names: Arne
84+
- family-names: Weiler
85+
given-names: Tatjana
86+
date-published: 2024-11-04
87+
doi: 10.21105/joss.06763
88+
issn: 2475-9066
89+
issue: 103
90+
journal: Journal of Open Source Software
91+
publisher:
92+
name: Open Journals
93+
start: 6763
94+
title: "GeophysicalModelGenerator.jl: A Julia package to visualise
95+
geoscientific data and create numerical model setups"
96+
type: article
97+
url: "https://joss.theoj.org/papers/10.21105/joss.06763"
98+
volume: 9
99+
title: "GeophysicalModelGenerator.jl: A Julia package to visualise
100+
geoscientific data and create numerical model setups"

0 commit comments

Comments
 (0)