Skip to content

Fix for turbulent viscosity calculation in SST Solver #905

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
jayantmukho merged 9 commits into from
Mar 27, 2020
Merged

Fix for turbulent viscosity calculation in SST Solver #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a639e9e
made zeta calculation consistent between numerics and solver classes
jayantmukho Mar 6, 2020
44d6ff3
update some TestCases configs
jayantmukho Mar 16, 2020
873f3f2
changed regression to run on fix_sst_term branch of TestCases
jayantmukho Mar 16, 2020
f8aa64f
update regression test values
jayantmukho Mar 17, 2020
925cb1a
update disc_adj_turbomachinary transonic stator regression values
jayantmukho Mar 17, 2020
fa9b50d
update regression values for naca0012 sst-sust case
jayantmukho Mar 17, 2020
1f99eb6
merge with develop
jayantmukho Mar 27, 2020
2125a7a
revert regression workflow to work with develop branch of testcases
jayantmukho Mar 27, 2020
b9565f7
update regression values after merge
jayantmukho Mar 27, 2020
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
7 changes: 5 additions & 2 deletions SU2_CFD/src/numerics/turbulent/turb_sources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,9 @@ CNumerics::ResidualType<> CSourcePieceWise_TurbSST::ComputeResidual(const CConfi
unsigned short iDim;
su2double alfa_blended, beta_blended;
su2double diverg, pk, pw, zeta;
su2double VorticityMag = sqrt(Vorticity_i[0]*Vorticity_i[0] +
Vorticity_i[1]*Vorticity_i[1] +
Vorticity_i[2]*Vorticity_i[2]);

if (incompressible) {
AD::SetPreaccIn(V_i, nDim+6);
Expand Down Expand Up @@ -846,12 +849,12 @@ CNumerics::ResidualType<> CSourcePieceWise_TurbSST::ComputeResidual(const CConfi
pk = min(pk,20.0*beta_star*Density_i*TurbVar_i[1]*TurbVar_i[0]);
pk = max(pk,0.0);

zeta = max(TurbVar_i[1], StrainMag_i*F2_i/a1);
zeta = max(TurbVar_i[1], VorticityMag*F2_i/a1);

/* if using UQ methodolgy, calculate production using perturbed Reynolds stress matrix */

if (using_uq){
pw = PerturbedStrainMag * PerturbedStrainMag - 2.0/3.0*zeta*diverg;
pw = PerturbedStrainMag * PerturbedStrainMag - 2.0/3.0*zeta*diverg;
}
else {
pw = StrainMag_i*StrainMag_i - 2.0/3.0*zeta*diverg;
Expand Down
8 changes: 4 additions & 4 deletions TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ CFL_NUMBER= 10.0
MAX_DELTA_TIME= 1E10
%
% Adaptive CFL number (NO, YES)
CFL_ADAPT= NO
CFL_ADAPT= YES
%
% Parameters of the adaptive CFL number (factor down, factor up, CFL min value,
% CFL max value )
CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
CFL_ADAPT_PARAM= ( 0.1, 1.2, 1.0, 100.0 )
%
% Number of total iterations
ITER= 10000
Expand All @@ -110,13 +110,13 @@ LIMITER_ITER= 99999
LINEAR_SOLVER= FGMRES
%
% Preconditioner of the Krylov linear solver (ILU, LU_SGS, LINELET, JACOBI)
LINEAR_SOLVER_PREC= LU_SGS
LINEAR_SOLVER_PREC= ILU
%
% Minimum error of the linear solver for implicit formulations
LINEAR_SOLVER_ERROR= 1E-10
%
% Max number of iterations of the linear solver for the implicit formulation
LINEAR_SOLVER_ITER= 2
LINEAR_SOLVER_ITER= 10

% -------------------------- MULTIGRID PARAMETERS -----------------------------%
%
Expand Down
36 changes: 18 additions & 18 deletions TestCases/parallel_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def main():
rae2822_sst.cfg_dir = "rans/rae2822"
rae2822_sst.cfg_file = "turb_SST_RAE2822.cfg"
rae2822_sst.test_iter = 20
rae2822_sst.test_vals = [-0.510623, 4.874845, 0.817046, 0.062059] #last 4 columns
rae2822_sst.test_vals = [-0.510623, 4.877370, 0.817050, 0.062058] #last 4 columns
rae2822_sst.su2_exec = "parallel_computation.py -f"
rae2822_sst.timeout = 1600
rae2822_sst.tol = 0.00001
Expand All @@ -210,7 +210,7 @@ def main():
rae2822_sst_sust.cfg_dir = "rans/rae2822"
rae2822_sst_sust.cfg_file = "turb_SST_SUST_RAE2822.cfg"
rae2822_sst_sust.test_iter = 20
rae2822_sst_sust.test_vals = [-2.427686, 4.874845, 0.817046, 0.062059] #last 4 columns
rae2822_sst_sust.test_vals = [-2.430819, 4.877370, 0.817050, 0.062058] #last 4 columns
rae2822_sst_sust.su2_exec = "parallel_computation.py -f"
rae2822_sst_sust.timeout = 1600
rae2822_sst_sust.tol = 0.00001
Expand Down Expand Up @@ -254,7 +254,7 @@ def main():
turb_naca0012_sst.cfg_dir = "rans/naca0012"
turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg"
turb_naca0012_sst.test_iter = 10
turb_naca0012_sst.test_vals = [-15.274205, -6.250384, 1.049989, 0.019166] #last 4 columns
turb_naca0012_sst.test_vals = [-15.273461, -6.243802, 1.049988, 0.019165] #last 4 columns
turb_naca0012_sst.su2_exec = "parallel_computation.py -f"
turb_naca0012_sst.timeout = 3200
turb_naca0012_sst.tol = 0.00001
Expand All @@ -265,7 +265,7 @@ def main():
turb_naca0012_sst_sust.cfg_dir = "rans/naca0012"
turb_naca0012_sst_sust.cfg_file = "turb_NACA0012_sst_sust.cfg"
turb_naca0012_sst_sust.test_iter = 10
turb_naca0012_sst_sust.test_vals = [-14.851291, -5.980663, 1.005228, 0.019014] #last 4 columns
turb_naca0012_sst_sust.test_vals = [-14.851212, -6.062226, 1.005233, 0.019014] #last 4 columns
turb_naca0012_sst_sust.su2_exec = "parallel_computation.py -f"
turb_naca0012_sst_sust.timeout = 3200
turb_naca0012_sst_sust.tol = 0.00001
Expand All @@ -292,7 +292,7 @@ def main():
turb_naca0012_sst_restart_mg.cfg_file = "turb_NACA0012_sst_multigrid_restart.cfg"
turb_naca0012_sst_restart_mg.test_iter = 20
turb_naca0012_sst_restart_mg.ntest_vals = 5
turb_naca0012_sst_restart_mg.test_vals = [-7.826679, -8.082385, -3.174847, -0.000015, 0.081277] #last 5 columns
turb_naca0012_sst_restart_mg.test_vals = [-7.627853, -7.729525, -1.981053, -0.000016, 0.079062] #last 5 columns
turb_naca0012_sst_restart_mg.su2_exec = "parallel_computation.py -f"
turb_naca0012_sst_restart_mg.timeout = 3200
turb_naca0012_sst_restart_mg.tol = 0.000001
Expand Down Expand Up @@ -392,7 +392,7 @@ def main():
inc_turb_naca0012_sst_sust.cfg_dir = "incomp_rans/naca0012"
inc_turb_naca0012_sst_sust.cfg_file = "naca0012_SST_SUST.cfg"
inc_turb_naca0012_sst_sust.test_iter = 20
inc_turb_naca0012_sst_sust.test_vals = [-7.276357, 0.146097, -0.000000, 0.312019] #last 4 columns
inc_turb_naca0012_sst_sust.test_vals = [-7.276480, 0.146181, -0.000000, 0.312017] #last 4 columns
inc_turb_naca0012_sst_sust.su2_exec = "parallel_computation.py -f"
inc_turb_naca0012_sst_sust.timeout = 1600
inc_turb_naca0012_sst_sust.tol = 0.00001
Expand Down Expand Up @@ -631,7 +631,7 @@ def main():
turb_naca0012_1c.cfg_dir = "rans_uq/naca0012"
turb_naca0012_1c.cfg_file = "turb_NACA0012_uq_1c.cfg"
turb_naca0012_1c.test_iter = 10
turb_naca0012_1c.test_vals = [-4.907889, 1.337608, 6.052866, 2.396063] #last 4 columns
turb_naca0012_1c.test_vals = [-4.907887, 1.337602, 6.052973, 2.396141] #last 4 columns
turb_naca0012_1c.su2_exec = "parallel_computation.py -f"
turb_naca0012_1c.timeout = 1600
turb_naca0012_1c.tol = 0.00001
Expand All @@ -642,7 +642,7 @@ def main():
turb_naca0012_2c.cfg_dir = "rans_uq/naca0012"
turb_naca0012_2c.cfg_file = "turb_NACA0012_uq_2c.cfg"
turb_naca0012_2c.test_iter = 10
turb_naca0012_2c.test_vals = [-5.230205, 1.262234, 6.052183, 2.395669] #last 4 columns
turb_naca0012_2c.test_vals = [-5.230200, 1.262237, 6.052195, 2.395673] #last 4 columns
turb_naca0012_2c.su2_exec = "parallel_computation.py -f"
turb_naca0012_2c.timeout = 1600
turb_naca0012_2c.tol = 0.00001
Expand All @@ -653,7 +653,7 @@ def main():
turb_naca0012_3c.cfg_dir = "rans_uq/naca0012"
turb_naca0012_3c.cfg_file = "turb_NACA0012_uq_3c.cfg"
turb_naca0012_3c.test_iter = 10
turb_naca0012_3c.test_vals = [-5.277132, 1.246269, 6.052474, 2.395999] #last 4 columns
turb_naca0012_3c.test_vals = [-5.277132, 1.246270, 6.052487, 2.396003] #last 4 columns
turb_naca0012_3c.su2_exec = "parallel_computation.py -f"
turb_naca0012_3c.timeout = 1600
turb_naca0012_3c.tol = 0.00001
Expand All @@ -664,7 +664,7 @@ def main():
turb_naca0012_p1c1.cfg_dir = "rans_uq/naca0012"
turb_naca0012_p1c1.cfg_file = "turb_NACA0012_uq_p1c1.cfg"
turb_naca0012_p1c1.test_iter = 10
turb_naca0012_p1c1.test_vals = [-5.008192, 1.310849, 6.054689, 2.397346] #last 4 columns
turb_naca0012_p1c1.test_vals = [-5.008135, 1.310806, 6.054703, 2.397351] #last 4 columns
turb_naca0012_p1c1.su2_exec = "parallel_computation.py -f"
turb_naca0012_p1c1.timeout = 1600
turb_naca0012_p1c1.tol = 0.00001
Expand All @@ -675,7 +675,7 @@ def main():
turb_naca0012_p1c2.cfg_dir = "rans_uq/naca0012"
turb_naca0012_p1c2.cfg_file = "turb_NACA0012_uq_p1c2.cfg"
turb_naca0012_p1c2.test_iter = 10
turb_naca0012_p1c2.test_vals = [-5.264112, 1.251274, 6.054818, 2.397393] #last 4 columns
turb_naca0012_p1c2.test_vals = [-5.264104, 1.251278, 6.054839, 2.397401] #last 4 columns
turb_naca0012_p1c2.su2_exec = "parallel_computation.py -f"
turb_naca0012_p1c2.timeout = 1600
turb_naca0012_p1c2.tol = 0.00001
Expand Down Expand Up @@ -834,7 +834,7 @@ def main():
Jones_tc.cfg_dir = "turbomachinery/APU_turbocharger"
Jones_tc.cfg_file = "Jones.cfg"
Jones_tc.test_iter = 5
Jones_tc.test_vals = [-5.316335, 0.355081, 44.772280, 2.269966] #last 4 columns
Jones_tc.test_vals = [-5.300315, 0.365966, 44.731500, 2.271371] #last 4 columns
Jones_tc.su2_exec = "parallel_computation.py -f"
Jones_tc.timeout = 1600
Jones_tc.new_output = False
Expand All @@ -846,7 +846,7 @@ def main():
Jones_tc_rst.cfg_dir = "turbomachinery/APU_turbocharger"
Jones_tc_rst.cfg_file = "Jones_rst.cfg"
Jones_tc_rst.test_iter = 5
Jones_tc_rst.test_vals = [-3.034157, 0.013763, 82.263700, 2.792251] #last 4 columns
Jones_tc_rst.test_vals = [-4.626438, -1.570818, 34.014660, 10.187090] #last 4 columns
Jones_tc_rst.su2_exec = "parallel_computation.py -f"
Jones_tc_rst.timeout = 1600
Jones_tc_rst.new_output = False
Expand All @@ -858,7 +858,7 @@ def main():
axial_stage2D.cfg_dir = "turbomachinery/axial_stage_2D"
axial_stage2D.cfg_file = "Axial_stage2D.cfg"
axial_stage2D.test_iter = 20
axial_stage2D.test_vals = [-1.933241, 5.310060, 73.357650, 1.841414] #last 4 columns
axial_stage2D.test_vals = [-1.933205, 5.381305, 73.357930, 1.780284] #last 4 columns
axial_stage2D.su2_exec = "parallel_computation.py -f"
axial_stage2D.timeout = 1600
axial_stage2D.new_output = False
Expand All @@ -870,7 +870,7 @@ def main():
transonic_stator.cfg_dir = "turbomachinery/transonic_stator_2D"
transonic_stator.cfg_file = "transonic_stator.cfg"
transonic_stator.test_iter = 20
transonic_stator.test_vals = [-0.574097, 5.820577, 96.994270, 0.062868] #last 4 columns
transonic_stator.test_vals = [-0.576128, 5.820136, 96.994800, 0.062868] #last 4 columns
transonic_stator.su2_exec = "parallel_computation.py -f"
transonic_stator.timeout = 1600
transonic_stator.new_output = False
Expand All @@ -882,7 +882,7 @@ def main():
transonic_stator_rst.cfg_dir = "turbomachinery/transonic_stator_2D"
transonic_stator_rst.cfg_file = "transonic_stator_rst.cfg"
transonic_stator_rst.test_iter = 20
transonic_stator_rst.test_vals = [-6.797150, -0.755136, 5.007406, 0.0029491] #last 4 columns
transonic_stator_rst.test_vals = [-6.618297, -0.617100, 5.002986, 0.002951] #last 4 columns
transonic_stator_rst.su2_exec = "parallel_computation.py -f"
transonic_stator_rst.timeout = 1600
transonic_stator_rst.new_output = False
Expand Down Expand Up @@ -976,7 +976,7 @@ def main():
bars_SST_2D.cfg_dir = "sliding_interface/bars_SST_2D"
bars_SST_2D.cfg_file = "bars.cfg"
bars_SST_2D.test_iter = 13
bars_SST_2D.test_vals = [13.000000, -0.598555, -1.879082] #last 4 columns
bars_SST_2D.test_vals = [13.000000, -0.619179, -1.879082] #last 4 columns
bars_SST_2D.su2_exec = "SU2_CFD"
bars_SST_2D.timeout = 1600
bars_SST_2D.tol = 0.00001
Expand Down Expand Up @@ -1161,7 +1161,7 @@ def main():
pywrapper_turb_naca0012_sst.cfg_dir = "rans/naca0012"
pywrapper_turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg"
pywrapper_turb_naca0012_sst.test_iter = 10
pywrapper_turb_naca0012_sst.test_vals = [-15.274205, -6.250384, 1.049989, 0.019166] #last 4 columns
pywrapper_turb_naca0012_sst.test_vals = [-15.273461, -6.243802, 1.049988, 0.019165] #last 4 columns
pywrapper_turb_naca0012_sst.su2_exec = "mpirun -np 2 SU2_CFD.py --parallel -f"
pywrapper_turb_naca0012_sst.timeout = 3200
pywrapper_turb_naca0012_sst.tol = 0.00001
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 @@ -95,7 +95,7 @@ def main():
discadj_rans_naca0012_sst.cfg_dir = "disc_adj_rans/naca0012"
discadj_rans_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg"
discadj_rans_naca0012_sst.test_iter = 10
discadj_rans_naca0012_sst.test_vals = [-2.223209, -0.496681, 0.154390, -0.000022] #last 4 columns
discadj_rans_naca0012_sst.test_vals = [-2.220785, -0.491471, 0.558190, 0.000027] #last 4 columns
discadj_rans_naca0012_sst.su2_exec = "parallel_computation.py -f"
discadj_rans_naca0012_sst.timeout = 1600
discadj_rans_naca0012_sst.tol = 0.00001
Expand Down Expand Up @@ -151,7 +151,7 @@ def main():
discadj_incomp_turb_NACA0012_sst.cfg_dir = "disc_adj_incomp_rans/naca0012"
discadj_incomp_turb_NACA0012_sst.cfg_file = "turb_naca0012_sst.cfg"
discadj_incomp_turb_NACA0012_sst.test_iter = 10
discadj_incomp_turb_NACA0012_sst.test_vals = [-3.845625, -2.413047, -8.419973, 0.000000] #last 4 columns
discadj_incomp_turb_NACA0012_sst.test_vals = [-3.846817, -2.399988, -8.418786, 0.000000] #last 4 columns
discadj_incomp_turb_NACA0012_sst.su2_exec = "parallel_computation.py -f"
discadj_incomp_turb_NACA0012_sst.timeout = 1600
discadj_incomp_turb_NACA0012_sst.tol = 0.00001
Expand Down Expand Up @@ -247,7 +247,7 @@ def main():
discadj_trans_stator.cfg_dir = "disc_adj_turbomachinery/transonic_stator_2D"
discadj_trans_stator.cfg_file = "transonic_stator.cfg"
discadj_trans_stator.test_iter = 79
discadj_trans_stator.test_vals = [79.000000, -1.927271, -1.401487] #last 4 columns
discadj_trans_stator.test_vals = [79.000000, -1.942130, -2.018512] #last 4 columns
discadj_trans_stator.su2_exec = "parallel_computation.py -f"
discadj_trans_stator.timeout = 1600
discadj_trans_stator.tol = 0.00001
Expand Down
Loading