Skip to content

Commit 87f51bf

Browse files
committed
Merge branch 'development' into mlebabeclap-aniso-eb-fluxes
2 parents aab9c30 + 0027973 commit 87f51bf

540 files changed

Lines changed: 23735 additions & 7991 deletions

File tree

Some content is hidden

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

.clang-tidy

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ Checks: >
3939
-modernize-macro-to-enum,
4040
-modernize-return-braced-init-list,
4141
-modernize-use-constraints,
42-
-modernize-use-designated-initializers,
43-
-modernize-use-integer-sign-comparison,
4442
-modernize-use-ranges,
45-
-modernize-use-starts-ends-with,
46-
-modernize-use-std-numbers,
4743
-modernize-use-trailing-return-type,
4844
performance-*,
4945
-performance-enum-size,
@@ -53,7 +49,6 @@ Checks: >
5349
readability-*,
5450
-readability-avoid-nested-conditional-operator,
5551
-readability-avoid-unconditional-preprocessor-if,
56-
-readability-container-contains,
5752
-readability-else-after-return,
5853
-readability-function-cognitive-complexity,
5954
-readability-function-size,
@@ -63,6 +58,7 @@ Checks: >
6358
-readability-magic-numbers,
6459
-readability-math-missing-parentheses,
6560
-readability-named-parameter,
61+
-readability-qualified-auto,
6662
-readability-redundant-casting,
6763
-readability-redundant-member-init,
6864
-readability-static-accessed-through-instance,
@@ -78,11 +74,10 @@ HeaderFilterRegex: '([^n].....|[^o]....|[^l]...|[^i]..|[^n].|[^t])\.H$'
7874
# Only available in clang-tidy >= 17
7975
HeaderFileExtensions: ['', "H", 'h', 'hh', 'hpp', 'hxx']
8076

81-
# We will try to modernize this after switching to C++20
82-
# -modernize-use-constraints
83-
# -modernize-use-designated-initializers
84-
# -modernize-use-std-numbers
85-
# -modernize-use-ranges
86-
# -modernize-use-integer-sign-comparison
87-
# -modernize-use-starts-ends-with
88-
# -readability-container-contains
77+
# modernize-use-constraints is not a required check:
78+
# C++20 concepts/constraints have too many compiler-specific issues
79+
# (MSVC, NVHPC, CUDA-on-Windows, etc.) to be used in AMReX.
80+
81+
# modernize-use-ranges is not a required check:
82+
# (1) Clang <= 15 has bugs with std::ranges.
83+
# (2) std::ranges::sort requires std::sortable, which is stricter than operator<.

.github/workflows/apps.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ jobs:
2020
needs: check_changes
2121
if: needs.check_changes.outputs.has_non_docs_changes == 'true'
2222
steps:
23-
- uses: actions/checkout@v6
23+
- uses: actions/checkout@v7
2424
- name: Get Latest Release Tag
2525
run: |
2626
CASTRO_TAG=$(wget https://github.com/AMReX-Astro/Castro/releases/latest 2>&1 | grep Location: | awk '{print $2}' | awk -F/ '{print $NF}')
2727
echo "CASTRO_TAG=$CASTRO_TAG" >> $GITHUB_ENV
2828
MICROPHYSICS_TAG=$(wget https://github.com/AMReX-Astro/Microphysics/releases/latest 2>&1 | grep Location: | awk '{print $2}' | awk -F/ '{print $NF}')
2929
echo "MICROPHYSICS_TAG=$MICROPHYSICS_TAG" >> $GITHUB_ENV
3030
- name: Download Castro
31-
uses: actions/checkout@v6
31+
uses: actions/checkout@v7
3232
with:
3333
repository: 'AMReX-Astro/Castro'
3434
ref: ${{env.CASTRO_TAG}}
3535
path: 'Castro'
3636
- name: Download Microphysics
37-
uses: actions/checkout@v6
37+
uses: actions/checkout@v7
3838
with:
3939
repository: 'AMReX-Astro/Microphysics'
4040
ref: ${{env.MICROPHYSICS_TAG}}
@@ -44,7 +44,7 @@ jobs:
4444
.github/workflows/dependencies/dependencies.sh
4545
.github/workflows/dependencies/dependencies_ccache.sh
4646
- name: Set Up Cache
47-
uses: actions/cache@v5
47+
uses: actions/cache@v6
4848
with:
4949
path: ~/.cache/ccache
5050
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -75,9 +75,9 @@ jobs:
7575
needs: check_changes
7676
if: needs.check_changes.outputs.has_non_docs_changes == 'true'
7777
steps:
78-
- uses: actions/checkout@v6
78+
- uses: actions/checkout@v7
7979
- name: Download WarpX
80-
uses: actions/checkout@v6
80+
uses: actions/checkout@v7
8181
with:
8282
repository: 'BLAST-WarpX/warpx'
8383
ref: development
@@ -87,7 +87,7 @@ jobs:
8787
.github/workflows/dependencies/dependencies.sh
8888
.github/workflows/dependencies/dependencies_ccache.sh
8989
- name: Set Up Cache
90-
uses: actions/cache@v5
90+
uses: actions/cache@v6
9191
with:
9292
path: ~/.cache/ccache
9393
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -120,9 +120,9 @@ jobs:
120120
needs: check_changes
121121
if: needs.check_changes.outputs.has_non_docs_changes == 'true'
122122
steps:
123-
- uses: actions/checkout@v6
123+
- uses: actions/checkout@v7
124124
- name: Checkout pyamrex
125-
uses: actions/checkout@v6
125+
uses: actions/checkout@v7
126126
with:
127127
repository: 'AMReX-Codes/pyamrex'
128128
ref: 'development'
@@ -132,7 +132,7 @@ jobs:
132132
.github/workflows/dependencies/dependencies.sh
133133
.github/workflows/dependencies/dependencies_ccache.sh
134134
- name: Set Up Cache
135-
uses: actions/cache@v5
135+
uses: actions/cache@v6
136136
with:
137137
path: ~/.cache/ccache
138138
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}

.github/workflows/ascent.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
container:
2323
image: alpinedav/ascent:0.9.3
2424
steps:
25-
- uses: actions/checkout@v6
25+
- uses: actions/checkout@v7
2626
- name: Configure
2727
run: |
2828
. /ascent_docker_setup_env.sh

.github/workflows/bittree.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ jobs:
2020
needs: check_changes
2121
if: needs.check_changes.outputs.has_non_docs_changes == 'true'
2222
steps:
23-
- uses: actions/checkout@v6
23+
- uses: actions/checkout@v7
2424
- name: Dependencies
2525
run: |
2626
.github/workflows/dependencies/dependencies.sh
2727
.github/workflows/dependencies/dependencies_clang-tidy-apt-llvm.sh 21
2828
.github/workflows/dependencies/dependencies_ccache.sh
2929
- name: Set Up Cache
30-
uses: actions/cache@v5
30+
uses: actions/cache@v6
3131
with:
3232
path: ~/.cache/ccache
3333
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
3434
restore-keys: |
3535
ccache-${{ github.workflow }}-${{ github.job }}-git-
3636
- name: Check out Bittree
37-
uses: actions/checkout@v6
37+
uses: actions/checkout@v7
3838
with:
3939
repository: Flash-X/Bittree
4040
path: bittree
@@ -74,21 +74,21 @@ jobs:
7474
needs: check_changes
7575
if: needs.check_changes.outputs.has_non_docs_changes == 'true'
7676
steps:
77-
- uses: actions/checkout@v6
77+
- uses: actions/checkout@v7
7878
- name: Dependencies
7979
run: |
8080
.github/workflows/dependencies/dependencies.sh
8181
.github/workflows/dependencies/dependencies_clang-tidy-apt-llvm.sh 21
8282
.github/workflows/dependencies/dependencies_ccache.sh
8383
- name: Set Up Cache
84-
uses: actions/cache@v5
84+
uses: actions/cache@v6
8585
with:
8686
path: ~/.cache/ccache
8787
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
8888
restore-keys: |
8989
ccache-${{ github.workflow }}-${{ github.job }}-git-
9090
- name: Check out Bittree
91-
uses: actions/checkout@v6
91+
uses: actions/checkout@v7
9292
with:
9393
repository: Flash-X/Bittree
9494
path: bittree

.github/workflows/catalyst.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
container:
2727
image: kitware/paraview:ci-catalyst-amrex-warpx-20240701
2828
steps:
29-
- uses: actions/checkout@v6
29+
- uses: actions/checkout@v7
3030
- name: Configure
3131
run: |
3232
cmake -S . -B build \

.github/workflows/changelog-guard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
duplicate-changes-headings:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v6
14+
- uses: actions/checkout@v7
1515
- name: Check for duplicate CHANGES headings
1616
run: python3 .github/workflows/scripts/check_changelog_headings.py CHANGES.md

.github/workflows/check_changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
outputs:
1313
has_non_docs_changes: ${{ steps.set-output.outputs.has_non_docs_changes }}
1414
steps:
15-
- uses: actions/checkout@v6
15+
- uses: actions/checkout@v7
1616
- uses: dorny/paths-filter@v4
1717
id: changes
1818
with:

.github/workflows/clang.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
needs: check_changes
2323
if: needs.check_changes.outputs.has_non_docs_changes == 'true'
2424
steps:
25-
- uses: actions/checkout@v6
25+
- uses: actions/checkout@v7
2626
- name: Dependencies
2727
run: |
2828
.github/workflows/dependencies/dependencies_clang.sh 18
2929
.github/workflows/dependencies/dependencies_clang-tidy-apt-llvm.sh 21
3030
.github/workflows/dependencies/dependencies_ccache.sh
3131
- name: Set Up Cache
32-
uses: actions/cache@v5
32+
uses: actions/cache@v6
3333
with:
3434
path: ~/.cache/ccache
3535
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -55,6 +55,7 @@ jobs:
5555
-DAMReX_FFT=ON \
5656
-DAMReX_EB=ON \
5757
-DAMReX_FORTRAN=ON \
58+
-DAMReX_FORTRAN_INTERFACES=ON \
5859
-DAMReX_MPI=OFF \
5960
-DAMReX_PLOTFILE_TOOLS=ON \
6061
-DAMReX_PRECISION=SINGLE \
@@ -86,14 +87,14 @@ jobs:
8687
needs: check_changes
8788
if: needs.check_changes.outputs.has_non_docs_changes == 'true'
8889
steps:
89-
- uses: actions/checkout@v6
90+
- uses: actions/checkout@v7
9091
- name: Dependencies
9192
run: |
9293
.github/workflows/dependencies/dependencies_clang.sh 14
9394
.github/workflows/dependencies/dependencies_clang-tidy-apt-llvm.sh 21
9495
.github/workflows/dependencies/dependencies_ccache.sh
9596
- name: Set Up Cache
96-
uses: actions/cache@v5
97+
uses: actions/cache@v6
9798
with:
9899
path: ~/.cache/ccache
99100
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -120,6 +121,7 @@ jobs:
120121
-DAMReX_EB=ON \
121122
-DAMReX_ENABLE_TESTS=ON \
122123
-DAMReX_FORTRAN=ON \
124+
-DAMReX_FORTRAN_INTERFACES=ON \
123125
-DAMReX_MPI=OFF \
124126
-DAMReX_PRECISION=DOUBLE \
125127
-DAMReX_PARTICLES_PRECISION=SINGLE \
@@ -145,14 +147,14 @@ jobs:
145147
needs: check_changes
146148
if: needs.check_changes.outputs.has_non_docs_changes == 'true'
147149
steps:
148-
- uses: actions/checkout@v6
150+
- uses: actions/checkout@v7
149151
- name: Dependencies
150152
run: |
151153
.github/workflows/dependencies/dependencies.sh
152154
.github/workflows/dependencies/dependencies_clang.sh 15
153155
.github/workflows/dependencies/dependencies_ccache.sh
154156
- name: Set Up Cache
155-
uses: actions/cache@v5
157+
uses: actions/cache@v6
156158
with:
157159
path: ~/.cache/ccache
158160
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -196,14 +198,14 @@ jobs:
196198
needs: check_changes
197199
if: needs.check_changes.outputs.has_non_docs_changes == 'true'
198200
steps:
199-
- uses: actions/checkout@v6
201+
- uses: actions/checkout@v7
200202
- name: Dependencies
201203
run: |
202204
.github/workflows/dependencies/dependencies_clang.sh 14
203205
.github/workflows/dependencies/dependencies_clang-tidy-apt-llvm.sh 21
204206
.github/workflows/dependencies/dependencies_ccache.sh
205207
- name: Set Up Cache
206-
uses: actions/cache@v5
208+
uses: actions/cache@v6
207209
with:
208210
path: ~/.cache/ccache
209211
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}

.github/workflows/cleanup-cache-postpr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
env:
1717
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
steps:
19-
- uses: actions/checkout@v6
19+
- uses: actions/checkout@v7
2020
- name: Clean up ccache
2121
run: |
2222
gh extension install actions/gh-actions-cache

.github/workflows/cleanup-cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
env:
1717
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
steps:
19-
- uses: actions/checkout@v6
19+
- uses: actions/checkout@v7
2020
- name: Clean up ccache
2121
run: |
2222
gh extension install actions/gh-actions-cache

0 commit comments

Comments
 (0)