From a639e9e85f1221f69b66626e42ae1a24d7d785dd Mon Sep 17 00:00:00 2001 From: Jayant Mukhopadhaya Date: Fri, 6 Mar 2020 15:09:04 -0800 Subject: [PATCH 1/8] made zeta calculation consistent between numerics and solver classes --- SU2_CFD/src/numerics/turbulent/turb_sources.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SU2_CFD/src/numerics/turbulent/turb_sources.cpp b/SU2_CFD/src/numerics/turbulent/turb_sources.cpp index 207dc5915e39..69eb4398a5d8 100644 --- a/SU2_CFD/src/numerics/turbulent/turb_sources.cpp +++ b/SU2_CFD/src/numerics/turbulent/turb_sources.cpp @@ -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); @@ -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; From 44d6ff32710145aa854ab958b46bea4a18d1dff2 Mon Sep 17 00:00:00 2001 From: Jayant Mukhopadhaya Date: Mon, 16 Mar 2020 14:10:29 -0700 Subject: [PATCH 2/8] update some TestCases configs --- TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg | 8 ++++---- .../transonic_stator_2D/transonic_stator_rst.cfg | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg index 0abf1b412fb4..88c1746170fc 100644 --- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg +++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg @@ -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 @@ -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 -----------------------------% % diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg index 404834b6cf9e..f0d310451960 100644 --- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg +++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg @@ -30,7 +30,7 @@ RESTART_SOL= YES % e.g. AOA, dCL/dAoA, dCD/dCL, iter, etc. % Note that AoA in the solution and geometry files is critical % to aero design using AoA as a variable. (NO, YES) -DISCARD_INFILES= YES +DISCARD_INFILES= NO % % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------% % From 873f3f2bd456ef2d6b3f22b0f066691732645c7b Mon Sep 17 00:00:00 2001 From: Jayant Mukhopadhaya Date: Mon, 16 Mar 2020 15:50:18 -0700 Subject: [PATCH 3/8] changed regression to run on fix_sst_term branch of TestCases --- .github/workflows/regression.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 4fa4c08a4a84..3318df015989 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -89,5 +89,5 @@ jobs: - name: Run Tests in Container uses: docker://su2code/test-su2:20200303 with: - args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} + args: -b ${{github.ref}} -t develop -c fix_sst_term -s ${{matrix.testscript}} From f8aa64fb1ccd397c291e896cee296249f5f37e79 Mon Sep 17 00:00:00 2001 From: Jayant Mukhopadhaya Date: Mon, 16 Mar 2020 21:06:11 -0700 Subject: [PATCH 4/8] update regression test values --- TestCases/parallel_regression.py | 34 ++++++++++++++--------------- TestCases/parallel_regression_AD.py | 4 ++-- TestCases/serial_regression.py | 34 ++++++++++++++--------------- TestCases/serial_regression_AD.py | 4 ++-- TestCases/tutorials.py | 2 +- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 6d15e0560ace..fa395a93bae0 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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.590195, -1.955395] #last 4 columns + bars_SST_2D.test_vals = [13.000000, -0.610348, -1.955395] #last 4 columns bars_SST_2D.su2_exec = "SU2_CFD" bars_SST_2D.timeout = 1600 bars_SST_2D.tol = 0.00001 @@ -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 diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py index 69ceb1be21aa..bbce49e4a1a3 100644 --- a/TestCases/parallel_regression_AD.py +++ b/TestCases/parallel_regression_AD.py @@ -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 @@ -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 diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 09657a95b35c..8d72dae1b3a4 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -234,7 +234,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.510641, 4.874876, 0.813353, 0.061455] #last 4 columns + rae2822_sst.test_vals = [-0.510641, 4.877423, 0.813358, 0.061455] #last 4 columns rae2822_sst.su2_exec = "SU2_CFD" rae2822_sst.new_output = True rae2822_sst.timeout = 1600 @@ -246,7 +246,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.427577, 4.874876, 0.813353, 0.061455] #last 4 columns + rae2822_sst_sust.test_vals = [-2.430811, 4.877422, 0.813358, 0.061455] #last 4 columns rae2822_sst_sust.su2_exec = "SU2_CFD" rae2822_sst_sust.timeout = 1600 rae2822_sst_sust.tol = 0.00001 @@ -293,7 +293,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.274504, -6.250399, 1.049989, 0.019166] #last 4 columns + turb_naca0012_sst.test_vals = [-15.273739, -6.243814, 1.049988, 0.019165] #last 4 columns turb_naca0012_sst.su2_exec = "SU2_CFD" turb_naca0012_sst.new_output = True turb_naca0012_sst.timeout = 3200 @@ -333,7 +333,7 @@ def main(): turb_naca0012_sst_restart_mg.cfg_file = "turb_NACA0012_sst_multigrid_restart.cfg" turb_naca0012_sst_restart_mg.test_iter = 50 turb_naca0012_sst_restart_mg.ntest_vals = 5 - turb_naca0012_sst_restart_mg.test_vals = [-7.708053, -8.082473, -3.175091, -0.000015, 0.081277] #last 5 columns + turb_naca0012_sst_restart_mg.test_vals = [-7.653492, -7.729550, -1.981855, -0.000015, 0.079062] #last 5 columns turb_naca0012_sst_restart_mg.su2_exec = "SU2_CFD" turb_naca0012_sst_restart_mg.new_output = True turb_naca0012_sst_restart_mg.timeout = 3200 @@ -464,7 +464,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.276170, 0.145809, 0.000021, 0.312006] #last 4 columns + inc_turb_naca0012_sst_sust.test_vals = [-7.276273, 0.145895, 0.000021, 0.312004] #last 4 columns inc_turb_naca0012_sst_sust.su2_exec = "SU2_CFD" inc_turb_naca0012_sst_sust.timeout = 1600 inc_turb_naca0012_sst_sust.tol = 0.00001 @@ -754,7 +754,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.910211, 1.337024, 6.085849, 2.414025] #last 4 columns + turb_naca0012_1c.test_vals = [-4.910234, 1.336999, 6.085853, 2.414023] #last 4 columns turb_naca0012_1c.su2_exec = "SU2_CFD" turb_naca0012_1c.new_output = True turb_naca0012_1c.timeout = 1600 @@ -766,7 +766,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.230242, 1.262219, 6.085926, 2.413617] #last 4 columns + turb_naca0012_2c.test_vals = [-5.230242, 1.262219, 6.085930, 2.413616] #last 4 columns turb_naca0012_2c.su2_exec = "SU2_CFD" turb_naca0012_2c.new_output = True turb_naca0012_2c.timeout = 1600 @@ -778,7 +778,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.277131, 1.246268, 6.086537, 2.413873] #last 4 columns + turb_naca0012_3c.test_vals = [-5.277131, 1.246268, 6.086540, 2.413871] #last 4 columns turb_naca0012_3c.su2_exec = "SU2_CFD" turb_naca0012_3c.new_output = True turb_naca0012_3c.timeout = 1600 @@ -790,7 +790,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.003327, 1.312032, 6.085201, 2.413460] #last 4 columns + turb_naca0012_p1c1.test_vals = [-5.003243, 1.312116, 6.085204, 2.413457] #last 4 columns turb_naca0012_p1c1.su2_exec = "SU2_CFD" turb_naca0012_p1c1.new_output = True turb_naca0012_p1c1.timeout = 1600 @@ -802,7 +802,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.263992, 1.251332, 6.085705, 2.413434] #last 4 columns + turb_naca0012_p1c2.test_vals = [-5.264016, 1.251321, 6.085704, 2.413428] #last 4 columns turb_naca0012_p1c2.su2_exec = "SU2_CFD" turb_naca0012_p1c2.new_output = True turb_naca0012_p1c2.timeout = 1600 @@ -983,7 +983,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.316334, 0.355080, 44.772250, 2.269935] #last 4 columns + Jones_tc.test_vals = [-5.300315, 0.365965, 44.731520, 2.271338] #last 4 columns Jones_tc.su2_exec = "SU2_CFD" Jones_tc.new_output = False Jones_tc.timeout = 1600 @@ -995,7 +995,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.034158, 0.013762, 82.263710, 2.792251] #last 4 columns + Jones_tc_rst.test_vals = [-4.626481, -1.570875, 34.015260, 10.187090] #last 4 columns Jones_tc_rst.su2_exec = "SU2_CFD" Jones_tc_rst.new_output = False Jones_tc_rst.timeout = 1600 @@ -1007,7 +1007,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.933250, 5.305273, 73.357650, 1.841297] #last 4 columns + axial_stage2D.test_vals = [-1.933218, 5.381191, 73.357940, 1.780224] #last 4 columns axial_stage2D.su2_exec = "SU2_CFD" axial_stage2D.new_output = False axial_stage2D.timeout = 1600 @@ -1019,7 +1019,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.560463, 5.828675, 96.594070, 0.062505] #last 4 columns + transonic_stator.test_vals = [-0.562939, 5.828438, 96.597350, 0.062502] #last 4 columns transonic_stator.su2_exec = "SU2_CFD" transonic_stator.new_output = False transonic_stator.timeout = 1600 @@ -1031,7 +1031,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.781212, -0.757588, 5.007406, 0.0029491] #last 4 columns + transonic_stator_rst.test_vals = [-6.601169, -0.619939, 5.002986, 0.002951] #last 4 columns transonic_stator_rst.su2_exec = "SU2_CFD" transonic_stator_rst.new_output = False transonic_stator_rst.timeout = 1600 @@ -1134,7 +1134,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.590195, -1.955395] #last 3 columns + bars_SST_2D.test_vals = [13.000000, -0.610348, -1.955395] #last 3 columns bars_SST_2D.su2_exec = "SU2_CFD" bars_SST_2D.timeout = 1600 bars_SST_2D.tol = 0.00001 @@ -1720,7 +1720,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.274504, -6.250399, 1.049989, 0.019166] #last 4 columns + pywrapper_turb_naca0012_sst.test_vals = [-15.273739, -6.243814, 1.049988, 0.019165] #last 4 columns pywrapper_turb_naca0012_sst.su2_exec = "SU2_CFD.py -f" pywrapper_turb_naca0012_sst.new_output = True pywrapper_turb_naca0012_sst.timeout = 3200 diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py index e90b5d0e973a..203fa3de09e9 100644 --- a/TestCases/serial_regression_AD.py +++ b/TestCases/serial_regression_AD.py @@ -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.216474, -0.485913, 0.109490, 0.000011] #last 4 columns + discadj_rans_naca0012_sst.test_vals = [-2.220785, -0.491929, 0.558190, 0.000027] #last 4 columns discadj_rans_naca0012_sst.su2_exec = "SU2_CFD_AD" discadj_rans_naca0012_sst.timeout = 1600 discadj_rans_naca0012_sst.tol = 0.00001 @@ -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.845578, -2.414024, -8.420179, 0.000000] #last 4 columns + discadj_incomp_turb_NACA0012_sst.test_vals = [-3.846768, -2.403601, -8.418993, 0.000000] #last 4 columns discadj_incomp_turb_NACA0012_sst.su2_exec = "SU2_CFD_AD" discadj_incomp_turb_NACA0012_sst.timeout = 1600 discadj_incomp_turb_NACA0012_sst.tol = 0.00001 diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index fdfd0b9f84c4..632506e34e59 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -144,7 +144,7 @@ def main(): tutorial_nicfd_nozzle.cfg_dir = "../Tutorials/compressible_flow/NICFD_nozzle" tutorial_nicfd_nozzle.cfg_file = "NICFD_nozzle.cfg" tutorial_nicfd_nozzle.test_iter = 20 - tutorial_nicfd_nozzle.test_vals = [-1.909272, -6.414647, 4.284189, 0.000000, 0.000000] + tutorial_nicfd_nozzle.test_vals = [-1.909272, -6.407306, 4.284191, 0.000000, 0.000000] tutorial_nicfd_nozzle.su2_exec = "mpirun -np 2 SU2_CFD" tutorial_nicfd_nozzle.timeout = 1600 tutorial_nicfd_nozzle.tol = 0.00001 From 925cb1ac89c1f8def2142e66139929ad278d8f65 Mon Sep 17 00:00:00 2001 From: Jayant Mukhopadhaya Date: Mon, 16 Mar 2020 21:17:12 -0700 Subject: [PATCH 5/8] update disc_adj_turbomachinary transonic stator regression values --- TestCases/parallel_regression_AD.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py index bbce49e4a1a3..e63623cc42cf 100644 --- a/TestCases/parallel_regression_AD.py +++ b/TestCases/parallel_regression_AD.py @@ -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 From fa9b50dce5fb08f6ed24195e4489d9b1c4b367b6 Mon Sep 17 00:00:00 2001 From: Jayant Mukhopadhaya Date: Mon, 16 Mar 2020 22:03:51 -0700 Subject: [PATCH 6/8] update regression values for naca0012 sst-sust case --- TestCases/parallel_regression.py | 2 +- TestCases/serial_regression.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index fa395a93bae0..085493b82dcc 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -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 diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 8d72dae1b3a4..e13d1a3a7e09 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -305,7 +305,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.851294, -5.980664, 1.005228, 0.019014] #last 4 columns + turb_naca0012_sst_sust.test_vals = [-14.851215, -6.062229, 1.005233, 0.019014] #last 4 columns turb_naca0012_sst_sust.su2_exec = "SU2_CFD" turb_naca0012_sst_sust.timeout = 3200 turb_naca0012_sst_sust.tol = 0.00001 From 2125a7a24ffd5afd0eab647e265e93580245d3a0 Mon Sep 17 00:00:00 2001 From: Jayant Mukhopadhaya Date: Thu, 26 Mar 2020 22:15:30 -0700 Subject: [PATCH 7/8] revert regression workflow to work with develop branch of testcases --- .github/workflows/regression.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 3318df015989..4fa4c08a4a84 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -89,5 +89,5 @@ jobs: - name: Run Tests in Container uses: docker://su2code/test-su2:20200303 with: - args: -b ${{github.ref}} -t develop -c fix_sst_term -s ${{matrix.testscript}} + args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} From b9565f78548b45ff117dfe4cf32694f2085a409f Mon Sep 17 00:00:00 2001 From: Jayant Mukhopadhaya Date: Thu, 26 Mar 2020 22:46:56 -0700 Subject: [PATCH 8/8] update regression values after merge --- TestCases/parallel_regression.py | 2 +- TestCases/serial_regression.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index e0e8f2dba1c2..1cfcf1f85b62 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -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 diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index d4203010cd38..69cd1536926e 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -1134,7 +1134,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 3 columns + bars_SST_2D.test_vals = [13.000000, -0.619179, -1.879082] #last 3 columns bars_SST_2D.su2_exec = "SU2_CFD" bars_SST_2D.timeout = 1600 bars_SST_2D.tol = 0.00001