Skip to content

Commit bfac7cf

Browse files
authored
Merge branch 'develop' into patch-1
2 parents eca634b + 20cc4ce commit bfac7cf

734 files changed

Lines changed: 68820 additions & 207500 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-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ BasedOnStyle: Google
22
PointerAlignment: Left
33
DerivePointerAlignment: false
44
ColumnLimit: 120
5+
SortIncludes: Never

.clang-tidy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Checks: '-*,modernize-avoid-bind,modernize-deprecated-headers,modernize-deprecated-ios-base-aliases,modernize-macro-to-enum,modernize-pass-by-value,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-replace-auto-ptr,modernize-replace-disallow-copy-and-assign-macro,modernize-replace-random-shuffle,modernize-return-braced-init-list,modernize-shrink-to-fit,modernize-unary-static-assert,modernize-use-auto,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-emplace,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-override,modernize-use-transparent-functors,modernize-use-using,readability-const-return-type,readability-avoid-const-params-in-decls,readability-container-data-pointer,readability-container-size-empty,readability-delete-null-pointer,readability-duplicate-include,readability-non-const-parameter,readability-redundant-access-specifiers,readability-redundant-control-flow,readability-redundant-declaration,readability-redundant-function-ptr-dereference,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-simplify-boolean-expr,readability-simplify-subscript-expr,readability-else-after-return,performance-*'
2+
CheckOptions:
3+
- {key: modernize-use-override.AllowOverrideAndFinal, value: 'true'}
4+
- {key: performance-unnecessary-copy-initialization.AllowedTypes, value: 'su2double'}
5+
- {key: performance-unnecessary-value-param.AllowedTypes, value: 'su2double'}

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ assignees: ''
2626
- C++ compiler and version: [e.g., g++ (GCC) 4.8.5]
2727
- MPI implementation and version: [e.g., OpenMPI 3.0.0]
2828
- SU2 Version: [e.g., v6.2.0]
29-

.github/pull_request_template.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Proposed Changes
22
*Give a brief overview of your contribution here in a few sentences.*
3-
3+
44

55

66
## Related Work
@@ -14,5 +14,6 @@
1414
- [ ] I am submitting my contribution to the develop branch.
1515
- [ ] My contribution generates no new compiler warnings (try with --warnlevel=3 when using meson).
1616
- [ ] My contribution is commented and consistent with SU2 style (https://su2code.github.io/docs_v7/Style-Guide/).
17+
- [ ] I used the pre-commit hook to prevent dirty commits and used `pre-commit run --all` to format old commits.
1718
- [ ] I have added a test case that demonstrates my contribution, if necessary.
1819
- [ ] I have updated appropriate documentation (Tutorials, Docs Page, config_template.cpp), if necessary.

.github/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ changelog:
1717
- title: 'Other Changes'
1818
labels:
1919
- "*"
20-

.github/workflows/code-style.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Code Style
2+
on:
3+
pull_request:
4+
paths:
5+
- "**.[ch]pp"
6+
- "**.[ch]"
7+
- "**.cfg"
8+
- "**.py"
9+
10+
jobs:
11+
formatting:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v3
16+
- name: Setup python
17+
uses: actions/setup-python@v4
18+
with:
19+
python-version: '3.10'
20+
check-latest: true
21+
- name: Install pre-commit
22+
run: pip install pre-commit
23+
- name: Run checks
24+
run: pre-commit run -a -v
25+
- name: Git status
26+
if: always()
27+
run: git status
28+
- name: Full diff
29+
if: always()
30+
run: git diff

.github/workflows/regression.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ jobs:
2626
config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, BaseOMP, ReverseOMP, ForwardOMP]
2727
include:
2828
- config_set: BaseMPI
29-
flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-tests=true --warnlevel=2 --werror'
29+
flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2 --werror'
3030
- config_set: ReverseMPI
3131
flags: '-Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror'
3232
- config_set: ForwardMPI
3333
flags: '-Denable-directdiff=true -Denable-normal=false -Denable-tests=true --warnlevel=3 --werror'
3434
- config_set: BaseNoMPI
35-
flags: '-Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
35+
flags: '-Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true -Denable-tests=true --warnlevel=3 --werror'
3636
- config_set: ReverseNoMPI
3737
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror'
3838
- config_set: ForwardNoMPI
3939
flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
4040
- config_set: BaseOMP
4141
flags: '-Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4242
- config_set: ReverseOMP
43-
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3 --werror'
43+
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4444
- config_set: ForwardOMP
45-
flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3 --werror'
45+
flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4646
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
4747
steps:
4848
- name: Cache Object Files
@@ -52,12 +52,12 @@ jobs:
5252
key: ${{ matrix.config_set }}-${{ github.sha }}
5353
restore-keys: ${{ matrix.config_set }}
5454
- name: Pre Cleanup
55-
uses: docker://ghcr.io/su2code/su2/build-su2:221224-1158
55+
uses: docker://ghcr.io/su2code/su2/build-su2:230225-2136
5656
with:
5757
entrypoint: /bin/rm
5858
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
5959
- name: Build
60-
uses: docker://ghcr.io/su2code/su2/build-su2:221224-1158
60+
uses: docker://ghcr.io/su2code/su2/build-su2:230225-2136
6161
with:
6262
args: -b ${{github.ref}} -f "${{matrix.flags}}"
6363
- name: Compress binaries
@@ -68,7 +68,7 @@ jobs:
6868
name: ${{ matrix.config_set }}
6969
path: install_bin.tgz
7070
- name: Post Cleanup
71-
uses: docker://ghcr.io/su2code/su2/build-su2:221224-1158
71+
uses: docker://ghcr.io/su2code/su2/build-su2:230225-2136
7272
with:
7373
entrypoint: /bin/rm
7474
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -99,7 +99,7 @@ jobs:
9999
tag: OMP
100100
steps:
101101
- name: Pre Cleanup
102-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
102+
uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
103103
with:
104104
entrypoint: /bin/rm
105105
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -125,12 +125,12 @@ jobs:
125125
chmod a+x $BIN_FOLDER/*
126126
ls -lahR $BIN_FOLDER
127127
- name: Run Tests in Container
128-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
128+
uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
129129
with:
130130
# -t <Tutorials-branch> -c <Testcases-branch>
131131
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
132132
- name: Cleanup
133-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
133+
uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
134134
with:
135135
entrypoint: /bin/rm
136136
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -151,7 +151,7 @@ jobs:
151151
tag: MPI
152152
steps:
153153
- name: Pre Cleanup
154-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
154+
uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
155155
with:
156156
entrypoint: /bin/rm
157157
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -212,11 +212,11 @@ jobs:
212212
echo $PWD
213213
ls -lahR
214214
- name: Run Unit Tests
215-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
215+
uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
216216
with:
217217
entrypoint: install/bin/${{matrix.testdriver}}
218218
- name: Post Cleanup
219-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
219+
uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
220220
with:
221221
entrypoint: /bin/rm
222222
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}

.github/workflows/release-management.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
key: ${{ matrix.os_bin }}-${{ github.sha }}
3636
restore-keys: ${{ matrix.os_bin }}
3737
- name: Build
38-
uses: docker://ghcr.io/su2code/su2/build-su2-cross:221224-1158
38+
uses: docker://ghcr.io/su2code/su2/build-su2-cross:230225-2136
3939
with:
4040
args: -b ${{ github.sha }} -f "${{matrix.flags}}"
4141
- name: Create Archive
@@ -65,4 +65,3 @@ jobs:
6565
asset_path: ${{matrix.os_bin}}.zip
6666
asset_name: SU2-${{ steps.update_release.outputs.tagname }}-${{matrix.os_bin}}.zip
6767
asset_content_type: application/zip
68-
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Pull Request Labels
2+
on:
3+
pull_request:
4+
types: [opened, labeled, unlabeled, synchronize]
5+
jobs:
6+
label:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: mheap/github-action-required-labels@v3
10+
with:
11+
mode: exactly
12+
count: 1
13+
labels: "changelog:feature, changelog:fix, changelog:chore"

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,9 @@ ninja
9797

9898
# Ignore vscode folder
9999
.vscode/
100+
101+
# Ignore SU2 pre-configuration timestamp created by preconfigure.py
102+
su2preconfig.timestamp
103+
104+
# Clangd server files
105+
.cache

0 commit comments

Comments
 (0)