Skip to content

Commit 536def1

Browse files
rois1995pcarruscagbigfooted
authored
Corrections to SA-NEG-R and SA model (#2014)
* Added changes for HLPW5 --------- Co-authored-by: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Co-authored-by: Nijso <bigfootedrockmidget@hotmail.com>
1 parent 979feff commit 536def1

11 files changed

Lines changed: 74 additions & 58 deletions

File tree

SU2_CFD/include/numerics/turbulent/turb_sources.hpp

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ struct CSAVariables {
4848
const su2double cb2_sigma = cb2 / sigma;
4949
const su2double cw1 = cb1 / k2 + (1 + cb2) / sigma;
5050
const su2double cr1 = 0.5;
51+
const su2double CRot = 1.0;
52+
const su2double c2 = 0.7, c3 = 0.9;
5153

5254
/*--- List of auxiliary functions ---*/
5355
su2double ft2, d_ft2, r, d_r, g, d_g, glim, fw, d_fw, Ji, d_Ji, S, Shat, d_Shat, fv1, d_fv1, fv2, d_fv2;
@@ -122,7 +124,9 @@ class CSourceBase_TurbSA : public CNumerics {
122124

123125
/*--- Dacles-Mariani et. al. rotation correction ("-R"). ---*/
124126
if (options.rot) {
125-
var.Omega += 2.0 * min(0.0, StrainMag_i - var.Omega);
127+
var.Omega += var.CRot * min(0.0, StrainMag_i - var.Omega);
128+
/*--- Do not allow negative production for SA-neg. ---*/
129+
if (ScalarVar_i[0] < 0) var.Omega = abs(var.Omega);
126130
}
127131

128132
if (dist_i > 1e-10) {
@@ -303,9 +307,19 @@ struct ModVort {
303307
struct Bsl {
304308
static void get(const su2double& nue, const su2double& nu, CSAVariables& var) {
305309
const su2double Sbar = nue * var.fv2 * var.inv_k2_d2;
306-
var.Shat = var.S + Sbar;
307-
var.Shat = max(var.Shat, 1.0e-10);
308-
if (var.Shat <= 1.0e-10) {
310+
const su2double c2 = 0.7, c3 = 0.9;
311+
312+
/*--- Limiting of \hat{S} based on "Modifications and Clarifications for the Implementation of the Spalart-Allmaras Turbulence Model"
313+
* Note 1 option c in https://turbmodels.larc.nasa.gov/spalart.html ---*/
314+
if (Sbar >= - c2 * var.S) {
315+
var.Shat = var.S + Sbar;
316+
} else {
317+
const su2double Num = var.S * (c2 * c2 * var.S + c3 * Sbar);
318+
const su2double Den = (c3 - 2 * c2) * var.S - Sbar;
319+
var.Shat = var.S + Num / Den;
320+
}
321+
if (var.Shat <= 1e-10) {
322+
var.Shat = 1e-10;
309323
var.d_Shat = 0.0;
310324
} else {
311325
var.d_Shat = (var.fv2 + nue * var.d_fv2) * var.inv_k2_d2;

SU2_CFD/src/solvers/CTurbSASolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ void CTurbSASolver::Postprocessing(CGeometry *geometry, CSolver **solver_contain
235235

236236
su2double muT = rho*fv1*nu_hat;
237237

238-
if (neg_spalart_allmaras) muT = max(muT,0.0);
238+
if (neg_spalart_allmaras && nu_hat < 0) muT = 0.0;
239239

240240
nodes->SetmuT(iPoint,muT);
241241

TestCases/hybrid_regression.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def main():
158158
rae2822_sa.cfg_dir = "rans/rae2822"
159159
rae2822_sa.cfg_file = "turb_SA_RAE2822.cfg"
160160
rae2822_sa.test_iter = 20
161-
rae2822_sa.test_vals = [-2.020123, -5.269330, 0.807147, 0.060499, -80603.000000]
161+
rae2822_sa.test_vals = [-2.020123, -5.269324, 0.807147, 0.060499, -80602.000000]
162162
test_list.append(rae2822_sa)
163163

164164
# RAE2822 SST
@@ -182,7 +182,7 @@ def main():
182182
turb_flatplate.cfg_dir = "rans/flatplate"
183183
turb_flatplate.cfg_file = "turb_SA_flatplate.cfg"
184184
turb_flatplate.test_iter = 20
185-
turb_flatplate.test_vals = [-4.157169, -6.736698, -0.176253, 0.057446]
185+
turb_flatplate.test_vals = [-4.157358, -6.736289, -0.176258, 0.057431]
186186
test_list.append(turb_flatplate)
187187

188188
# ONERA M6 Wing
@@ -197,8 +197,8 @@ def main():
197197
turb_naca0012_sa = TestCase('turb_naca0012_sa')
198198
turb_naca0012_sa.cfg_dir = "rans/naca0012"
199199
turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg"
200-
turb_naca0012_sa.test_iter = 10
201-
turb_naca0012_sa.test_vals = [-8.627052, -10.377936, 1.064491, 0.019710, 20.000000, -1.763092, 20.000000, -4.794204, -46.506000]
200+
turb_naca0012_sa.test_iter = 5
201+
turb_naca0012_sa.test_vals = [-10.451625, -13.859808, 1.057622, 0.022916, 20.000000, -1.358306, 20.000000, -2.512316, -44.540000]
202202
turb_naca0012_sa.test_vals_aarch64 = [-8.627052, -10.377936, 1.064491, 0.019710, 20.000000, -1.763093, 20.000000, -4.794073, -46.506000]
203203
test_list.append(turb_naca0012_sa)
204204

@@ -242,7 +242,7 @@ def main():
242242
propeller.cfg_dir = "rans/propeller"
243243
propeller.cfg_file = "propeller.cfg"
244244
propeller.test_iter = 10
245-
propeller.test_vals = [-3.389575, -8.409529, 0.000048, 0.056329]
245+
propeller.test_vals = [-3.389575, -8.409251, 0.000048, 0.056329]
246246
test_list.append(propeller)
247247

248248
#######################################
@@ -408,7 +408,7 @@ def main():
408408
inc_turb_naca0012.cfg_dir = "incomp_rans/naca0012"
409409
inc_turb_naca0012.cfg_file = "naca0012.cfg"
410410
inc_turb_naca0012.test_iter = 20
411-
inc_turb_naca0012.test_vals = [-4.788405, -11.040493, 0.000008, 0.309506]
411+
inc_turb_naca0012.test_vals = [-4.788405, -11.039465, 0.000008, 0.309490]
412412
test_list.append(inc_turb_naca0012)
413413

414414
# NACA0012, SST_SUST
@@ -424,7 +424,7 @@ def main():
424424
inc_weakly_coupled.cfg_dir = "disc_adj_heat"
425425
inc_weakly_coupled.cfg_file = "primal.cfg"
426426
inc_weakly_coupled.test_iter = 10
427-
inc_weakly_coupled.test_vals = [-17.240436, -16.184455, -16.069131, -17.230730, -18.350601, -13.768070, 5.545700]
427+
inc_weakly_coupled.test_vals = [-16.498562, -15.335587, -15.570565, -12.867787, -18.185331, -13.071436, 5.545800]
428428
test_list.append(inc_weakly_coupled)
429429

430430
######################################
@@ -505,7 +505,7 @@ def main():
505505
ddes_flatplate.cfg_dir = "ddes/flatplate"
506506
ddes_flatplate.cfg_file = "ddes_flatplate.cfg"
507507
ddes_flatplate.test_iter = 10
508-
ddes_flatplate.test_vals = [-2.714758, -5.882733, -0.215005, 0.023783, -618.160000]
508+
ddes_flatplate.test_vals = [-2.714757, -5.882779, -0.215005, 0.023783, -618.130000]
509509
ddes_flatplate.unsteady = True
510510
test_list.append(ddes_flatplate)
511511

TestCases/hybrid_regression_AD.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def main():
7575
discadj_rans_naca0012_sa.cfg_dir = "disc_adj_rans/naca0012"
7676
discadj_rans_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg"
7777
discadj_rans_naca0012_sa.test_iter = 10
78-
discadj_rans_naca0012_sa.test_vals = [-2.230631, 0.644953, 0.177890, -0.000016, 5.000000, -3.007652, 5.000000, -7.631910]
78+
discadj_rans_naca0012_sa.test_vals = [-2.230621, 0.644162, 0.177890, -0.000016, 5.000000, -3.007652, 5.000000, -7.728093]
7979
discadj_rans_naca0012_sa.test_vals_aarch64 = [-2.230631, 0.644954, 0.177890, -0.000016, 5.000000, -3.007651, 5.000000, -7.631909]
8080
test_list.append(discadj_rans_naca0012_sa)
8181

TestCases/parallel_regression.py

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ def main():
336336
rae2822_sa.cfg_dir = "rans/rae2822"
337337
rae2822_sa.cfg_file = "turb_SA_RAE2822.cfg"
338338
rae2822_sa.test_iter = 20
339-
rae2822_sa.test_vals = [-2.004689, -5.265793, 0.809463, 0.062016, -80577.000000]
339+
rae2822_sa.test_vals = [-2.004689, -5.265782, 0.809463, 0.062016, -80576.000000]
340340
test_list.append(rae2822_sa)
341341

342342
# RAE2822 SST
@@ -360,23 +360,23 @@ def main():
360360
turb_flatplate.cfg_dir = "rans/flatplate"
361361
turb_flatplate.cfg_file = "turb_SA_flatplate.cfg"
362362
turb_flatplate.test_iter = 20
363-
turb_flatplate.test_vals = [-4.147548, -6.728790, -0.176227, 0.057731]
363+
turb_flatplate.test_vals = [-4.147727, -6.728308, -0.176232, 0.057717]
364364
test_list.append(turb_flatplate)
365365

366366
# Flat plate (compressible) with species inlet
367367
turb_flatplate_species = TestCase('turb_flatplate_species')
368368
turb_flatplate_species.cfg_dir = "rans/flatplate"
369369
turb_flatplate_species.cfg_file = "turb_SA_flatplate_species.cfg"
370370
turb_flatplate_species.test_iter = 20
371-
turb_flatplate_species.test_vals = [-4.147548, -0.634735, -1.770801, 1.335176, -3.250308, 9, -6.700992, 5, -6.999234, 10, -6.033847, 0.996033, 0.996033]
371+
turb_flatplate_species.test_vals = [-4.147727, -0.634899, -1.770894, 1.334987, -3.250340, 9.000000, -6.700853, 5.000000, -6.991055, 10.000000, -6.033829, 0.996033, 0.996033]
372372
test_list.append(turb_flatplate_species)
373373

374374
# ONERA M6 Wing
375375
turb_oneram6 = TestCase('turb_oneram6')
376376
turb_oneram6.cfg_dir = "rans/oneram6"
377377
turb_oneram6.cfg_file = "turb_ONERAM6.cfg"
378378
turb_oneram6.test_iter = 10
379-
turb_oneram6.test_vals = [-2.388839, -6.689413, 0.230321, 0.157640, -32539.000000]
379+
turb_oneram6.test_vals = [-2.388839, -6.689426, 0.230321, 0.157640, -32539.000000]
380380
turb_oneram6.timeout = 3200
381381
test_list.append(turb_oneram6)
382382

@@ -385,7 +385,7 @@ def main():
385385
turb_oneram6_vc.cfg_dir = "rans/oneram6"
386386
turb_oneram6_vc.cfg_file = "turb_ONERAM6_vc.cfg"
387387
turb_oneram6_vc.test_iter = 15
388-
turb_oneram6_vc.test_vals = [-2.262387, -6.626467, 0.228393, 0.140799, -2.7107e+04]
388+
turb_oneram6_vc.test_vals = [-2.262387, -6.626454, 0.228392, 0.140799, -27107.000000]
389389
turb_oneram6_vc.timeout = 3200
390390
test_list.append(turb_oneram6_vc)
391391

@@ -403,8 +403,8 @@ def main():
403403
turb_naca0012_sa = TestCase('turb_naca0012_sa')
404404
turb_naca0012_sa.cfg_dir = "rans/naca0012"
405405
turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg"
406-
turb_naca0012_sa.test_iter = 10
407-
turb_naca0012_sa.test_vals = [-8.621456, -10.378269, 1.064502, 0.019710, 20.000000, -1.811700, 20.000000, -5.171326, -46.506000]
406+
turb_naca0012_sa.test_iter = 5
407+
turb_naca0012_sa.test_vals = [-10.453509, -13.866376, 1.057622, 0.022916, 20.000000, -1.867547, 20.000000, -3.632893, -44.540000]
408408
turb_naca0012_sa.timeout = 3200
409409
test_list.append(turb_naca0012_sa)
410410

@@ -468,7 +468,7 @@ def main():
468468
propeller.cfg_dir = "rans/propeller"
469469
propeller.cfg_file = "propeller.cfg"
470470
propeller.test_iter = 10
471-
propeller.test_vals = [-3.389575, -8.409529, 0.000048, 0.056329] #last 4 columns
471+
propeller.test_vals = [-3.389575, -8.409251, 0.000048, 0.056329]
472472
propeller.timeout = 3200
473473
test_list.append(propeller)
474474

@@ -581,7 +581,7 @@ def main():
581581
inc_turb_naca0012.cfg_dir = "incomp_rans/naca0012"
582582
inc_turb_naca0012.cfg_file = "naca0012.cfg"
583583
inc_turb_naca0012.test_iter = 20
584-
inc_turb_naca0012.test_vals = [-4.788595, -11.040557, -0.000002, 0.309519]
584+
inc_turb_naca0012.test_vals = [-4.788596, -11.039529, -0.000002, 0.309504]
585585
test_list.append(inc_turb_naca0012)
586586

587587
# NACA0012, SST_SUST
@@ -667,15 +667,15 @@ def main():
667667
turbmod_sa_bsl_rae2822.cfg_dir = "turbulence_models/sa/rae2822"
668668
turbmod_sa_bsl_rae2822.cfg_file = "turb_SA_BSL_RAE2822.cfg"
669669
turbmod_sa_bsl_rae2822.test_iter = 20
670-
turbmod_sa_bsl_rae2822.test_vals = [-2.004689, 0.742306, 0.497308, -5.265793, 0.809463, 0.062016]
670+
turbmod_sa_bsl_rae2822.test_vals = [-2.004689, 0.742306, 0.497308, -5.265782, 0.809463, 0.062016]
671671
test_list.append(turbmod_sa_bsl_rae2822)
672672

673673
# SA Negative
674674
turbmod_sa_neg_rae2822 = TestCase('turbmod_sa_neg_rae2822')
675675
turbmod_sa_neg_rae2822.cfg_dir = "turbulence_models/sa/rae2822"
676676
turbmod_sa_neg_rae2822.cfg_file = "turb_SA_NEG_RAE2822.cfg"
677677
turbmod_sa_neg_rae2822.test_iter = 10
678-
turbmod_sa_neg_rae2822.test_vals = [-1.374695, 1.976506, 1.898195, 4.831133, 1.187310, 0.426019, -86764]
678+
turbmod_sa_neg_rae2822.test_vals = [-1.466238, 3.169232, 2.756518, 4.722767, 1.120253, 0.378675, -83444.000000]
679679
turbmod_sa_neg_rae2822.test_vals_aarch64 = [-1.347530, 1.439078, 1.306846, -1.928774, 1.480543, 0.571601, -91503]
680680
test_list.append(turbmod_sa_neg_rae2822)
681681

@@ -684,7 +684,7 @@ def main():
684684
turbmod_sa_comp_rae2822.cfg_dir = "turbulence_models/sa/rae2822"
685685
turbmod_sa_comp_rae2822.cfg_file = "turb_SA_COMP_RAE2822.cfg"
686686
turbmod_sa_comp_rae2822.test_iter = 20
687-
turbmod_sa_comp_rae2822.test_vals = [-2.004687, 0.742304, 0.497309, -5.266081, 0.809467, 0.062029]
687+
turbmod_sa_comp_rae2822.test_vals = [-2.004687, 0.742304, 0.497309, -5.266067, 0.809467, 0.062029]
688688
test_list.append(turbmod_sa_comp_rae2822)
689689

690690
# SA Edwards
@@ -708,7 +708,7 @@ def main():
708708
turbmod_sa_qcr_rae2822.cfg_dir = "turbulence_models/sa/rae2822"
709709
turbmod_sa_qcr_rae2822.cfg_file = "turb_SA_QCR_RAE2822.cfg"
710710
turbmod_sa_qcr_rae2822.test_iter = 20
711-
turbmod_sa_qcr_rae2822.test_vals = [-2.004793, 0.742353, 0.497315, -5.265974, 0.807841, 0.062027]
711+
turbmod_sa_qcr_rae2822.test_vals = [-2.004793, 0.742353, 0.497315, -5.265962, 0.807841, 0.062027]
712712
test_list.append(turbmod_sa_qcr_rae2822)
713713

714714
############################
@@ -880,7 +880,8 @@ def main():
880880
hb_rans_preconditioning.cfg_dir = "harmonic_balance/hb_rans_preconditioning"
881881
hb_rans_preconditioning.cfg_file = "davis.cfg"
882882
hb_rans_preconditioning.test_iter = 25
883-
hb_rans_preconditioning.test_vals = [-1.902097, 0.484069, 0.601483, 3.609005, -5.949274]
883+
hb_rans_preconditioning.tol = 0.00001
884+
hb_rans_preconditioning.test_vals = [-1.902098, 0.484070, 0.601481, 3.609002, -5.949360]
884885
test_list.append(hb_rans_preconditioning)
885886

886887
######################################
@@ -947,7 +948,7 @@ def main():
947948
ddes_flatplate.cfg_dir = "ddes/flatplate"
948949
ddes_flatplate.cfg_file = "ddes_flatplate.cfg"
949950
ddes_flatplate.test_iter = 10
950-
ddes_flatplate.test_vals = [-2.714758, -5.882733, -0.215005, 0.023783, -618.160000]
951+
ddes_flatplate.test_vals = [-2.714757, -5.882779, -0.215005, 0.023783, -618.130000]
951952
ddes_flatplate.unsteady = True
952953
test_list.append(ddes_flatplate)
953954

@@ -1436,7 +1437,7 @@ def main():
14361437
species2_primitiveVenturi_mixingmodel_viscosity.cfg_dir = "species_transport/venturi_primitive_3species"
14371438
species2_primitiveVenturi_mixingmodel_viscosity.cfg_file = "species2_primitiveVenturi_mixingmodel_viscosity.cfg"
14381439
species2_primitiveVenturi_mixingmodel_viscosity.test_iter = 50
1439-
species2_primitiveVenturi_mixingmodel_viscosity.test_vals = [-4.843487, -3.585775, -3.486490, -7.560246, -5.094190, 5.000000, -1.898139, 5.000000, -3.329399, 5.000000, -2.113219, 2.482224, 0.974144, 0.607217, 0.900862]
1440+
species2_primitiveVenturi_mixingmodel_viscosity.test_vals = [-4.843481, -3.585988, -3.486593, -7.560545, -5.094245, 5.000000, -1.898097, 5.000000, -3.328995, 5.000000, -2.113241, 2.482221, 0.974142, 0.607219, 0.900860]
14401441
test_list.append(species2_primitiveVenturi_mixingmodel_viscosity)
14411442

14421443
# 2 species (1 eq) primitive venturi mixing using mixing model including heat capacity and mass diffusivity

TestCases/parallel_regression_AD.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def main():
8383
discadj_rans_naca0012_sa.cfg_dir = "disc_adj_rans/naca0012"
8484
discadj_rans_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg"
8585
discadj_rans_naca0012_sa.test_iter = 10
86-
discadj_rans_naca0012_sa.test_vals = [-2.230578, 0.645001, 0.181590, -0.000018, 5.000000, -3.421214, 5.000000, -6.769609]
86+
discadj_rans_naca0012_sa.test_vals = [-2.230568, 0.644202, 0.181590, -0.000018, 5.000000, -3.421717, 5.000000, -6.769530]
8787
test_list.append(discadj_rans_naca0012_sa)
8888

8989
# Adjoint turbulent NACA0012 SST
@@ -255,8 +255,8 @@ def main():
255255
discadj_heat.cfg_dir = "disc_adj_heat"
256256
discadj_heat.cfg_file = "disc_adj_heat.cfg"
257257
discadj_heat.test_iter = 10
258-
discadj_heat.test_vals = [-2.226525, 0.603989, 0.000000, -6.256200]
259-
discadj_heat.test_vals_aarch64 = [-2.226525, 0.603989, 0.000000, -6.256200]
258+
discadj_heat.test_vals = [-2.226539, 0.605868, 0.000000, -6.256400]
259+
discadj_heat.test_vals_aarch64 = [-2.226539, 0.605868, 0.000000, -6.256400]
260260
test_list.append(discadj_heat)
261261

262262
###################################

TestCases/rans/naca0012/turb_NACA0012_sa.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ LINEAR_SOLVER_ITER= 20
6767
%
6868
CONV_NUM_METHOD_FLOW= ROE
6969
MUSCL_FLOW= YES
70-
SLOPE_LIMITER_FLOW= NONE
7170
JST_SENSOR_COEFF= ( 0.5, 0.02 )
7271
TIME_DISCRE_FLOW= EULER_IMPLICIT
7372

TestCases/serial_regression.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def main():
213213
rae2822_sa.cfg_dir = "rans/rae2822"
214214
rae2822_sa.cfg_file = "turb_SA_RAE2822.cfg"
215215
rae2822_sa.test_iter = 20
216-
rae2822_sa.test_vals = [-2.020123, -5.269330, 0.807147, 0.060499, -80603.000000]
216+
rae2822_sa.test_vals = [-2.020123, -5.269324, 0.807147, 0.060499, -80602.000000]
217217
test_list.append(rae2822_sa)
218218

219219
# RAE2822 SST
@@ -237,7 +237,7 @@ def main():
237237
turb_flatplate.cfg_dir = "rans/flatplate"
238238
turb_flatplate.cfg_file = "turb_SA_flatplate.cfg"
239239
turb_flatplate.test_iter = 20
240-
turb_flatplate.test_vals = [-4.157169, -6.736698, -0.176253, 0.057446] #last 4 columns
240+
turb_flatplate.test_vals = [-4.157358, -6.736289, -0.176258, 0.057431]
241241
test_list.append(turb_flatplate)
242242

243243
# FLAT PLATE, WALL FUNCTIONS, COMPRESSIBLE SST
@@ -253,24 +253,24 @@ def main():
253253
turb_wallfunction_flatplate_sa.cfg_dir = "wallfunctions/flatplate/compressible_SA"
254254
turb_wallfunction_flatplate_sa.cfg_file = "turb_SA_flatplate.cfg"
255255
turb_wallfunction_flatplate_sa.test_iter = 10
256-
turb_wallfunction_flatplate_sa.test_vals = [-4.436048, -2.044706, -2.114644, 0.979771, -5.393729, 10, -1.589465, 0.069744, 0.002686] #last 9 columns
256+
turb_wallfunction_flatplate_sa.test_vals = [-4.435719, -2.044696, -2.114266, 0.980115, -5.393813, 10.000000, -1.589802, 0.069744, 0.002686]
257257
test_list.append(turb_wallfunction_flatplate_sa)
258258

259259
# ONERA M6 Wing
260260
turb_oneram6 = TestCase('turb_oneram6')
261261
turb_oneram6.cfg_dir = "rans/oneram6"
262262
turb_oneram6.cfg_file = "turb_ONERAM6.cfg"
263263
turb_oneram6.test_iter = 10
264-
turb_oneram6.test_vals = [-2.388841, -6.689414, 0.230321, 0.157640, -32539.000000]
264+
turb_oneram6.test_vals = [-2.388841, -6.689427, 0.230321, 0.157640, -32539.000000]
265265
turb_oneram6.timeout = 3200
266266
test_list.append(turb_oneram6)
267267

268268
# NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242)
269269
turb_naca0012_sa = TestCase('turb_naca0012_sa')
270270
turb_naca0012_sa.cfg_dir = "rans/naca0012"
271271
turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg"
272-
turb_naca0012_sa.test_iter = 10
273-
turb_naca0012_sa.test_vals = [-8.629583, -10.377793, 1.064488, 0.019711, 20.000000, -2.173971, 20.000000, -5.213344, -46.50600]
272+
turb_naca0012_sa.test_iter = 5
273+
turb_naca0012_sa.test_vals = [-10.451742, -13.864841, 1.057622, 0.022916, 20.000000, -1.588482, 20.000000, -2.963093, -44.540000]
274274
turb_naca0012_sa.timeout = 3200
275275
test_list.append(turb_naca0012_sa)
276276

@@ -316,7 +316,7 @@ def main():
316316
propeller.cfg_dir = "rans/propeller"
317317
propeller.cfg_file = "propeller.cfg"
318318
propeller.test_iter = 10
319-
propeller.test_vals = [-3.389575, -8.409529, 0.000048, 0.056329] #last 4 columns
319+
propeller.test_vals = [-3.389575, -8.409251, 0.000048, 0.056329]
320320
propeller.timeout = 3200
321321
test_list.append(propeller)
322322

@@ -434,7 +434,7 @@ def main():
434434
inc_turb_naca0012.cfg_dir = "incomp_rans/naca0012"
435435
inc_turb_naca0012.cfg_file = "naca0012.cfg"
436436
inc_turb_naca0012.test_iter = 20
437-
inc_turb_naca0012.test_vals = [-4.788495, -11.040511, 0.000023, 0.309503] #last 4 columns
437+
inc_turb_naca0012.test_vals = [-4.788496, -11.039482, 0.000023, 0.309488]
438438
test_list.append(inc_turb_naca0012)
439439

440440
# NACA0012, SST_SUST
@@ -726,7 +726,7 @@ def main():
726726
hb_rans_preconditioning.cfg_dir = "harmonic_balance/hb_rans_preconditioning"
727727
hb_rans_preconditioning.cfg_file = "davis.cfg"
728728
hb_rans_preconditioning.test_iter = 25
729-
hb_rans_preconditioning.test_vals = [-1.902097, 0.484069, 0.601483, 3.609005, -5.949274]
729+
hb_rans_preconditioning.test_vals = [-1.902097, 0.484069, 0.601483, 3.609005, -5.949359]
730730
test_list.append(hb_rans_preconditioning)
731731

732732
######################################
@@ -793,7 +793,7 @@ def main():
793793
ddes_flatplate.cfg_dir = "ddes/flatplate"
794794
ddes_flatplate.cfg_file = "ddes_flatplate.cfg"
795795
ddes_flatplate.test_iter = 10
796-
ddes_flatplate.test_vals = [-2.714758, -5.882733, -0.215005, 0.023783, -618.160000]
796+
ddes_flatplate.test_vals = [-2.714757, -5.882779, -0.215005, 0.023783, -618.130000]
797797
ddes_flatplate.unsteady = True
798798
test_list.append(ddes_flatplate)
799799

@@ -802,7 +802,7 @@ def main():
802802
unst_inc_turb_naca0015_sa.cfg_dir = "unsteady/pitching_naca0015_rans_inc"
803803
unst_inc_turb_naca0015_sa.cfg_file = "config_incomp_turb_sa.cfg"
804804
unst_inc_turb_naca0015_sa.test_iter = 1
805-
unst_inc_turb_naca0015_sa.test_vals = [-3.007635, -6.879789, 1.445300, 0.419281] #last 4 columns
805+
unst_inc_turb_naca0015_sa.test_vals = [-3.007635, -6.879778, 1.445293, 0.419274]
806806
unst_inc_turb_naca0015_sa.unsteady = True
807807
test_list.append(unst_inc_turb_naca0015_sa)
808808

0 commit comments

Comments
 (0)