Skip to content

Commit 946aa8c

Browse files
authored
Merge branch 'develop' into codeql
2 parents 85e419b + 73538a1 commit 946aa8c

287 files changed

Lines changed: 10072 additions & 8924 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.

.github/workflows/regression.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ 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-tests=true --warnlevel=3 --werror'
29+
flags: '-Denable-pywrapper=true -Denable-coolprop=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
@@ -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:220614-1237
55+
uses: docker://ghcr.io/su2code/su2/build-su2:221027-0442
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:220614-1237
60+
uses: docker://ghcr.io/su2code/su2/build-su2:221027-0442
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:220614-1237
71+
uses: docker://ghcr.io/su2code/su2/build-su2:221027-0442
7272
with:
7373
entrypoint: /bin/rm
7474
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}

.gitmodules

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
url = https://github.com/mesonbuild/meson
1515
[submodule "subprojects/Mutationpp"]
1616
path = subprojects/Mutationpp
17-
url = https://github.com/mutationpp/Mutationpp.git
17+
url = https://github.com/mutationpp/Mutationpp.git
18+
[submodule "subprojects/CoolProp"]
19+
path = subprojects/CoolProp
20+
url = https://github.com/CoolProp/CoolProp.git
1821
[submodule "externals/opdi"]
1922
path = externals/opdi
2023
url = https://github.com/SciCompKL/OpDiLib

AUTHORS.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ Patrick Mischke
109109
Paul Urbanczyk
110110
Paul Zhang
111111
Pedro Gomes
112+
Peng Yan
112113
Pete Bachant
113114
RaulFeijo55
114115
Ruben Sanchez
@@ -119,13 +120,15 @@ Samet Cakmakcioglu
119120
Scott Imlay
120121
Steffen Schotthöfer
121122
Steven Endres
123+
Sunoh Kang
122124
Teus van der Stelt
123125
Thomas D. Economon
124126
Tim Albring
125127
TobiKattmann
126128
Trent Lukaczyk
127129
VivaanKhatri
128130
Wally Maier
131+
Zan Xu
129132
aaronyicongfu
130133
aeroamit
131134
anilvar

Common/doc/docmain.hpp

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)