Skip to content

Commit aaf2842

Browse files
bigfootedbigfooted
authored
Merge branch 'develop' into feature_precond_linsol
2 parents 40e43f4 + ab62777 commit aaf2842

27 files changed

+340
-315
lines changed

‎.github/workflows/regression-arm64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
name: Run the jobs on Linux ARM64
1111
uses: './.github/workflows/regression.yml'
1212
with:
13-
runner: 'ARM64'
13+
runner: 'ubuntu-24.04-arm'

‎.github/workflows/regression.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
7777
build_tsan:
7878
name: Build SU2 (tsan)
79-
if: inputs.runner != 'ARM64'
79+
if: ${{ !contains(inputs.runner, 'arm') }}
8080
strategy:
8181
fail-fast: false
8282
matrix:
@@ -218,7 +218,7 @@ jobs:
218218
entrypoint: /bin/rm
219219
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
220220
discadj_tape_tests:
221-
if: inputs.runner != 'ARM64'
221+
if: ${{ !contains(inputs.runner, 'arm') }}
222222
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
223223
name: Tape Tests
224224
needs: build
@@ -267,7 +267,7 @@ jobs:
267267
entrypoint: /bin/rm
268268
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
269269
thread_sanitizer_tests:
270-
if: inputs.runner != 'ARM64'
270+
if: ${{ !contains(inputs.runner, 'arm') }}
271271
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
272272
name: Thread Sanitizer Tests
273273
needs: build_tsan

‎TestCases/TestCase.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ def __init__(self,tag_in):
124124
self.command = self.Command()
125125
self.timeout = 0
126126
self.tol = 0.0
127+
self.tol_aarch64 = 0.0
127128
self.tapetest_tol = 0
128129
self.tol_file_percent = 0.0
129130
self.comp_threshold = 0.0
@@ -386,6 +387,9 @@ def run_filediff(self, with_tsan=False, with_asan=False, with_tapetests=False):
386387

387388
# If file tolerance is set to 0, make regular diff
388389
if self.tol_file_percent == 0.0:
390+
# Strip trailing whitespace but keep newline for difflib
391+
fromlines = [line.rstrip() + '\n' for line in fromlines]
392+
tolines = [line.rstrip() + '\n' for line in tolines]
389393
diff = list(difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate))
390394

391395
# Else test word by word with given tolerance
@@ -1034,3 +1038,6 @@ def adjust_test_data(self):
10341038

10351039
if len(self.reference_file_aarch64) != 0:
10361040
self.reference_file = self.reference_file_aarch64
1041+
1042+
if self.tol_aarch64 != 0:
1043+
self.tol = self.tol_aarch64

‎TestCases/cont_adj_euler/naca0012/of_grad_cd.dat.ref‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP"
2-
0 , -0.346339 , 0.0001
3-
1 , -0.248052 , 0.0001
4-
2 , -0.1713 , 0.0001
5-
3 , -0.122543 , 0.0001
6-
4 , -0.101101 , 0.0001
7-
5 , -0.104377 , 0.0001
8-
6 , -0.127816 , 0.0001
9-
7 , -0.164567 , 0.0001
10-
8 , -0.206037 , 0.0001
11-
9 , -0.24378 , 0.0001
12-
10 , -0.272396 , 0.0001
13-
11 , -0.292059 , 0.0001
14-
12 , -0.308757 , 0.0001
15-
13 , -0.331226 , 0.0001
16-
14 , -0.366529 , 0.0001
17-
15 , -0.418919 , 0.0001
18-
16 , -0.495353 , 0.0001
19-
17 , -0.619083 , 0.0001
20-
18 , -0.889061 , 0.0001
21-
19 , 0.118474 , 0.0001
22-
20 , 0.849882 , 0.0001
23-
21 , 1.3251 , 0.0001
24-
22 , 1.53508 , 0.0001
25-
23 , 1.51368 , 0.0001
26-
24 , 1.31908 , 0.0001
27-
25 , 1.02001 , 0.0001
28-
26 , 0.68317 , 0.0001
29-
27 , 0.363758 , 0.0001
30-
28 , 0.100704 , 0.0001
31-
29 , -0.0830333 , 0.0001
32-
30 , -0.176826 , 0.0001
33-
31 , -0.178825 , 0.0001
34-
32 , -0.096525 , 0.0001
35-
33 , 0.0472928 , 0.0001
36-
34 , 0.21134 , 0.0001
37-
35 , 0.355622 , 0.0001
38-
36 , 0.490104 , 0.0001
39-
37 , 0.718618 , 0.0001
1+
VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP"
2+
0 , -0.346339 , 0.0001
3+
1 , -0.248052 , 0.0001
4+
2 , -0.1713 , 0.0001
5+
3 , -0.122543 , 0.0001
6+
4 , -0.101101 , 0.0001
7+
5 , -0.104377 , 0.0001
8+
6 , -0.127816 , 0.0001
9+
7 , -0.164567 , 0.0001
10+
8 , -0.206037 , 0.0001
11+
9 , -0.24378 , 0.0001
12+
10 , -0.272396 , 0.0001
13+
11 , -0.292059 , 0.0001
14+
12 , -0.308757 , 0.0001
15+
13 , -0.331226 , 0.0001
16+
14 , -0.366529 , 0.0001
17+
15 , -0.418919 , 0.0001
18+
16 , -0.495353 , 0.0001
19+
17 , -0.619083 , 0.0001
20+
18 , -0.889061 , 0.0001
21+
19 , 0.118474 , 0.0001
22+
20 , 0.849882 , 0.0001
23+
21 , 1.3251 , 0.0001
24+
22 , 1.53508 , 0.0001
25+
23 , 1.51368 , 0.0001
26+
24 , 1.31908 , 0.0001
27+
25 , 1.02001 , 0.0001
28+
26 , 0.68317 , 0.0001
29+
27 , 0.363758 , 0.0001
30+
28 , 0.100704 , 0.0001
31+
29 , -0.0830333 , 0.0001
32+
30 , -0.176826 , 0.0001
33+
31 , -0.178825 , 0.0001
34+
32 , -0.096525 , 0.0001
35+
33 , 0.0472928 , 0.0001
36+
34 , 0.21134 , 0.0001
37+
35 , 0.355622 , 0.0001
38+
36 , 0.490104 , 0.0001
39+
37 , 0.718618 , 0.0001

‎TestCases/cont_adj_euler/naca0012/of_grad_cd_disc.dat.ref‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP"
2-
0 , 292.459 , 0.001
3-
1 , -8318.5 , 0.001
4-
2 , -16158.4 , 0.001
5-
3 , -21277.2 , 0.001
6-
4 , -23366.9 , 0.001
7-
5 , -22727.6 , 0.001
8-
6 , -19872.3 , 0.001
9-
7 , -15278.1 , 0.001
10-
8 , -9283.99 , 0.001
11-
9 , -2179.87 , 0.001
12-
10 , 5520.63 , 0.001
13-
11 , 12726.0 , 0.001
14-
12 , 17538.0 , 0.001
15-
13 , 17441.1 , 0.001
16-
14 , 10335.6 , 0.001
17-
15 , -2686.37 , 0.001
18-
16 , -10522.5 , 0.001
19-
17 , 24712.2 , 0.001
20-
18 , 166438.0 , 0.001
21-
19 , -15618.6 , 0.001
22-
20 , -14178.7 , 0.001
23-
21 , -12765.5 , 0.001
24-
22 , -12007.2 , 0.001
25-
23 , -13597.5 , 0.001
26-
24 , -19002.9 , 0.001
27-
25 , -28729.6 , 0.001
28-
26 , -41946.6 , 0.001
29-
27 , -56289.3 , 0.001
30-
28 , -67832.1 , 0.001
31-
29 , -71484.0 , 0.001
32-
30 , -62334.5 , 0.001
33-
31 , -38478.2 , 0.001
34-
32 , -4757.34 , 0.001
35-
33 , 26448.5 , 0.001
36-
34 , 45049.5 , 0.001
37-
35 , 60960.9 , 0.001
38-
36 , 83515.9 , 0.001
39-
37 , 8837.4 , 0.001
1+
VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP"
2+
0 , 292.459 , 0.001
3+
1 , -8318.5 , 0.001
4+
2 , -16158.4 , 0.001
5+
3 , -21277.2 , 0.001
6+
4 , -23366.9 , 0.001
7+
5 , -22727.6 , 0.001
8+
6 , -19872.3 , 0.001
9+
7 , -15278.1 , 0.001
10+
8 , -9283.99 , 0.001
11+
9 , -2179.87 , 0.001
12+
10 , 5520.63 , 0.001
13+
11 , 12726.0 , 0.001
14+
12 , 17538.0 , 0.001
15+
13 , 17441.1 , 0.001
16+
14 , 10335.6 , 0.001
17+
15 , -2686.37 , 0.001
18+
16 , -10522.5 , 0.001
19+
17 , 24712.2 , 0.001
20+
18 , 166438.0 , 0.001
21+
19 , -15618.6 , 0.001
22+
20 , -14178.7 , 0.001
23+
21 , -12765.5 , 0.001
24+
22 , -12007.2 , 0.001
25+
23 , -13597.5 , 0.001
26+
24 , -19002.9 , 0.001
27+
25 , -28729.6 , 0.001
28+
26 , -41946.6 , 0.001
29+
27 , -56289.3 , 0.001
30+
28 , -67832.1 , 0.001
31+
29 , -71484.0 , 0.001
32+
30 , -62334.5 , 0.001
33+
31 , -38478.2 , 0.001
34+
32 , -4757.34 , 0.001
35+
33 , 26448.5 , 0.001
36+
34 , 45049.5 , 0.001
37+
35 , 60960.9 , 0.001
38+
36 , 83515.9 , 0.001
39+
37 , 8837.4 , 0.001

‎TestCases/cont_adj_euler/naca0012/of_grad_cd_disc_aarch64.dat.ref‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP"
2-
0 , -2656.96 , 0.001
3-
1 , -12995.9 , 0.001
4-
2 , -21781.3 , 0.001
5-
3 , -27675.3 , 0.001
6-
4 , -30437.9 , 0.001
7-
5 , -30443.9 , 0.001
8-
6 , -28343.1 , 0.001
9-
7 , -24794.2 , 0.001
10-
8 , -20329.4 , 0.001
11-
9 , -15376.6 , 0.001
12-
10 , -10418.0 , 0.001
13-
11 , -6201.67 , 0.001
14-
12 , -3878.08 , 0.001
15-
13 , -4910.93 , 0.001
16-
14 , -10573.5 , 0.001
17-
15 , -20610.7 , 0.001
18-
16 , -30110.4 , 0.001
19-
17 , -26294.5 , 0.001
20-
18 , -62393.8 , 0.001
21-
19 , -2797.26 , 0.001
22-
20 , -832.067 , 0.001
23-
21 , -668.081 , 0.001
24-
22 , -1773.25 , 0.001
25-
23 , -5718.86 , 0.001
26-
24 , -13717.8 , 0.001
27-
25 , -25699.0 , 0.001
28-
26 , -40061.9 , 0.001
29-
27 , -53729.8 , 0.001
30-
28 , -62415.6 , 0.001
31-
29 , -61293.4 , 0.001
32-
30 , -46505.9 , 0.001
33-
31 , -17841.7 , 0.001
34-
32 , 18183.8 , 0.001
35-
33 , 48447.5 , 0.001
36-
34 , 62322.0 , 0.001
37-
35 , 64139.5 , 0.001
38-
36 , 54568.2 , 0.001
39-
37 , 64856.8 , 0.001
1+
VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP"
2+
0 , 292.459 , 0.001
3+
1 , -8318.5 , 0.001
4+
2 , -16158.4 , 0.001
5+
3 , -21277.2 , 0.001
6+
4 , -23366.9 , 0.001
7+
5 , -22727.6 , 0.001
8+
6 , -19872.3 , 0.001
9+
7 , -15278.1 , 0.001
10+
8 , -9283.99 , 0.001
11+
9 , -2179.87 , 0.001
12+
10 , 5520.63 , 0.001
13+
11 , 12726.0 , 0.001
14+
12 , 17538.0 , 0.001
15+
13 , 17441.1 , 0.001
16+
14 , 10335.6 , 0.001
17+
15 , -2686.37 , 0.001
18+
16 , -10522.5 , 0.001
19+
17 , 24712.2 , 0.001
20+
18 , 166438.0 , 0.001
21+
19 , -15618.6 , 0.001
22+
20 , -14178.7 , 0.001
23+
21 , -12765.5 , 0.001
24+
22 , -12007.2 , 0.001
25+
23 , -13597.5 , 0.001
26+
24 , -19002.9 , 0.001
27+
25 , -28729.6 , 0.001
28+
26 , -41946.6 , 0.001
29+
27 , -56289.3 , 0.001
30+
28 , -67832.1 , 0.001
31+
29 , -71484.0 , 0.001
32+
30 , -62334.5 , 0.001
33+
31 , -38478.2 , 0.001
34+
32 , -4757.34 , 0.001
35+
33 , 26448.5 , 0.001
36+
34 , 45049.5 , 0.001
37+
35 , 60960.9 , 0.001
38+
36 , 83515.9 , 0.001
39+
37 , 8837.4 , 0.001

‎TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VARIABLES="VARIABLE" , "DRAG" , "EFFICIENCY" , "FORCE_X" , "FORCE_Y" , "FORCE_Z" , "LIFT" , "MOMENT_X" , "MOMENT_Y" , "MOMENT_Z" , "SIDEFORCE"
2-
0 , 0.24008251 , -117.3444057 , 0.2742430499 , -1.56293638 , 0.0 , -1.568547024 , 0.0 , 0.0 , 1.189018284 , 0.0
3-
1 , 0.4064005433 , -189.77779 , 0.4586830911 , -2.391641926 , 0.0 , -2.401078899 , 0.0 , 0.0 , 1.030793484 , 0.0
4-
2 , 0.5421052294 , -249.5397676 , 0.6095878335 , -3.086770277 , 0.0 , -3.099333798 , 0.0 , 0.0 , 0.6218682473 , 0.0
1+
VARIABLES="VARIABLE" , "DRAG" , "EFFICIENCY" , "FORCE_X" , "FORCE_Y" , "FORCE_Z" , "LIFT" , "MOMENT_X" , "MOMENT_Y" , "MOMENT_Z" , "SIDEFORCE"
2+
0 , 0.24008251 , -117.3444057 , 0.2742430499 , -1.56293638 , 0.0 , -1.568547024 , 0.0 , 0.0 , 1.189018284 , 0.0
3+
1 , 0.4064005433 , -189.77779 , 0.4586830911 , -2.391641926 , 0.0 , -2.401078899 , 0.0 , 0.0 , 1.030793484 , 0.0
4+
2 , 0.5421052294 , -249.5397676 , 0.6095878335 , -3.086770277 , 0.0 , -3.099333798 , 0.0 , 0.0 , 0.6218682473 , 0.0

‎TestCases/cont_adj_euler/naca0012/of_grad_directdiff_aarch64.dat.ref‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VARIABLES="VARIABLE" , "DRAG" , "EFFICIENCY" , "FORCE_X" , "FORCE_Y" , "FORCE_Z" , "LIFT" , "MOMENT_X" , "MOMENT_Y" , "MOMENT_Z" , "SIDEFORCE"
2-
0 , 0.2253591473 , -105.6097088 , 0.2588459007 , -1.5322178 , 0.0 , -1.537499867 , 0.0 , 0.0 , 1.202899757 , 0.0
3-
1 , 0.3835809166 , -173.3502205 , 0.4363886002 , -2.415957492 , 0.0 , -2.424902327 , 0.0 , 0.0 , 1.053347497 , 0.0
4-
2 , 0.5151776249 , -228.9760041 , 0.5835870252 , -3.129538494 , 0.0 , -3.141524632 , 0.0 , 0.0 , 0.6540715539 , 0.0
1+
VARIABLES="VARIABLE" , "DRAG" , "EFFICIENCY" , "FORCE_X" , "FORCE_Y" , "FORCE_Z" , "LIFT" , "MOMENT_X" , "MOMENT_Y" , "MOMENT_Z" , "SIDEFORCE"
2+
0 , 0.24008251 , -117.3444057 , 0.2742430499 , -1.56293638 , 0.0 , -1.568547024 , 0.0 , 0.0 , 1.189018284 , 0.0
3+
1 , 0.4064005433 , -189.77779 , 0.4586830911 , -2.391641926 , 0.0 , -2.401078899 , 0.0 , 0.0 , 1.030793484 , 0.0
4+
2 , 0.5421052294 , -249.5397676 , 0.6095878335 , -3.086770277 , 0.0 , -3.099333798 , 0.0 , 0.0 , 0.6218682473 , 0.0

‎TestCases/disc_adj_fsi/dyn_fsi/grad_dv_aarch64.opt.ref‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
INDEX GRAD
2-
0 -3.461460506635121e-03
3-
1 -1.841786208967458e-03
4-
2 -7.915535677936552e-04
5-
3 -2.739621839525785e-04
6-
4 -2.734869125125620e-04
7-
5 -7.881162552527191e-04
8-
6 -1.828978304797359e-03
9-
7 -3.427219401431795e-03
2+
0 -4.570869211378251e-04
3+
1 -2.401466735452708e-04
4+
2 -9.134698210593547e-05
5+
3 -1.628086946841527e-05
6+
4 -1.741052543353507e-05
7+
5 -9.462490180375868e-05
8+
6 -2.452466338580702e-04
9+
7 -4.635483760290384e-04

0 commit comments

Comments
 (0)