Skip to content

Corrections to SA-NEG-R and SA model #2014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bigfooted merged 29 commits into from
Jun 10, 2023
Merged

Corrections to SA-NEG-R and SA model #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f36202f
Added changes for HLPW5
Apr 20, 2023
f4992c6
Apply suggestions from code review
pcarruscag Apr 20, 2023
6333f54
- Code refactoring
Apr 21, 2023
0d905e1
Merge branch 'feature_SA_HLPW5' of https://github.com/su2code/SU2 int…
Apr 21, 2023
4d48a8e
Merge branch 'develop' into feature_SA_HLPW5
bigfooted Apr 25, 2023
3ea6d97
Merge branch 'develop' into feature_SA_HLPW5
bigfooted May 17, 2023
1459c2c
Merge branch 'develop' into feature_SA_HLPW5
bigfooted May 22, 2023
6b1a102
Merge branch 'develop' into feature_SA_HLPW5
bigfooted May 24, 2023
2bde41d
serial and parallel regression update for RESTART=NO
bigfooted May 24, 2023
316a69f
update more regressions
bigfooted May 25, 2023
c50072a
update some more residuals
bigfooted May 26, 2023
8f22cd8
update tutorial residuals, all small changes
bigfooted May 28, 2023
3d5be72
fix syntax error
bigfooted May 28, 2023
5cbeb8e
fix minus sign
bigfooted May 28, 2023
bc4c19f
change slope limiter
bigfooted May 29, 2023
638bbb8
modify nr of iterations
bigfooted May 29, 2023
f67e622
modify nr of iterations
bigfooted May 29, 2023
f393021
update naca0012 regressions
bigfooted May 29, 2023
1e4adcd
Correct vandv and tutorials
May 30, 2023
0ebae0a
corrected tutorials and vandv
May 30, 2023
79cf38e
Apply suggestions from code review
pcarruscag Jun 3, 2023
813b18e
Merge branch 'develop' into feature_SA_HLPW5
pcarruscag Jun 3, 2023
2926915
Merge branch 'develop' into feature_SA_HLPW5
bigfooted Jun 4, 2023
4b55c86
Merge branch 'develop' into feature_SA_HLPW5
bigfooted Jun 7, 2023
0392193
Merge branch 'develop' into feature_SA_HLPW5
bigfooted Jun 7, 2023
d0f5f52
update residuals for heat
bigfooted Jun 10, 2023
8eff9ae
update residuals for heat
bigfooted Jun 10, 2023
1a429f0
update residuals for heat
bigfooted Jun 10, 2023
0c33213
change back regression test to develop
bigfooted Jun 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions SU2_CFD/include/numerics/turbulent/turb_sources.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ struct CSAVariables {
const su2double cb2_sigma = cb2 / sigma;
const su2double cw1 = cb1 / k2 + (1 + cb2) / sigma;
const su2double cr1 = 0.5;
const su2double CRot = 1.0;
const su2double c2 = 0.7, c3 = 0.9;

/*--- List of auxiliary functions ---*/
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;
Expand Down Expand Up @@ -122,7 +124,9 @@ class CSourceBase_TurbSA : public CNumerics {

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

if (dist_i > 1e-10) {
Expand Down Expand Up @@ -303,9 +307,19 @@ struct ModVort {
struct Bsl {
static void get(const su2double& nue, const su2double& nu, CSAVariables& var) {
const su2double Sbar = nue * var.fv2 * var.inv_k2_d2;
var.Shat = var.S + Sbar;
var.Shat = max(var.Shat, 1.0e-10);
if (var.Shat <= 1.0e-10) {
const su2double c2 = 0.7, c3 = 0.9;

/*--- Limiting of \hat{S} based on "Modifications and Clarifications for the Implementation of the Spalart-Allmaras Turbulence Model"
* Note 1 option c in https://turbmodels.larc.nasa.gov/spalart.html ---*/
if (Sbar >= - c2 * var.S) {
var.Shat = var.S + Sbar;
} else {
const su2double Num = var.S * (c2 * c2 * var.S + c3 * Sbar);
const su2double Den = (c3 - 2 * c2) * var.S - Sbar;
var.Shat = var.S + Num / Den;
}
if (var.Shat <= 1e-10) {
var.Shat = 1e-10;
var.d_Shat = 0.0;
} else {
var.d_Shat = (var.fv2 + nue * var.d_fv2) * var.inv_k2_d2;
Expand Down
2 changes: 1 addition & 1 deletion SU2_CFD/src/solvers/CTurbSASolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void CTurbSASolver::Postprocessing(CGeometry *geometry, CSolver **solver_contain

su2double muT = rho*fv1*nu_hat;

if (neg_spalart_allmaras) muT = max(muT,0.0);
if (neg_spalart_allmaras && nu_hat < 0) muT = 0.0;

nodes->SetmuT(iPoint,muT);

Expand Down
16 changes: 8 additions & 8 deletions TestCases/hybrid_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def main():
rae2822_sa.cfg_dir = "rans/rae2822"
rae2822_sa.cfg_file = "turb_SA_RAE2822.cfg"
rae2822_sa.test_iter = 20
rae2822_sa.test_vals = [-2.020123, -5.269330, 0.807147, 0.060499, -80603.000000]
rae2822_sa.test_vals = [-2.020123, -5.269324, 0.807147, 0.060499, -80602.000000]
test_list.append(rae2822_sa)

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

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

Expand Down Expand Up @@ -242,7 +242,7 @@ def main():
propeller.cfg_dir = "rans/propeller"
propeller.cfg_file = "propeller.cfg"
propeller.test_iter = 10
propeller.test_vals = [-3.389575, -8.409529, 0.000048, 0.056329]
propeller.test_vals = [-3.389575, -8.409251, 0.000048, 0.056329]
test_list.append(propeller)

#######################################
Expand Down Expand Up @@ -408,7 +408,7 @@ def main():
inc_turb_naca0012.cfg_dir = "incomp_rans/naca0012"
inc_turb_naca0012.cfg_file = "naca0012.cfg"
inc_turb_naca0012.test_iter = 20
inc_turb_naca0012.test_vals = [-4.788405, -11.040493, 0.000008, 0.309506]
inc_turb_naca0012.test_vals = [-4.788405, -11.039465, 0.000008, 0.309490]
test_list.append(inc_turb_naca0012)

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

######################################
Expand Down Expand Up @@ -505,7 +505,7 @@ def main():
ddes_flatplate.cfg_dir = "ddes/flatplate"
ddes_flatplate.cfg_file = "ddes_flatplate.cfg"
ddes_flatplate.test_iter = 10
ddes_flatplate.test_vals = [-2.714758, -5.882733, -0.215005, 0.023783, -618.160000]
ddes_flatplate.test_vals = [-2.714757, -5.882779, -0.215005, 0.023783, -618.130000]
ddes_flatplate.unsteady = True
test_list.append(ddes_flatplate)

Expand Down
2 changes: 1 addition & 1 deletion TestCases/hybrid_regression_AD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def main():
discadj_rans_naca0012_sa.cfg_dir = "disc_adj_rans/naca0012"
discadj_rans_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg"
discadj_rans_naca0012_sa.test_iter = 10
discadj_rans_naca0012_sa.test_vals = [-2.230631, 0.644953, 0.177890, -0.000016, 5.000000, -3.007652, 5.000000, -7.631910]
discadj_rans_naca0012_sa.test_vals = [-2.230621, 0.644162, 0.177890, -0.000016, 5.000000, -3.007652, 5.000000, -7.728093]
discadj_rans_naca0012_sa.test_vals_aarch64 = [-2.230631, 0.644954, 0.177890, -0.000016, 5.000000, -3.007651, 5.000000, -7.631909]
test_list.append(discadj_rans_naca0012_sa)

Expand Down
33 changes: 17 additions & 16 deletions TestCases/parallel_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def main():
rae2822_sa.cfg_dir = "rans/rae2822"
rae2822_sa.cfg_file = "turb_SA_RAE2822.cfg"
rae2822_sa.test_iter = 20
rae2822_sa.test_vals = [-2.004689, -5.265793, 0.809463, 0.062016, -80577.000000]
rae2822_sa.test_vals = [-2.004689, -5.265782, 0.809463, 0.062016, -80576.000000]
test_list.append(rae2822_sa)

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

# Flat plate (compressible) with species inlet
turb_flatplate_species = TestCase('turb_flatplate_species')
turb_flatplate_species.cfg_dir = "rans/flatplate"
turb_flatplate_species.cfg_file = "turb_SA_flatplate_species.cfg"
turb_flatplate_species.test_iter = 20
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]
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]
test_list.append(turb_flatplate_species)

# ONERA M6 Wing
turb_oneram6 = TestCase('turb_oneram6')
turb_oneram6.cfg_dir = "rans/oneram6"
turb_oneram6.cfg_file = "turb_ONERAM6.cfg"
turb_oneram6.test_iter = 10
turb_oneram6.test_vals = [-2.388839, -6.689413, 0.230321, 0.157640, -32539.000000]
turb_oneram6.test_vals = [-2.388839, -6.689426, 0.230321, 0.157640, -32539.000000]
turb_oneram6.timeout = 3200
test_list.append(turb_oneram6)

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

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

Expand Down Expand Up @@ -468,7 +468,7 @@ def main():
propeller.cfg_dir = "rans/propeller"
propeller.cfg_file = "propeller.cfg"
propeller.test_iter = 10
propeller.test_vals = [-3.389575, -8.409529, 0.000048, 0.056329] #last 4 columns
propeller.test_vals = [-3.389575, -8.409251, 0.000048, 0.056329]
propeller.timeout = 3200
test_list.append(propeller)

Expand Down Expand Up @@ -581,7 +581,7 @@ def main():
inc_turb_naca0012.cfg_dir = "incomp_rans/naca0012"
inc_turb_naca0012.cfg_file = "naca0012.cfg"
inc_turb_naca0012.test_iter = 20
inc_turb_naca0012.test_vals = [-4.788595, -11.040557, -0.000002, 0.309519]
inc_turb_naca0012.test_vals = [-4.788596, -11.039529, -0.000002, 0.309504]
test_list.append(inc_turb_naca0012)

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

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

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

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

############################
Expand Down Expand Up @@ -880,7 +880,8 @@ def main():
hb_rans_preconditioning.cfg_dir = "harmonic_balance/hb_rans_preconditioning"
hb_rans_preconditioning.cfg_file = "davis.cfg"
hb_rans_preconditioning.test_iter = 25
hb_rans_preconditioning.test_vals = [-1.902097, 0.484069, 0.601483, 3.609005, -5.949274]
hb_rans_preconditioning.tol = 0.00001
hb_rans_preconditioning.test_vals = [-1.902098, 0.484070, 0.601481, 3.609002, -5.949360]
test_list.append(hb_rans_preconditioning)

######################################
Expand Down Expand Up @@ -947,7 +948,7 @@ def main():
ddes_flatplate.cfg_dir = "ddes/flatplate"
ddes_flatplate.cfg_file = "ddes_flatplate.cfg"
ddes_flatplate.test_iter = 10
ddes_flatplate.test_vals = [-2.714758, -5.882733, -0.215005, 0.023783, -618.160000]
ddes_flatplate.test_vals = [-2.714757, -5.882779, -0.215005, 0.023783, -618.130000]
ddes_flatplate.unsteady = True
test_list.append(ddes_flatplate)

Expand Down Expand Up @@ -1436,7 +1437,7 @@ def main():
species2_primitiveVenturi_mixingmodel_viscosity.cfg_dir = "species_transport/venturi_primitive_3species"
species2_primitiveVenturi_mixingmodel_viscosity.cfg_file = "species2_primitiveVenturi_mixingmodel_viscosity.cfg"
species2_primitiveVenturi_mixingmodel_viscosity.test_iter = 50
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]
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]
test_list.append(species2_primitiveVenturi_mixingmodel_viscosity)

# 2 species (1 eq) primitive venturi mixing using mixing model including heat capacity and mass diffusivity
Expand Down
6 changes: 3 additions & 3 deletions TestCases/parallel_regression_AD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def main():
discadj_rans_naca0012_sa.cfg_dir = "disc_adj_rans/naca0012"
discadj_rans_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg"
discadj_rans_naca0012_sa.test_iter = 10
discadj_rans_naca0012_sa.test_vals = [-2.230578, 0.645001, 0.181590, -0.000018, 5.000000, -3.421214, 5.000000, -6.769609]
discadj_rans_naca0012_sa.test_vals = [-2.230568, 0.644202, 0.181590, -0.000018, 5.000000, -3.421717, 5.000000, -6.769530]
test_list.append(discadj_rans_naca0012_sa)

# Adjoint turbulent NACA0012 SST
Expand Down Expand Up @@ -255,8 +255,8 @@ def main():
discadj_heat.cfg_dir = "disc_adj_heat"
discadj_heat.cfg_file = "disc_adj_heat.cfg"
discadj_heat.test_iter = 10
discadj_heat.test_vals = [-2.226525, 0.603989, 0.000000, -6.256200]
discadj_heat.test_vals_aarch64 = [-2.226525, 0.603989, 0.000000, -6.256200]
discadj_heat.test_vals = [-2.226539, 0.605868, 0.000000, -6.256400]
discadj_heat.test_vals_aarch64 = [-2.226539, 0.605868, 0.000000, -6.256400]
test_list.append(discadj_heat)

###################################
Expand Down
1 change: 0 additions & 1 deletion TestCases/rans/naca0012/turb_NACA0012_sa.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ LINEAR_SOLVER_ITER= 20
%
CONV_NUM_METHOD_FLOW= ROE
MUSCL_FLOW= YES
SLOPE_LIMITER_FLOW= NONE
JST_SENSOR_COEFF= ( 0.5, 0.02 )
TIME_DISCRE_FLOW= EULER_IMPLICIT

Expand Down
22 changes: 11 additions & 11 deletions TestCases/serial_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def main():
rae2822_sa.cfg_dir = "rans/rae2822"
rae2822_sa.cfg_file = "turb_SA_RAE2822.cfg"
rae2822_sa.test_iter = 20
rae2822_sa.test_vals = [-2.020123, -5.269330, 0.807147, 0.060499, -80603.000000]
rae2822_sa.test_vals = [-2.020123, -5.269324, 0.807147, 0.060499, -80602.000000]
test_list.append(rae2822_sa)

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

# FLAT PLATE, WALL FUNCTIONS, COMPRESSIBLE SST
Expand All @@ -253,24 +253,24 @@ def main():
turb_wallfunction_flatplate_sa.cfg_dir = "wallfunctions/flatplate/compressible_SA"
turb_wallfunction_flatplate_sa.cfg_file = "turb_SA_flatplate.cfg"
turb_wallfunction_flatplate_sa.test_iter = 10
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
turb_wallfunction_flatplate_sa.test_vals = [-4.435719, -2.044696, -2.114266, 0.980115, -5.393813, 10.000000, -1.589802, 0.069744, 0.002686]
test_list.append(turb_wallfunction_flatplate_sa)

# ONERA M6 Wing
turb_oneram6 = TestCase('turb_oneram6')
turb_oneram6.cfg_dir = "rans/oneram6"
turb_oneram6.cfg_file = "turb_ONERAM6.cfg"
turb_oneram6.test_iter = 10
turb_oneram6.test_vals = [-2.388841, -6.689414, 0.230321, 0.157640, -32539.000000]
turb_oneram6.test_vals = [-2.388841, -6.689427, 0.230321, 0.157640, -32539.000000]
turb_oneram6.timeout = 3200
test_list.append(turb_oneram6)

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

Expand Down Expand Up @@ -316,7 +316,7 @@ def main():
propeller.cfg_dir = "rans/propeller"
propeller.cfg_file = "propeller.cfg"
propeller.test_iter = 10
propeller.test_vals = [-3.389575, -8.409529, 0.000048, 0.056329] #last 4 columns
propeller.test_vals = [-3.389575, -8.409251, 0.000048, 0.056329]
propeller.timeout = 3200
test_list.append(propeller)

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

# NACA0012, SST_SUST
Expand Down Expand Up @@ -726,7 +726,7 @@ def main():
hb_rans_preconditioning.cfg_dir = "harmonic_balance/hb_rans_preconditioning"
hb_rans_preconditioning.cfg_file = "davis.cfg"
hb_rans_preconditioning.test_iter = 25
hb_rans_preconditioning.test_vals = [-1.902097, 0.484069, 0.601483, 3.609005, -5.949274]
hb_rans_preconditioning.test_vals = [-1.902097, 0.484069, 0.601483, 3.609005, -5.949359]
test_list.append(hb_rans_preconditioning)

######################################
Expand Down Expand Up @@ -793,7 +793,7 @@ def main():
ddes_flatplate.cfg_dir = "ddes/flatplate"
ddes_flatplate.cfg_file = "ddes_flatplate.cfg"
ddes_flatplate.test_iter = 10
ddes_flatplate.test_vals = [-2.714758, -5.882733, -0.215005, 0.023783, -618.160000]
ddes_flatplate.test_vals = [-2.714757, -5.882779, -0.215005, 0.023783, -618.130000]
ddes_flatplate.unsteady = True
test_list.append(ddes_flatplate)

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

Expand Down
Loading