diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg index 63c749021f2..a106a5bcaa7 100644 --- a/TestCases/euler/CRM/inv_CRM_JST.cfg +++ b/TestCases/euler/CRM/inv_CRM_JST.cfg @@ -43,11 +43,11 @@ MARKER_MONITORING= ( fuselage , Wing , HTP ) % ------------- COMMON PARAMETERS TO DEFINE THE NUMERICAL METHOD --------------% % NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES -CFL_NUMBER= 5.0 +CFL_NUMBER= 100.0 CFL_ADAPT= NO CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 ) RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 ) -EXT_ITER= 99999 +ITER= 5000 LINEAR_SOLVER= FGMRES LINEAR_SOLVER_ERROR= 1E-1 LINEAR_SOLVER_ITER= 3 @@ -56,11 +56,12 @@ LINEAR_SOLVER_ITER= 3 % MGLEVEL= 3 MGCYCLE= V_CYCLE -MG_PRE_SMOOTH= ( 4, 4, 4, 4 ) -MG_POST_SMOOTH= ( 4, 4, 4, 4 ) +MG_PRE_SMOOTH= ( 2, 2, 2, 2 ) +MG_POST_SMOOTH= ( 2, 2, 2, 2 ) MG_CORRECTION_SMOOTH= ( 1, 1, 1, 1 ) -MG_DAMP_RESTRICTION= 0.5 -MG_DAMP_PROLONGATION= 0.5 +MG_DAMP_RESTRICTION= 0.75 +MG_DAMP_PROLONGATION= 0.75 +SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_MOMENTUM-X, RMS_MOMENTUM-Y, RMS_MOMENTUM-Z, RMS_ENERGY) % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg index 5161a04413d..5e7d23d7800 100644 --- a/TestCases/euler/channel/inv_channel.cfg +++ b/TestCases/euler/channel/inv_channel.cfg @@ -47,11 +47,11 @@ MARKER_MONITORING= ( upper_wall, lower_wall ) % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------% % NUM_METHOD_GRAD= GREEN_GAUSS -CFL_NUMBER= 6.0 +CFL_NUMBER= 30.0 CFL_ADAPT= NO CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 ) RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 ) -EXT_ITER= 999999 +ITER= 10000 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------% % diff --git a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg index c6e40834d62..abdb3138480 100644 --- a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg +++ b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg @@ -42,11 +42,11 @@ MARKER_MONITORING= ( airfoil ) % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------% % NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES -CFL_NUMBER= 1.0 +CFL_NUMBER= 30.0 CFL_ADAPT= NO -CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 ) +CFL_ADAPT_PARAM= ( 0.5, 1.5, 1.0, 100.0 ) RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 ) -EXT_ITER= 99999 +ITER= 10000 LINEAR_SOLVER= FGMRES LINEAR_SOLVER_ERROR= 1E-1 LINEAR_SOLVER_ITER= 3 diff --git a/TestCases/rans/flatplate/turb_SST_flatplate.cfg b/TestCases/rans/flatplate/turb_SST_flatplate.cfg index b4e8e5ab7ef..eff2acf6bfb 100644 --- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg +++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg @@ -45,11 +45,11 @@ MARKER_MONITORING= ( wall ) % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------% % NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES -CFL_NUMBER= 10.0 -CFL_ADAPT= NO -CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 ) +CFL_NUMBER= 50.0 +CFL_ADAPT= YES +CFL_ADAPT_PARAM= ( 0.5, 1.2, 10.0, 200.0 ) RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 ) -EXT_ITER= 99999 +ITER= 30000 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------% % @@ -61,6 +61,7 @@ SENS_REMOVE_SHARP= NO % -------------------------- MULTIGRID PARAMETERS -----------------------------% % MGLEVEL= 3 +SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_MOMENTUM-X, RMS_MOMENTUM-Y, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION) MGCYCLE= V_CYCLE MG_PRE_SMOOTH= ( 4, 4, 4, 4 ) MG_POST_SMOOTH= ( 4, 4, 4, 4) @@ -84,7 +85,7 @@ SLOPE_LIMITER_TURB= VENKATAKRISHNAN TIME_DISCRE_TURB= EULER_IMPLICIT % --------------------------- CONVERGENCE PARAMETERS --------------------------% -CONV_RESIDUAL_MINVAL= -15 +CONV_RESIDUAL_MINVAL= -12 CONV_STARTITER= 10 CONV_CAUCHY_ELEMS= 100 CONV_CAUCHY_EPS= 1E-6 diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg index 4b36e58d583..4311a8a25c0 100644 --- a/TestCases/rans/s809/turb_S809.cfg +++ b/TestCases/rans/s809/turb_S809.cfg @@ -46,7 +46,8 @@ NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES CFL_NUMBER= 10.0 CFL_ADAPT= NO CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 ) -EXT_ITER= 99999 +SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_MOMENTUM-X, RMS_MOMENTUM-Y, RMS_ENERGY, RMS_NU_TILDE) +ITER= 10000 LINEAR_SOLVER= FGMRES LINEAR_SOLVER_ERROR= 1E-4 LINEAR_SOLVER_ITER= 2 diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 331fe709f0e..4b9e39bcb35 100755 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -160,6 +160,22 @@ def main(): bluntbody.test_vals = [0.666162, 7.055023, -0.000093, 3.916825] test_list.append(bluntbody) + # Inviscid channel with bump, subsonic + inv_channel = TestCase('inv_channel') + inv_channel.cfg_dir = "euler/channel" + inv_channel.cfg_file = "inv_channel.cfg" + inv_channel.test_iter = 20 + inv_channel.test_vals = [-2.881210, -0.363528, -0.766663, 2.541394] + test_list.append(inv_channel) + + # CRM DPW4 wing-body, transonic + inv_crm_jst = TestCase('inv_crm_jst') + inv_crm_jst.cfg_dir = "euler/CRM" + inv_crm_jst.cfg_file = "inv_CRM_JST.cfg" + inv_crm_jst.test_iter = 20 + inv_crm_jst.test_vals = [-2.000366, -1.822591, -1.831202, -1.712343, -1.392624] + test_list.append(inv_crm_jst) + ########################## ### Compressible N-S ### ########################## @@ -212,6 +228,14 @@ def main(): poiseuille_profile.test_vals_aarch64 = [-12.009012, -7.262299, -0.000000, 2.089953] #last 4 columns test_list.append(poiseuille_profile) + # Laminar NACA0012 + lam_naca0012 = TestCase('lam_naca0012') + lam_naca0012.cfg_dir = "navierstokes/naca0012" + lam_naca0012.cfg_file = "lam_NACA0012.cfg" + lam_naca0012.test_iter = 20 + lam_naca0012.test_vals = [-5.522140, -3.127430, -3.286926, -0.109971] + test_list.append(lam_naca0012) + ########################## ### Compressible RANS ### ########################## @@ -358,6 +382,22 @@ def main(): propeller.timeout = 3200 test_list.append(propeller) + # SST flat plate + turb_sst_flatplate = TestCase('turb_sst_flatplate') + turb_sst_flatplate.cfg_dir = "rans/flatplate" + turb_sst_flatplate.cfg_file = "turb_SST_flatplate.cfg" + turb_sst_flatplate.test_iter = 20 + turb_sst_flatplate.test_vals = [-4.894651, -1.648175, -2.218517, 0.580205, -0.691347, 4.979689] + test_list.append(turb_sst_flatplate) + + # S809 wind turbine airfoil, SA + turb_s809 = TestCase('turb_s809') + turb_s809.cfg_dir = "rans/s809" + turb_s809.cfg_file = "turb_S809.cfg" + turb_s809.test_iter = 20 + turb_s809.test_vals = [-4.630441, -3.675887, -3.599443, -2.233596, -10.265408] + test_list.append(turb_s809) + ####################################### ### Axisymmetric Compressible RANS ### #######################################