From f36202f4f31e47e3974cc7b44207c8bf4ae8a700 Mon Sep 17 00:00:00 2001 From: rois1995 Date: Thu, 20 Apr 2023 11:25:11 +0200 Subject: [PATCH 01/20] Added changes for HLPW5 --- .../numerics/turbulent/turb_sources.hpp | 38 ++++++++++++++++--- SU2_CFD/src/output/CFlowOutput.cpp | 3 ++ SU2_CFD/src/solvers/CTurbSASolver.cpp | 2 +- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/SU2_CFD/include/numerics/turbulent/turb_sources.hpp b/SU2_CFD/include/numerics/turbulent/turb_sources.hpp index 704403746fc4..c56b71646e83 100644 --- a/SU2_CFD/include/numerics/turbulent/turb_sources.hpp +++ b/SU2_CFD/include/numerics/turbulent/turb_sources.hpp @@ -48,6 +48,7 @@ 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; // It should be 2.0, but the HLPW5 wants 1.0 /*--- 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; @@ -122,7 +123,8 @@ 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); + if(ScalarVar_i[0] < 0 ) var.Omega = abs(var.Omega); } if (dist_i > 1e-10) { @@ -303,12 +305,36 @@ 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) { - var.d_Shat = 0.0; + const su2double c2 = 0.7, c3 = 0.9; + + if(Sbar >= - c2 * var.S){ + var.Shat = var.S + Sbar; + var.Shat = max(var.Shat, 1.0e-10); + if (var.Shat <= 1.0e-10) { + var.d_Shat = 0.0; + } else { + var.d_Shat = (var.fv2 + nue * var.d_fv2) * var.inv_k2_d2; + } } else { - var.d_Shat = (var.fv2 + nue * var.d_fv2) * var.inv_k2_d2; + 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; + var.Shat = max(var.Shat, 1.0e-10); + + if (var.Shat <= 1.0e-10) { + var.d_Shat = 0.0; + } else { + const su2double d_Sbar = (var.fv2 + nue * var.d_fv2); + const su2double k2_d2 = var.k2 * var.dist_i_2; + const su2double num1 = c2*c2 * var.S*var.S * k2_d2; + const su2double den1 = pow(k2_d2 * (c3-2*c2) * var.S - nue * var.fv2, 2.0); + const su2double num2_1 = c3*var.S*(k2_d2 * (c3-2*c2)*var.S - nue*var.fv2); + const su2double num2_2 = c3*var.S*nue*var.fv2; + const su2double den2 = pow(k2_d2* (c3-2*c2) * var.S - nue*var.fv2, 2.0); + + var.d_Shat = num1*d_Sbar/den1 + (num2_1+num2_2)*d_Sbar/den2 ; + } } } }; diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp index 3fc02d126e75..3e6a92328323 100644 --- a/SU2_CFD/src/output/CFlowOutput.cpp +++ b/SU2_CFD/src/output/CFlowOutput.cpp @@ -1371,6 +1371,8 @@ void CFlowOutput::AddAerodynamicCoefficients(const CConfig* config) { AddHistoryOutput("REFERENCE_FORCE", "RefForce", ScreenOutputFormat::FIXED, "AERO_COEFF", "Reference force used to compute aerodynamic coefficients", HistoryFieldType::COEFFICIENT); /// DESCRIPTION: Drag coefficient AddHistoryOutput("DRAG", "CD", ScreenOutputFormat::FIXED, "AERO_COEFF", "Total drag coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT); + /// DESCRIPTION: viscous Drag coefficient + AddHistoryOutput("DRAG_VISC", "CD_visc", ScreenOutputFormat::FIXED, "AERO_COEFF", "Viscous drag coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT); /// DESCRIPTION: Lift coefficient AddHistoryOutput("LIFT", "CL", ScreenOutputFormat::FIXED, "AERO_COEFF", "Total lift coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT); /// DESCRIPTION: Sideforce coefficient @@ -1428,6 +1430,7 @@ void CFlowOutput::SetAerodynamicCoefficients(const CConfig* config, const CSolve SetHistoryOutputValue("REFERENCE_FORCE", flow_solver->GetAeroCoeffsReferenceForce()); SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD()); + SetHistoryOutputValue("DRAG_VISC", flow_solver->GetAllBound_CD_Visc()); SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL()); if (nDim == 3) SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF()); diff --git a/SU2_CFD/src/solvers/CTurbSASolver.cpp b/SU2_CFD/src/solvers/CTurbSASolver.cpp index fb18d50b551b..e1f60cebbb13 100644 --- a/SU2_CFD/src/solvers/CTurbSASolver.cpp +++ b/SU2_CFD/src/solvers/CTurbSASolver.cpp @@ -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); From f4992c6156c53ba97462af5a268e43a47970bcce Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Thu, 20 Apr 2023 08:51:12 -0700 Subject: [PATCH 02/20] Apply suggestions from code review --- .../numerics/turbulent/turb_sources.hpp | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/SU2_CFD/include/numerics/turbulent/turb_sources.hpp b/SU2_CFD/include/numerics/turbulent/turb_sources.hpp index c56b71646e83..f266b2e4a70b 100644 --- a/SU2_CFD/include/numerics/turbulent/turb_sources.hpp +++ b/SU2_CFD/include/numerics/turbulent/turb_sources.hpp @@ -48,7 +48,7 @@ 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; // It should be 2.0, but the HLPW5 wants 1.0 + const su2double CRot = 2.0; /*--- 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; @@ -124,7 +124,8 @@ class CSourceBase_TurbSA : public CNumerics { /*--- Dacles-Mariani et. al. rotation correction ("-R"). ---*/ if (options.rot) { var.Omega += var.CRot * min(0.0, StrainMag_i - var.Omega); - if(ScalarVar_i[0] < 0 ) var.Omega = abs(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) { @@ -307,34 +308,20 @@ struct Bsl { const su2double Sbar = nue * var.fv2 * var.inv_k2_d2; const su2double c2 = 0.7, c3 = 0.9; - if(Sbar >= - c2 * var.S){ + /*--- 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; - var.Shat = max(var.Shat, 1.0e-10); - if (var.Shat <= 1.0e-10) { - var.d_Shat = 0.0; - } else { - var.d_Shat = (var.fv2 + nue * var.d_fv2) * var.inv_k2_d2; - } } else { - const su2double Num = var.S * ( c2*c2*var.S + c3 * Sbar); - const su2double Den = (c3-2*c2)*var.S - Sbar; - + 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; - var.Shat = max(var.Shat, 1.0e-10); - - if (var.Shat <= 1.0e-10) { - var.d_Shat = 0.0; - } else { - const su2double d_Sbar = (var.fv2 + nue * var.d_fv2); - const su2double k2_d2 = var.k2 * var.dist_i_2; - const su2double num1 = c2*c2 * var.S*var.S * k2_d2; - const su2double den1 = pow(k2_d2 * (c3-2*c2) * var.S - nue * var.fv2, 2.0); - const su2double num2_1 = c3*var.S*(k2_d2 * (c3-2*c2)*var.S - nue*var.fv2); - const su2double num2_2 = c3*var.S*nue*var.fv2; - const su2double den2 = pow(k2_d2* (c3-2*c2) * var.S - nue*var.fv2, 2.0); - - var.d_Shat = num1*d_Sbar/den1 + (num2_1+num2_2)*d_Sbar/den2 ; - } + } + 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; } } }; From 6333f54682fb7e9fbcd5fc0613d81a19e28ba329 Mon Sep 17 00:00:00 2001 From: rois1995 Date: Fri, 21 Apr 2023 09:06:31 +0200 Subject: [PATCH 03/20] - Code refactoring --- .../numerics/turbulent/turb_sources.hpp | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/SU2_CFD/include/numerics/turbulent/turb_sources.hpp b/SU2_CFD/include/numerics/turbulent/turb_sources.hpp index c56b71646e83..41f7d886d47b 100644 --- a/SU2_CFD/include/numerics/turbulent/turb_sources.hpp +++ b/SU2_CFD/include/numerics/turbulent/turb_sources.hpp @@ -48,7 +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; // It should be 2.0, but the HLPW5 wants 1.0 + 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; @@ -124,7 +125,8 @@ class CSourceBase_TurbSA : public CNumerics { /*--- Dacles-Mariani et. al. rotation correction ("-R"). ---*/ if (options.rot) { var.Omega += var.CRot * min(0.0, StrainMag_i - var.Omega); - if(ScalarVar_i[0] < 0 ) var.Omega = abs(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) { @@ -305,35 +307,36 @@ 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; - const su2double c2 = 0.7, c3 = 0.9; + - if(Sbar >= - c2 * var.S){ + if(Sbar >= - var.c2 * var.S){ var.Shat = var.S + Sbar; - var.Shat = max(var.Shat, 1.0e-10); + if (var.Shat <= 1.0e-10) { + var.Shat = 1.0e-10; var.d_Shat = 0.0; } else { - var.d_Shat = (var.fv2 + nue * var.d_fv2) * var.inv_k2_d2; + var.d_Shat = (var.fv2 + nue * var.d_fv2) * var.inv_k2_d2; } } else { - const su2double Num = var.S * ( c2*c2*var.S + c3 * Sbar); - const su2double Den = (c3-2*c2)*var.S - Sbar; + const su2double Num = var.S * ( var.c2*var.c2*var.S + var.c3 * Sbar); + const su2double Den = (var.c3-2*var.c2)*var.S - Sbar; var.Shat = var.S + Num / Den; - var.Shat = max(var.Shat, 1.0e-10); if (var.Shat <= 1.0e-10) { + var.Shat = 1.0e-10; var.d_Shat = 0.0; } else { - const su2double d_Sbar = (var.fv2 + nue * var.d_fv2); + const su2double d_Sbar = (var.fv2 + nue * var.d_fv2); const su2double k2_d2 = var.k2 * var.dist_i_2; - const su2double num1 = c2*c2 * var.S*var.S * k2_d2; - const su2double den1 = pow(k2_d2 * (c3-2*c2) * var.S - nue * var.fv2, 2.0); - const su2double num2_1 = c3*var.S*(k2_d2 * (c3-2*c2)*var.S - nue*var.fv2); - const su2double num2_2 = c3*var.S*nue*var.fv2; - const su2double den2 = pow(k2_d2* (c3-2*c2) * var.S - nue*var.fv2, 2.0); + const su2double num1 = var.c2*var.c2 * var.S*var.S * k2_d2; + const su2double den1 = pow(k2_d2 * (var.c3-2*var.c2) * var.S - nue * var.fv2, 2.0); + const su2double num2_1 = var.c3*var.S*(k2_d2 * (var.c3-2*var.c2)*var.S - nue*var.fv2); + const su2double num2_2 = var.c3*var.S*nue*var.fv2; + const su2double den2 = pow(k2_d2* (var.c3-2*var.c2) * var.S - nue*var.fv2, 2.0); - var.d_Shat = num1*d_Sbar/den1 + (num2_1+num2_2)*d_Sbar/den2 ; + var.d_Shat = num1*d_Sbar/den1 + (num2_1+num2_2)*d_Sbar/den2; } } } From 2bde41daab2a7defde20e0cd4e8bce63e773155c Mon Sep 17 00:00:00 2001 From: bigfooted Date: Wed, 24 May 2023 23:50:12 +0200 Subject: [PATCH 04/20] serial and parallel regression update for RESTART=NO --- TestCases/parallel_regression.py | 26 +++++++++++++------------- TestCases/serial_regression.py | 18 +++++++++--------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 95c486de5616..76898a7c4d1a 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -314,7 +314,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 @@ -338,7 +338,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.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 @@ -346,7 +346,7 @@ def main(): 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 @@ -354,7 +354,7 @@ def main(): 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) @@ -363,7 +363,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) @@ -446,7 +446,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) @@ -559,7 +559,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 @@ -653,7 +653,7 @@ def main(): 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) @@ -662,7 +662,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 @@ -686,7 +686,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) ############################ @@ -858,7 +858,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.902098, 0.484070, 0.601481, 3.609002, -5.949360] test_list.append(hb_rans_preconditioning) ###################################### @@ -925,7 +925,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) @@ -1414,7 +1414,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 diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index b7d00c3f3a08..4bb0398a7655 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -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 @@ -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 @@ -253,7 +253,7 @@ 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 @@ -261,7 +261,7 @@ def main(): 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) @@ -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) @@ -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 @@ -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) ###################################### @@ -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) @@ -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) From 316a69f18ed8c238c14709dad0ce799d9cb9565c Mon Sep 17 00:00:00 2001 From: bigfooted Date: Thu, 25 May 2023 23:56:49 +0200 Subject: [PATCH 05/20] update more regressions --- TestCases/hybrid_regression.py | 10 +++++----- TestCases/hybrid_regression_AD.py | 2 +- TestCases/parallel_regression.py | 2 +- TestCases/parallel_regression_AD.py | 6 +++--- TestCases/serial_regression.py | 2 +- TestCases/serial_regression_AD.py | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py index bb748388ec9b..a2d66241cc86 100644 --- a/TestCases/hybrid_regression.py +++ b/TestCases/hybrid_regression.py @@ -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 @@ -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 @@ -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) ####################################### @@ -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 @@ -487,7 +487,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) diff --git a/TestCases/hybrid_regression_AD.py b/TestCases/hybrid_regression_AD.py index 2cb40a0d31d6..438b2fa731ff 100644 --- a/TestCases/hybrid_regression_AD.py +++ b/TestCases/hybrid_regression_AD.py @@ -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) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 76898a7c4d1a..0e1573600107 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -1414,7 +1414,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.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 + 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 diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py index 436715d98667..64fbeae54c9e 100644 --- a/TestCases/parallel_regression_AD.py +++ b/TestCases/parallel_regression_AD.py @@ -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 @@ -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.226532, 0.605613, 0.000000, -6.256200] + discadj_heat.test_vals_aarch64 = [-2.226532, 0.605613, 0.000000, -6.256200] test_list.append(discadj_heat) ################################### diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 4bb0398a7655..5d4ea0956c5b 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -270,7 +270,7 @@ def main(): 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_vals = [-8.629633, -10.377911, 1.064499, 0.019711, 20.000000, -2.173382, 20.000000, -5.212005, -46.519000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py index d9885b1dcd1f..bad0dc298206 100644 --- a/TestCases/serial_regression_AD.py +++ b/TestCases/serial_regression_AD.py @@ -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.230555, 0.645023, 0.180740, -0.000018, 5.000000, -4.275184, 5.000000, -8.892454] #last 8 columns + discadj_rans_naca0012_sa.test_vals = [-2.230545, 0.644224, 0.180740, -0.000018, 5.000000, -4.275182, 5.000000, -10.051224] test_list.append(discadj_rans_naca0012_sa) # Adjoint turbulent NACA0012 SST @@ -200,7 +200,7 @@ 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.227518, 0.576043, 0.000000, -7.753900] #last 4 columns + discadj_heat.test_vals = [-2.227522, 0.577732, 0.000000, -7.754000] test_list.append(discadj_heat) ################################### From c50072a613b52c3091944bf42211c046a925a875 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Fri, 26 May 2023 08:44:09 +0200 Subject: [PATCH 06/20] update some more residuals --- .github/workflows/regression.yml | 2 +- TestCases/hybrid_regression.py | 2 +- TestCases/parallel_regression.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 76545cdb2747..21ae9cc5aee9 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -128,7 +128,7 @@ jobs: uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136 with: # -t -c - args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} + args: -b ${{github.ref}} -t develop -c feature_SA_HLPW5 -s ${{matrix.testscript}} - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136 with: diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py index a2d66241cc86..d8f43ecc7f28 100644 --- a/TestCases/hybrid_regression.py +++ b/TestCases/hybrid_regression.py @@ -198,7 +198,7 @@ def main(): 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_vals = [-8.626987, -10.378051, 1.064501, 0.019711, 20.000000, -1.763385, 20.000000, -4.791910, -46.520000] 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) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 0e1573600107..66c815a547e8 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -382,7 +382,7 @@ def main(): 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_vals = [-8.621172, -10.378367, 1.064512, 0.019710, 20.000000, -1.813386, 20.000000, -5.172466, -46.520000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) @@ -645,7 +645,7 @@ 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 @@ -858,6 +858,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.tol = 0.00001 hb_rans_preconditioning.test_vals = [1.902098, 0.484070, 0.601481, 3.609002, -5.949360] test_list.append(hb_rans_preconditioning) From 8f22cd87bfc6b8a4902d3e193aeafffcb62bee0b Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sun, 28 May 2023 13:40:43 +0200 Subject: [PATCH 07/20] update tutorial residuals, all small changes --- TestCases/tutorials.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index b2bb04b6e889..ec1802cdb8fa 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -171,7 +171,7 @@ def main(): tutorial_turb_flatplate.cfg_dir = "../Tutorials/compressible_flow/Turbulent_Flat_Plate" tutorial_turb_flatplate.cfg_file = "turb_SA_flatplate.cfg" tutorial_turb_flatplate.test_iter = 0 - tutorial_turb_flatplate.test_vals = [-2.258584, -4.899502, -0.429375, 0.201236] + tutorial_turb_flatplate.test_vals = [-2.258584, -4.901015, -0.429375, 0.201236 tutorial_turb_flatplate.no_restart = True test_list.append(tutorial_turb_flatplate) @@ -216,7 +216,7 @@ def main(): tutorial_trans_e387_sst.cfg_dir = "../Tutorials/compressible_flow/Transitional_Airfoil/Langtry_and_Menter/E387" tutorial_trans_e387_sst.cfg_file = "transitional_SST_LM_model_ConfigFile.cfg" tutorial_trans_e387_sst.test_iter = 20 - tutorial_trans_e387_sst.test_vals = [-6.532421, -5.085785, -0.789723, 1.078391, 0.188263, 2, -9.567014] + tutorial_trans_e387_sst.test_vals = [-6.527027, -5.081560, -0.795267, 1.022556, 0.150189, 2.000000, -9.580669] tutorial_trans_e387_sst.no_restart = True test_list.append(tutorial_trans_e387_sst) @@ -225,7 +225,7 @@ def main(): tutorial_turb_oneram6.cfg_dir = "../Tutorials/compressible_flow/Turbulent_ONERAM6" tutorial_turb_oneram6.cfg_file = "turb_ONERAM6.cfg" tutorial_turb_oneram6.test_iter = 0 - tutorial_turb_oneram6.test_vals = [-4.564441, -11.524277, 0.327954, 0.097349] + tutorial_turb_oneram6.test_vals = [-4.564441, -11.524476, 0.327954, 0.097349] test_list.append(tutorial_turb_oneram6) # NICD Nozzle @@ -242,7 +242,7 @@ def main(): tutorial_unst_naca0012.cfg_dir = "../Tutorials/compressible_flow/Unsteady_NACA0012" tutorial_unst_naca0012.cfg_file = "unsteady_naca0012.cfg" tutorial_unst_naca0012.test_iter = 520 - tutorial_unst_naca0012.test_vals = [520, 0, -5.297585, 0, 0.297416, 0.770060, 0.003308, 0.014647] + tutorial_unst_naca0012.test_vals = [520.000000, 0.000000, -5.291711, 0.000000, 0.305248, 0.810326, 0.001814, 0.006573] tutorial_unst_naca0012.test_vals_aarch64 = [520, 0, -5.296968, 0, 0.312131, 0.801193, 0.002868, 0.014303] tutorial_unst_naca0012.unsteady = True test_list.append(tutorial_unst_naca0012) @@ -252,7 +252,7 @@ def main(): propeller_var_load.cfg_dir = "../Tutorials/compressible_flow/ActuatorDisk_VariableLoad" propeller_var_load.cfg_file = "propeller_variable_load.cfg" propeller_var_load.test_iter = 20 - propeller_var_load.test_vals = [-1.830252, -4.535038, -0.000323, 0.171648] + propeller_var_load.test_vals = [-1.830276, -4.535127, -0.000323, 0.171623] propeller_var_load.timeout = 3200 test_list.append(propeller_var_load) @@ -272,7 +272,7 @@ def main(): tutorial_design_turb_rae2822.cfg_dir = "../Tutorials/design/Turbulent_2D_Constrained_RAE2822" tutorial_design_turb_rae2822.cfg_file = "turb_SA_RAE2822.cfg" tutorial_design_turb_rae2822.test_iter = 0 - tutorial_design_turb_rae2822.test_vals = [-1.700114, -4.941305, 0.218348, 0.190357] + tutorial_design_turb_rae2822.test_vals = [-1.700114, -4.941834, 0.218348, 0.190357] tutorial_design_turb_rae2822.no_restart = True test_list.append(tutorial_design_turb_rae2822) From 3d5be72c1872fc58f56edaa3a6a0a5d1e97f8aa6 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sun, 28 May 2023 19:25:09 +0200 Subject: [PATCH 08/20] fix syntax error --- TestCases/tutorials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index ec1802cdb8fa..af133a64f6ee 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -171,7 +171,7 @@ def main(): tutorial_turb_flatplate.cfg_dir = "../Tutorials/compressible_flow/Turbulent_Flat_Plate" tutorial_turb_flatplate.cfg_file = "turb_SA_flatplate.cfg" tutorial_turb_flatplate.test_iter = 0 - tutorial_turb_flatplate.test_vals = [-2.258584, -4.901015, -0.429375, 0.201236 + tutorial_turb_flatplate.test_vals = [-2.258584, -4.901015, -0.429375, 0.201236] tutorial_turb_flatplate.no_restart = True test_list.append(tutorial_turb_flatplate) From 5cbeb8ea73c16748f58951a4db59bb1d9a6c2071 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sun, 28 May 2023 22:07:24 +0200 Subject: [PATCH 09/20] fix minus sign --- TestCases/parallel_regression.py | 2 +- TestCases/tutorials.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 66c815a547e8..9bdc508fb23d 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -859,7 +859,7 @@ def main(): hb_rans_preconditioning.cfg_file = "davis.cfg" hb_rans_preconditioning.test_iter = 25 hb_rans_preconditioning.tol = 0.00001 - hb_rans_preconditioning.test_vals = [1.902098, 0.484070, 0.601481, 3.609002, -5.949360] + hb_rans_preconditioning.test_vals = [-1.902098, 0.484070, 0.601481, 3.609002, -5.949360] test_list.append(hb_rans_preconditioning) ###################################### diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index af133a64f6ee..a97a1fc42bb9 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -207,7 +207,7 @@ def main(): tutorial_trans_e387_sa.cfg_dir = "../Tutorials/compressible_flow/Transitional_Airfoil/Langtry_and_Menter/E387" tutorial_trans_e387_sa.cfg_file = "transitional_SA_LM_model_ConfigFile.cfg" tutorial_trans_e387_sa.test_iter = 20 - tutorial_trans_e387_sa.test_vals = [-6.527027, -5.081543, -0.795267, 1.022557, 0.150240, 2, -9.580670] + tutorial_trans_e387_sa.test_vals = [-6.527027, -5.081560, -0.795267, 1.022556, 0.150189, 2.000000, -9.580669] tutorial_trans_e387_sa.no_restart = True test_list.append(tutorial_trans_e387_sa) From bc4c19f6dbfe196dcdecf61e948c23dafb47d684 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Mon, 29 May 2023 09:38:02 +0200 Subject: [PATCH 10/20] change slope limiter --- TestCases/rans/naca0012/turb_NACA0012_sa.cfg | 1 - TestCases/vandv.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg index aceafbc305c1..c80150a03b6a 100644 --- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg +++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg @@ -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 diff --git a/TestCases/vandv.py b/TestCases/vandv.py index 15056dd64e30..35a950b13511 100644 --- a/TestCases/vandv.py +++ b/TestCases/vandv.py @@ -71,7 +71,7 @@ def main(): swbli_sa = TestCase('swbli_sa') swbli_sa.cfg_dir = "vandv/rans/swbli" swbli_sa.cfg_file = "config_sa.cfg" - swbli_sa.test_iter = 20 + swbli_sa.test_iter = 5 swbli_sa.test_vals = [-11.029255, -10.511982, -11.400926, -10.128471, -14.536798, 0.002233, -2.608466, 2.786] test_list.append(swbli_sa) From 638bbb85a0da34d7fb73f784535318ff38f614ef Mon Sep 17 00:00:00 2001 From: bigfooted Date: Mon, 29 May 2023 16:53:53 +0200 Subject: [PATCH 11/20] modify nr of iterations --- TestCases/parallel_regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 9bdc508fb23d..61f302ae713c 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -381,7 +381,7 @@ 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_iter = 5 turb_naca0012_sa.test_vals = [-8.621172, -10.378367, 1.064512, 0.019710, 20.000000, -1.813386, 20.000000, -5.172466, -46.520000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) From f67e6220075184d9e1093760e820b1e4cc084e2d Mon Sep 17 00:00:00 2001 From: bigfooted Date: Mon, 29 May 2023 16:56:45 +0200 Subject: [PATCH 12/20] modify nr of iterations --- TestCases/hybrid_regression.py | 2 +- TestCases/serial_regression.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py index d8f43ecc7f28..3b76279ae6b3 100644 --- a/TestCases/hybrid_regression.py +++ b/TestCases/hybrid_regression.py @@ -197,7 +197,7 @@ 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_iter = 5 turb_naca0012_sa.test_vals = [-8.626987, -10.378051, 1.064501, 0.019711, 20.000000, -1.763385, 20.000000, -4.791910, -46.520000] 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) diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 5d4ea0956c5b..7693a91e3b57 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -269,7 +269,7 @@ 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_iter = 5 turb_naca0012_sa.test_vals = [-8.629633, -10.377911, 1.064499, 0.019711, 20.000000, -2.173382, 20.000000, -5.212005, -46.519000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) From f39302162aa5663e5e3ea0320c838fc26650a7db Mon Sep 17 00:00:00 2001 From: bigfooted Date: Mon, 29 May 2023 23:50:22 +0200 Subject: [PATCH 13/20] update naca0012 regressions --- TestCases/hybrid_regression.py | 2 +- TestCases/parallel_regression.py | 2 +- TestCases/serial_regression.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py index 3b76279ae6b3..a2a2cc846592 100644 --- a/TestCases/hybrid_regression.py +++ b/TestCases/hybrid_regression.py @@ -198,7 +198,7 @@ def main(): turb_naca0012_sa.cfg_dir = "rans/naca0012" turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" turb_naca0012_sa.test_iter = 5 - turb_naca0012_sa.test_vals = [-8.626987, -10.378051, 1.064501, 0.019711, 20.000000, -1.763385, 20.000000, -4.791910, -46.520000] + 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) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 61f302ae713c..5694436167e6 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -382,7 +382,7 @@ def main(): turb_naca0012_sa.cfg_dir = "rans/naca0012" turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" turb_naca0012_sa.test_iter = 5 - turb_naca0012_sa.test_vals = [-8.621172, -10.378367, 1.064512, 0.019710, 20.000000, -1.813386, 20.000000, -5.172466, -46.520000] + 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) diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 7693a91e3b57..a17d5737b528 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -270,7 +270,7 @@ def main(): turb_naca0012_sa.cfg_dir = "rans/naca0012" turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" turb_naca0012_sa.test_iter = 5 - turb_naca0012_sa.test_vals = [-8.629633, -10.377911, 1.064499, 0.019711, 20.000000, -2.173382, 20.000000, -5.212005, -46.519000] + 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) From 1e4adcdf2516fa63eabdddc1d2a5c3067c9fada5 Mon Sep 17 00:00:00 2001 From: rois1995 Date: Tue, 30 May 2023 12:10:40 +0200 Subject: [PATCH 14/20] Correct vandv and tutorials --- TestCases/tutorials.py | 6 +++--- TestCases/vandv.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index a97a1fc42bb9..3312c79d95f0 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -97,8 +97,8 @@ def main(): DAspecies3_primitiveVenturi.cfg_dir = "../Tutorials/incompressible_flow/Inc_Species_Transport" DAspecies3_primitiveVenturi.cfg_file = "DAspecies3_primitiveVenturi.cfg" DAspecies3_primitiveVenturi.test_iter = 50 - DAspecies3_primitiveVenturi.test_vals = [-8.422882, -7.699257, -7.683269, -7.411648, -12.064694, -12.205189, -11.368995] - DAspecies3_primitiveVenturi.test_vals_aarch64 = [-8.422882, -7.699257, -7.683269, -7.411648, -12.064694, -12.205189, -11.368995] + DAspecies3_primitiveVenturi.test_vals = [-8.528843, -7.799649, -7.783477, -7.482502, -12.140092, -12.250169, -11.455523] + DAspecies3_primitiveVenturi.test_vals_aarch64 = [-8.528843, -7.799649, -7.783477, -7.482502, -12.140092, -12.250169, -11.455523] DAspecies3_primitiveVenturi.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD") test_list.append(DAspecies3_primitiveVenturi) @@ -216,7 +216,7 @@ def main(): tutorial_trans_e387_sst.cfg_dir = "../Tutorials/compressible_flow/Transitional_Airfoil/Langtry_and_Menter/E387" tutorial_trans_e387_sst.cfg_file = "transitional_SST_LM_model_ConfigFile.cfg" tutorial_trans_e387_sst.test_iter = 20 - tutorial_trans_e387_sst.test_vals = [-6.527027, -5.081560, -0.795267, 1.022556, 0.150189, 2.000000, -9.580669] + tutorial_trans_e387_sst.test_vals = [-6.532421, -5.085785, -0.789723, 1.078391, 0.188263, 2.000000, -9.567014] tutorial_trans_e387_sst.no_restart = True test_list.append(tutorial_trans_e387_sst) diff --git a/TestCases/vandv.py b/TestCases/vandv.py index 35a950b13511..3a6d36ef36af 100644 --- a/TestCases/vandv.py +++ b/TestCases/vandv.py @@ -45,7 +45,7 @@ def main(): p30n30.cfg_dir = "vandv/rans/30p30n" p30n30.cfg_file = "config.cfg" p30n30.test_iter = 20 - p30n30.test_vals = [-10.639125, -10.302345, -10.493880, -10.249452, -13.517221, 0.050962, 2.828563, 1.317849, -0.217586] + p30n30.test_vals = [-10.806343, -10.326374, -10.559106, -10.432754, -13.517105, 0.050962, 2.828563, 1.317849, -0.228843] p30n30.test_vals_aarch64 = [-10.636663, -10.298256, -10.479415, -10.246700, -13.517161, 0.050962, 2.828563, 1.317849, -0.209200] test_list.append(p30n30) @@ -72,7 +72,7 @@ def main(): swbli_sa.cfg_dir = "vandv/rans/swbli" swbli_sa.cfg_file = "config_sa.cfg" swbli_sa.test_iter = 5 - swbli_sa.test_vals = [-11.029255, -10.511982, -11.400926, -10.128471, -14.536798, 0.002233, -2.608466, 2.786] + swbli_sa.test_vals = [-11.014738, -9.936534, -11.120020, -10.050397, -13.203736, 0.002233, -3.222675, 1.340100] test_list.append(swbli_sa) # SWBLI - sst-v2003m From 0ebae0ab610056776e93c5f760b0b15b3328facf Mon Sep 17 00:00:00 2001 From: rois1995 Date: Tue, 30 May 2023 19:07:05 +0200 Subject: [PATCH 15/20] corrected tutorials and vandv --- TestCases/tutorials.py | 2 +- TestCases/vandv.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 3312c79d95f0..621a7ffc9c89 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -97,7 +97,7 @@ def main(): DAspecies3_primitiveVenturi.cfg_dir = "../Tutorials/incompressible_flow/Inc_Species_Transport" DAspecies3_primitiveVenturi.cfg_file = "DAspecies3_primitiveVenturi.cfg" DAspecies3_primitiveVenturi.test_iter = 50 - DAspecies3_primitiveVenturi.test_vals = [-8.528843, -7.799649, -7.783477, -7.482502, -12.140092, -12.250169, -11.455523] + DAspecies3_primitiveVenturi.test_vals = [-8.422882, -7.699257, -7.683269, -7.411648, -12.064694, -12.205189, -11.368995] DAspecies3_primitiveVenturi.test_vals_aarch64 = [-8.528843, -7.799649, -7.783477, -7.482502, -12.140092, -12.250169, -11.455523] DAspecies3_primitiveVenturi.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD") test_list.append(DAspecies3_primitiveVenturi) diff --git a/TestCases/vandv.py b/TestCases/vandv.py index 3a6d36ef36af..a1cad128cdfd 100644 --- a/TestCases/vandv.py +++ b/TestCases/vandv.py @@ -72,9 +72,11 @@ def main(): swbli_sa.cfg_dir = "vandv/rans/swbli" swbli_sa.cfg_file = "config_sa.cfg" swbli_sa.test_iter = 5 - swbli_sa.test_vals = [-11.014738, -9.936534, -11.120020, -10.050397, -13.203736, 0.002233, -3.222675, 1.340100] + swbli_sa.test_vals = [-11.530796, -10.915564, -12.034495, -10.538719, -15.922522, 0.002233, -3.359164, 1.340100] + swbli_sa.test_vals_aarch64 = [-11.014738, -9.936534, -11.120020, -10.050397, -13.203736, 0.002233, -3.222675, 1.340100] test_list.append(swbli_sa) + # SWBLI - sst-v2003m swbli_sst = TestCase('swbli_sst') swbli_sst.cfg_dir = "vandv/rans/swbli" From 79cf38e1bd5135e9d003aa1635a3cfbfcf049eda Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:25:00 +0100 Subject: [PATCH 16/20] Apply suggestions from code review --- SU2_CFD/include/numerics/turbulent/turb_sources.hpp | 2 +- SU2_CFD/src/output/CFlowOutput.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/SU2_CFD/include/numerics/turbulent/turb_sources.hpp b/SU2_CFD/include/numerics/turbulent/turb_sources.hpp index 21361251ebe1..00d685baa67b 100644 --- a/SU2_CFD/include/numerics/turbulent/turb_sources.hpp +++ b/SU2_CFD/include/numerics/turbulent/turb_sources.hpp @@ -126,7 +126,7 @@ class CSourceBase_TurbSA : public CNumerics { if (options.rot) { 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 (ScalarVar_i[0] < 0) var.Omega = abs(var.Omega); } if (dist_i > 1e-10) { diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp index f3fc1f67e946..d297ca6fb992 100644 --- a/SU2_CFD/src/output/CFlowOutput.cpp +++ b/SU2_CFD/src/output/CFlowOutput.cpp @@ -1386,8 +1386,6 @@ void CFlowOutput::AddAerodynamicCoefficients(const CConfig* config) { AddHistoryOutput("REFERENCE_FORCE", "RefForce", ScreenOutputFormat::FIXED, "AERO_COEFF", "Reference force used to compute aerodynamic coefficients", HistoryFieldType::COEFFICIENT); /// DESCRIPTION: Drag coefficient AddHistoryOutput("DRAG", "CD", ScreenOutputFormat::FIXED, "AERO_COEFF", "Total drag coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT); - /// DESCRIPTION: viscous Drag coefficient - AddHistoryOutput("DRAG_VISC", "CD_visc", ScreenOutputFormat::FIXED, "AERO_COEFF", "Viscous drag coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT); /// DESCRIPTION: Lift coefficient AddHistoryOutput("LIFT", "CL", ScreenOutputFormat::FIXED, "AERO_COEFF", "Total lift coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT); /// DESCRIPTION: Sideforce coefficient @@ -1445,7 +1443,6 @@ void CFlowOutput::SetAerodynamicCoefficients(const CConfig* config, const CSolve SetHistoryOutputValue("REFERENCE_FORCE", flow_solver->GetAeroCoeffsReferenceForce()); SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD()); - SetHistoryOutputValue("DRAG_VISC", flow_solver->GetAllBound_CD_Visc()); SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL()); if (nDim == 3) SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF()); From d0f5f52344f5b11d12fe7f501403dc9f23162258 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sat, 10 Jun 2023 11:24:45 +0200 Subject: [PATCH 17/20] update residuals for heat --- TestCases/hybrid_regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py index f5b5e2a152ac..532c0fae76b2 100644 --- a/TestCases/hybrid_regression.py +++ b/TestCases/hybrid_regression.py @@ -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.943726, -15.677195, -15.930306, -12.868136, -18.184442, -1.066293, 5.545800] test_list.append(inc_weakly_coupled) ###################################### From 8eff9ae57321f0a34549165ab3a969677d55d2c6 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sat, 10 Jun 2023 16:11:05 +0200 Subject: [PATCH 18/20] update residuals for heat --- TestCases/hybrid_regression.py | 2 +- TestCases/parallel_regression_AD.py | 2 +- TestCases/serial_regression_AD.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py index 532c0fae76b2..612b7669a564 100644 --- a/TestCases/hybrid_regression.py +++ b/TestCases/hybrid_regression.py @@ -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 = [-16.943726, -15.677195, -15.930306, -12.868136, -18.184442, -1.066293, 5.545800] + 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) ###################################### diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py index 2c410e4648ca..3b9114999c7c 100644 --- a/TestCases/parallel_regression_AD.py +++ b/TestCases/parallel_regression_AD.py @@ -256,7 +256,7 @@ def main(): discadj_heat.cfg_file = "disc_adj_heat.cfg" discadj_heat.test_iter = 10 discadj_heat.test_vals = [-2.226532, 0.605613, 0.000000, -6.256200] - discadj_heat.test_vals_aarch64 = [-2.226532, 0.605613, 0.000000, -6.256200] + discadj_heat.test_vals_aarch64 = [-2.226539, 0.605868, 0.000000, -6.256400] test_list.append(discadj_heat) ################################### diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py index bad0dc298206..a35741518765 100644 --- a/TestCases/serial_regression_AD.py +++ b/TestCases/serial_regression_AD.py @@ -200,7 +200,7 @@ 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.227522, 0.577732, 0.000000, -7.754000] + discadj_heat.test_vals = [-2.227530, 0.577732, 0.000000, -7.754000] test_list.append(discadj_heat) ################################### From 1a429f0c7be36f395b8afa71b8e850a883f5db5c Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sat, 10 Jun 2023 21:31:49 +0200 Subject: [PATCH 19/20] update residuals for heat --- TestCases/parallel_regression_AD.py | 2 +- TestCases/serial_regression_AD.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py index 3b9114999c7c..2e0d70f516af 100644 --- a/TestCases/parallel_regression_AD.py +++ b/TestCases/parallel_regression_AD.py @@ -255,7 +255,7 @@ 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.226532, 0.605613, 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) diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py index a35741518765..c4e7157149e4 100644 --- a/TestCases/serial_regression_AD.py +++ b/TestCases/serial_regression_AD.py @@ -200,7 +200,7 @@ 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.227530, 0.577732, 0.000000, -7.754000] + discadj_heat.test_vals = [-2.227530, 0.577932, 0.000000, -7.754000] test_list.append(discadj_heat) ################################### From 0c33213ca68f68b7912b0ec6649cdbf21d263e8e Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sat, 10 Jun 2023 23:07:01 +0200 Subject: [PATCH 20/20] change back regression test to develop --- .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 21ae9cc5aee9..76545cdb2747 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -128,7 +128,7 @@ jobs: uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136 with: # -t -c - args: -b ${{github.ref}} -t develop -c feature_SA_HLPW5 -s ${{matrix.testscript}} + args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136 with: