Skip to content

Commit 9e7551f

Browse files
authored
Merge pull request #1736 from su2code/develop
Update master
2 parents 42d1571 + 745e5d9 commit 9e7551f

File tree

1,008 files changed

+18212
-3388
lines changed

Some content is hidden

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

1,008 files changed

+18212
-3388
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@ assignees: ''
77

88
---
99

10-
**Describe the bug**
11-
*A clear and concise description of what the bug is and what you expect the behavior to be instead. If applicable, add screenshots to help explain your problem.*
10+
*If this is a general question or difficulty building/using the code, please open a "Discussion" instead.*
1211

12+
**Describe the bug**
13+
*Give a clear and concise description of what the bug is and what you expect the behavior to be instead. Please provide enough instructions and data for a developer to reproduce the problem (config, mesh, commands, etc.). Please provide the smallest working example that reproduces the problem.*
1314

1415

15-
**To Reproduce**
16-
*Please provide a config file and mesh for a minimal example that recreates the problem.*
16+
**Bug report checklist**
17+
*Please make sure that you have followed the checklist below, many common problems can be solved by:*
1718

19+
- [ ] Consulting the build instructions (https://su2code.github.io/docs_v7/Build-SU2-Linux-MacOS/).
20+
- [ ] Looking for similar problems on GitHub or CFD-Online (https://www.cfd-online.com/Forums/su2/).
21+
- [ ] Updating to the newest version of SU2 (either develop, master, or the pre-built executables https://su2code.github.io/download.html).
1822

1923

2024
**Desktop (please complete the following information):**

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/pull_request_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*Put an X by all that apply. You can fill this out after submitting the PR. If you have any questions, don't hesitate to ask! We want to help. These are a guide for you to know what the reviewers will be looking for in your contribution.*
1313

1414
- [ ] I am submitting my contribution to the develop branch.
15-
- [ ] My contribution generates no new compiler warnings (try with the '-Wall -Wextra -Wno-unused-parameter -Wno-empty-body' compiler flags, or simply --warnlevel=2 when using meson).
16-
- [ ] My contribution is commented and consistent with SU2 style.
15+
- [ ] My contribution generates no new compiler warnings (try with --warnlevel=3 when using meson).
16+
- [ ] My contribution is commented and consistent with SU2 style (https://su2code.github.io/docs_v7/Style-Guide/).
1717
- [ ] I have added a test case that demonstrates my contribution, if necessary.
18-
- [ ] I have updated appropriate documentation (Tutorials, Docs Page, config_template.cpp) , if necessary.
18+
- [ ] I have updated appropriate documentation (Tutorials, Docs Page, config_template.cpp), if necessary.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Regression tests running on Linux ARM64
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
8+
jobs:
9+
build_on_arm64:
10+
name: Run the jobs on Linux ARM64
11+
uses: './.github/workflows/regression.yml'
12+
with:
13+
runner: 'ARM64'

.github/workflows/regression.yml

Lines changed: 115 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ on:
99
branches:
1010
- 'develop'
1111
- 'master'
12+
workflow_call:
13+
inputs:
14+
runner:
15+
description: 'The github runner to use'
16+
default: 'ubuntu-latest'
17+
required: false
18+
type: string
1219

1320
jobs:
1421
build:
@@ -31,30 +38,42 @@ jobs:
3138
- config_set: ForwardNoMPI
3239
flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
3340
- config_set: BaseOMP
34-
flags: '-Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3 --werror'
41+
flags: '-Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
3542
- config_set: ReverseOMP
3643
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3 --werror'
3744
- config_set: ForwardOMP
3845
flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3 --werror'
39-
runs-on: ubuntu-latest
46+
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
4047
steps:
4148
- name: Cache Object Files
42-
uses: actions/cache@v1
49+
uses: actions/cache@v3
4350
with:
4451
path: ccache
4552
key: ${{ matrix.config_set }}-${{ github.sha }}
4653
restore-keys: ${{ matrix.config_set }}
54+
- name: Pre Cleanup
55+
uses: docker://ghcr.io/su2code/su2/build-su2:220614-1237
56+
with:
57+
entrypoint: /bin/rm
58+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
4759
- name: Build
48-
uses: docker://su2code/build-su2:20191105
60+
uses: docker://ghcr.io/su2code/su2/build-su2:220614-1237
4961
with:
5062
args: -b ${{github.ref}} -f "${{matrix.flags}}"
63+
- name: Compress binaries
64+
run: tar -zcvf install_bin.tgz install/bin
5165
- name: Upload Binaries
52-
uses: actions/upload-artifact@v1
66+
uses: actions/upload-artifact@v3
5367
with:
5468
name: ${{ matrix.config_set }}
55-
path: install/bin
69+
path: install_bin.tgz
70+
- name: Post Cleanup
71+
uses: docker://ghcr.io/su2code/su2/build-su2:220614-1237
72+
with:
73+
entrypoint: /bin/rm
74+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
5675
regression_tests:
57-
runs-on: ubuntu-latest
76+
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
5877
name: Regression Tests
5978
needs: build
6079
strategy:
@@ -79,22 +98,44 @@ jobs:
7998
- testscript: 'hybrid_regression_AD.py'
8099
tag: OMP
81100
steps:
82-
- name: Download All artifact
83-
uses: actions/download-artifact@v2
84-
- name: Move Binaries
101+
- name: Pre Cleanup
102+
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
103+
with:
104+
entrypoint: /bin/rm
105+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
106+
- name: Download All artifacts
107+
uses: actions/download-artifact@v3
108+
- name: Uncompress and Move Binaries
85109
run: |
86-
mkdir -p install/bin
87-
if [ -d "${{format('Base{0}', matrix.tag)}}" ]; then cp -r ${{format('Base{0}', matrix.tag)}}/. install/bin/; fi
88-
if [ -d "${{format('Reverse{0}', matrix.tag)}}" ]; then cp -r ${{format('Reverse{0}', matrix.tag)}}/. install/bin/; fi
89-
if [ -d "${{format('Forward{0}', matrix.tag)}}" ]; then cp -r ${{format('Forward{0}', matrix.tag)}}/. install/bin/; fi
90-
chmod a+x install/bin/*
110+
BIN_FOLDER="$PWD/install/bin"
111+
mkdir -p $BIN_FOLDER
112+
ls -lah $BIN_FOLDER
113+
for type in Base Reverse Forward; do
114+
TYPE_FOLDER="${type}${{matrix.tag}}"
115+
echo "Processing '$TYPE_FOLDER' ..."
116+
if [ -d $TYPE_FOLDER ]; then
117+
pushd $TYPE_FOLDER
118+
ls -lah
119+
tar -zxvf install_bin.tgz
120+
ls -lah install/bin/
121+
cp -r install/bin/* $BIN_FOLDER;
122+
popd;
123+
fi
124+
done
125+
chmod a+x $BIN_FOLDER/*
126+
ls -lahR $BIN_FOLDER
91127
- name: Run Tests in Container
92-
uses: docker://su2code/test-su2:20200303
128+
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
93129
with:
94130
# -t <Tutorials-branch> -c <Testcases-branch>
95131
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
132+
- name: Cleanup
133+
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
134+
with:
135+
entrypoint: /bin/rm
136+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
96137
unit_tests:
97-
runs-on: ubuntu-latest
138+
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
98139
name: Unit Tests
99140
needs: build
100141
strategy:
@@ -109,26 +150,73 @@ jobs:
109150
- testdriver: 'test_driver_DD'
110151
tag: MPI
111152
steps:
153+
- name: Pre Cleanup
154+
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
155+
with:
156+
entrypoint: /bin/rm
157+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
112158
- name: Download Base
113-
uses: actions/download-artifact@v1
159+
uses: actions/download-artifact@v3
114160
with:
115161
name: ${{format('Base{0}', matrix.tag)}}
162+
path: ${{format('Base{0}', matrix.tag)}}
116163
- name: Download Reverse
117-
uses: actions/download-artifact@v1
164+
uses: actions/download-artifact@v3
118165
with:
119166
name: ${{format('Reverse{0}', matrix.tag)}}
167+
path: ${{format('Reverse{0}', matrix.tag)}}
120168
- name: Download Forward
121-
uses: actions/download-artifact@v1
169+
uses: actions/download-artifact@v3
122170
with:
123171
name: ${{format('Forward{0}', matrix.tag)}}
124-
- name: Move Binaries
172+
path: ${{format('Forward{0}', matrix.tag)}}
173+
- name: Uncompress and Move Binaries
125174
run: |
126-
mkdir -p install/bin
127-
cp -r ${{format('Base{0}', matrix.tag)}}/. install/bin/
128-
cp -r ${{format('Reverse{0}', matrix.tag)}}/. install/bin/
129-
cp -r ${{format('Forward{0}', matrix.tag)}}/. install/bin/
130-
chmod a+x install/bin/*
175+
ls -lah
176+
BIN_FOLDER="$PWD/install/bin"
177+
mkdir -p $BIN_FOLDER
178+
ls -laH $BIN_FOLDER
179+
for type in Base Reverse Forward; do
180+
TYPE_FOLDER="${type}${{matrix.tag}}"
181+
if [ -d $TYPE_FOLDER ]; then
182+
echo "Processing '$TYPE_FOLDER' ..."
183+
pushd $TYPE_FOLDER
184+
ls -lah
185+
tar -zxvf install_bin.tgz
186+
ls -laH install/bin/
187+
cp -r install/bin/* $BIN_FOLDER;
188+
popd;
189+
else
190+
echo "$TYPE_FOLDER does not exist!"
191+
fi
192+
done
193+
find $BIN_FOLDER -type f -exec chmod a+x '{}' \;
194+
ls -lahR $BIN_FOLDER
195+
echo "cloning branch"
196+
branch="${{github.ref}}"
197+
name="SU2"
198+
SRC_FOLDER="$PWD/src"
199+
mkdir -p $SRC_FOLDER
200+
cd $SRC_FOLDER
201+
git clone --recursive --depth=1 --shallow-submodules https://github.com/su2code/SU2 $name
202+
cd $name
203+
git config --add remote.origin.fetch '+refs/pull/*/merge:refs/remotes/origin/refs/pull/*/merge'
204+
git config --add remote.origin.fetch '+refs/heads/*:refs/remotes/origin/refs/heads/*'
205+
git fetch origin --depth=1 $branch:$branch
206+
git checkout $branch
207+
git submodule update
208+
echo $PWD
209+
ls -lahR
210+
cd ..
211+
echo "done cloning"
212+
echo $PWD
213+
ls -lahR
131214
- name: Run Unit Tests
132-
uses: docker://su2code/test-su2:20191031
215+
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
133216
with:
134217
entrypoint: install/bin/${{matrix.testdriver}}
218+
- name: Post Cleanup
219+
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
220+
with:
221+
entrypoint: /bin/rm
222+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}

.github/workflows/release-management.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- os_bin: macos64-mpi
2424
flags: '-Dcustom-mpi=true --cross-file=/hostfiles/hostfile_darwin_mpi'
2525
- os_bin: linux64
26-
flags: '-Dwith-mpi=disabled --cross-file=/hostfiles/hostfile_linux'
26+
flags: '-Dwith-mpi=disabled -Dstatic-cgns-deps=true --cross-file=/hostfiles/hostfile_linux'
2727
- os_bin: linux64-mpi
2828
flags: '-Dcustom-mpi=true --cross-file=/hostfiles/hostfile_linux_mpi'
2929
runs-on: ubuntu-latest
@@ -35,7 +35,7 @@ jobs:
3535
key: ${{ matrix.os_bin }}-${{ github.sha }}
3636
restore-keys: ${{ matrix.os_bin }}
3737
- name: Build
38-
uses: docker://su2code/build-su2-cross:latest
38+
uses: docker://ghcr.io/su2code/su2/build-su2-cross:220716-1459
3939
with:
4040
args: -b ${{ github.sha }} -f "${{matrix.flags}}"
4141
- name: Create Archive

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Giulio Gori
7777
Guillaume Bâty
7878
Harichand M V
7979
HL Kline
80+
HL Zhi
8081
IndianaStokes
8182
J. Sinsay
8283
JSmith36

Common/doc/docmain.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \file docmain.hpp
33
* \brief This file contains documentation for Doxygen and does not have any significance with respect to C++.
44
* \author F. Palacios
5-
* \version 7.3.1 "Blackbird"
5+
* \version 7.4.0 "Blackbird"
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*
@@ -26,7 +26,7 @@
2626
*/
2727

2828
/*!
29-
* \mainpage SU2 version 7.3.1 "Blackbird"
29+
* \mainpage SU2 version 7.4.0 "Blackbird"
3030
* SU2 suite is an open-source collection of C++ based software tools
3131
* to perform PDE analysis and PDE constrained optimization problems. The toolset is designed with
3232
* computational fluid dynamics and aerodynamic shape optimization in mind, but is extensible to

0 commit comments

Comments
 (0)