diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg index 63c749021f2..d2f8e274b2f 100644 --- a/TestCases/euler/CRM/inv_CRM_JST.cfg +++ b/TestCases/euler/CRM/inv_CRM_JST.cfg @@ -47,7 +47,7 @@ CFL_NUMBER= 5.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 diff --git a/TestCases/euler/biparabolic/EA_TEST.cfg b/TestCases/euler/biparabolic/EA_TEST.cfg new file mode 100644 index 00000000000..e216f440870 --- /dev/null +++ b/TestCases/euler/biparabolic/EA_TEST.cfg @@ -0,0 +1,115 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% SU2 configuration file % +% Case description: Supersonic inviscid flow around a biparabolic airfoil % +% Author: Trent W. Lukaczyk % +% Institution: Stanford University % +% Date: 2012.08.16 % +% File Version 8.5.0 "Harrier" % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------% +% +SOLVER= EULER +MATH_PROBLEM= DIRECT +RESTART_SOL= NO + +% ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------% +% +MACH_NUMBER= 1.7 +AOA= 0.0 +FREESTREAM_PRESSURE= 101325.0 +FREESTREAM_TEMPERATURE= 288.15 + +% ---------------------- REFERENCE VALUE DEFINITION ---------------------------% +% +REF_ORIGIN_MOMENT_X = 0.25 +REF_ORIGIN_MOMENT_Y = 0.00 +REF_ORIGIN_MOMENT_Z = 0.00 +REF_LENGTH= 1.0 +REF_AREA= 1.0 + +% ----------------------- BOUNDARY CONDITION DEFINITION -----------------------% +% +MARKER_EULER= ( airfoil ) +MARKER_FAR= ( farfield ) +MARKER_PLOTTING= ( airfoil ) +MARKER_MONITORING= ( airfoil ) + +% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------% +% +NUM_METHOD_GRAD= GREEN_GAUSS +CFL_NUMBER= 2.0 +CFL_ADAPT= YES +CFL_ADAPT_PARAM= ( 0.5, 1.5, 1.0, 50.0 ) +ITER= 500 + +% ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% +% + +OBJECTIVE_FUNCTION= EQUIVALENT_AREA +CONV_NUM_METHOD_ADJFLOW= JST +ADJ_SHARP_LIMITER_COEFF= 3.0 +ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) +CFL_REDUCTION_ADJFLOW= 0.8 +TIME_DISCRE_ADJFLOW= EULER_IMPLICIT + +% ------------------------ GRID DEFORMATION PARAMETERS ------------------------% +% + +DV_KIND= PARABOLIC +DV_MARKER= ( airfoil ) +DV_PARAM= ( 0.5, 5 ) +DV_VALUE= 0.01 +HOLD_GRID_FIXED= YES +HOLD_GRID_FIXED_COORD= ( -0.2, -0.4, 0.0, 2.2, 0.4, 0.0 ) + +% -------------------------- MULTIGRID PARAMETERS -----------------------------% +% + +MGLEVEL= 0 + +% ------------------------ SUPERSONIC SIMULATION ------------------------------% +% + +% Equivalent-area / nearfield setup for sonic-boom studies. Disabled for the +% direct solve: enabling these produces 760 non-physical points and rms[Rho] +% stalls at +3.4 instead of -3.9. Re-enable together with MARKER_NEARFIELD +% below (and remove those two markers from MARKER_FAR) for adjoint EA work. +% + EQUIV_AREA= YES + EA_INT_LIMIT= ( 1.562, 4.562, 2.0 ) + MARKER_NEARFIELD= ( upper_nearfield, lower_nearfield ) + EA_SCALE_FACTOR= 1.0 + +% -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% +% +CONV_NUM_METHOD_FLOW= ROE +MUSCL_FLOW= YES +SLOPE_LIMITER_FLOW= VENKATAKRISHNAN +VENKAT_LIMITER_COEFF= 0.05 +TIME_DISCRE_FLOW= EULER_IMPLICIT + +% --------------------------- CONVERGENCE PARAMETERS --------------------------% +% +CONV_RESIDUAL_MINVAL= -6 +CONV_STARTITER= 10 + +% ------------------------- INPUT/OUTPUT INFORMATION --------------------------% +% +MESH_FILENAME= mesh_BIPARABOLIC_sup.su2 +MESH_FORMAT= SU2 +MESH_OUT_FILENAME= mesh_out +SOLUTION_FILENAME= solution_flow +SOLUTION_ADJ_FILENAME= solution_adj +TABULAR_FORMAT= CSV +CONV_FILENAME= history +RESTART_FILENAME= restart_flow +RESTART_ADJ_FILENAME= restart_adj +VOLUME_FILENAME= volume_flow +VOLUME_ADJ_FILENAME= volume_adjoint +GRAD_OBJFUNC_FILENAME= of_grad +SURFACE_FILENAME= surface_flow +SURFACE_ADJ_FILENAME= surface_adjoint +OUTPUT_WRT_FREQ= 500 diff --git a/TestCases/euler/biparabolic/NF_ONLY.cfg b/TestCases/euler/biparabolic/NF_ONLY.cfg new file mode 100644 index 00000000000..39a6156911e --- /dev/null +++ b/TestCases/euler/biparabolic/NF_ONLY.cfg @@ -0,0 +1,116 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% SU2 configuration file % +% Case description: Supersonic inviscid flow around a biparabolic airfoil % +% Author: Trent W. Lukaczyk % +% Institution: Stanford University % +% Date: 2012.08.16 % +% File Version 8.5.0 "Harrier" % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------% +% +SOLVER= EULER +MATH_PROBLEM= DIRECT +RESTART_SOL= NO + +% ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------% +% +MACH_NUMBER= 1.7 +AOA= 0.0 +FREESTREAM_PRESSURE= 101325.0 +FREESTREAM_TEMPERATURE= 288.15 + +% ---------------------- REFERENCE VALUE DEFINITION ---------------------------% +% +REF_ORIGIN_MOMENT_X = 0.25 +REF_ORIGIN_MOMENT_Y = 0.00 +REF_ORIGIN_MOMENT_Z = 0.00 +REF_LENGTH= 1.0 +REF_AREA= 1.0 + +% ----------------------- BOUNDARY CONDITION DEFINITION -----------------------% +% +MARKER_EULER= ( airfoil ) +MARKER_FAR= ( farfield) +MARKER_PLOTTING= ( airfoil ) +MARKER_MONITORING= ( airfoil ) + + +% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------% +% +NUM_METHOD_GRAD= GREEN_GAUSS +CFL_NUMBER= 2.0 +CFL_ADAPT= YES +CFL_ADAPT_PARAM= ( 0.5, 1.5, 1.0, 50.0 ) +ITER= 500 + +% ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% +% + +OBJECTIVE_FUNCTION= EQUIVALENT_AREA +CONV_NUM_METHOD_ADJFLOW= JST +ADJ_SHARP_LIMITER_COEFF= 3.0 +ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) +CFL_REDUCTION_ADJFLOW= 0.8 +TIME_DISCRE_ADJFLOW= EULER_IMPLICIT + +% ------------------------ GRID DEFORMATION PARAMETERS ------------------------% +% + +DV_KIND= PARABOLIC +DV_MARKER= ( airfoil ) +DV_PARAM= ( 0.5, 5 ) +DV_VALUE= 0.01 +HOLD_GRID_FIXED= YES +HOLD_GRID_FIXED_COORD= ( -0.2, -0.4, 0.0, 2.2, 0.4, 0.0 ) + +% -------------------------- MULTIGRID PARAMETERS -----------------------------% +% + +MGLEVEL= 0 + +% ------------------------ SUPERSONIC SIMULATION ------------------------------% +% + +% Equivalent-area / nearfield setup for sonic-boom studies. Disabled for the +% direct solve: enabling these produces 760 non-physical points and rms[Rho] +% stalls at +3.4 instead of -3.9. Re-enable together with MARKER_NEARFIELD +% below (and remove those two markers from MARKER_FAR) for adjoint EA work. +% +% EQUIV_AREA= YES +% EA_INT_LIMIT= ( -100.0, 100.0, 2.0 ) + MARKER_NEARFIELD= ( upper_nearfield, lower_nearfield ) + + +% -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% +% +CONV_NUM_METHOD_FLOW= ROE +MUSCL_FLOW= YES +SLOPE_LIMITER_FLOW= VENKATAKRISHNAN +VENKAT_LIMITER_COEFF= 0.05 +TIME_DISCRE_FLOW= EULER_IMPLICIT + +% --------------------------- CONVERGENCE PARAMETERS --------------------------% +% +CONV_RESIDUAL_MINVAL= -6 +CONV_STARTITER= 10 + +% ------------------------- INPUT/OUTPUT INFORMATION --------------------------% +% +MESH_FILENAME= mesh_BIPARABOLIC_sup.su2 +MESH_FORMAT= SU2 +MESH_OUT_FILENAME= mesh_out +SOLUTION_FILENAME= solution_flow +SOLUTION_ADJ_FILENAME= solution_adj +TABULAR_FORMAT= CSV +CONV_FILENAME= history +RESTART_FILENAME= restart_flow +RESTART_ADJ_FILENAME= restart_adj +VOLUME_FILENAME= volume_flow +VOLUME_ADJ_FILENAME= volume_adjoint +GRAD_OBJFUNC_FILENAME= of_grad +SURFACE_FILENAME= surface_flow +SURFACE_ADJ_FILENAME= surface_adjoint +OUTPUT_WRT_FREQ= 500 diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg index 5161a04413d..39b9e03df69 100644 --- a/TestCases/euler/channel/inv_channel.cfg +++ b/TestCases/euler/channel/inv_channel.cfg @@ -51,7 +51,7 @@ CFL_NUMBER= 6.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..0cc6a149ddd 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_ADAPT= NO -CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 ) +CFL_NUMBER= 3.0 +CFL_ADAPT= YES +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..69646aab1ee 100644 --- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg +++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg @@ -46,10 +46,10 @@ MARKER_MONITORING= ( wall ) % 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_ADAPT= YES +CFL_ADAPT_PARAM= ( 0.5, 1.5, 1.0, 100.0 ) RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 ) -EXT_ITER= 99999 +ITER= 30000 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------% % diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg index 4b36e58d583..bc6d8387127 100644 --- a/TestCases/rans/s809/turb_S809.cfg +++ b/TestCases/rans/s809/turb_S809.cfg @@ -46,7 +46,7 @@ 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 +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 b5eeedb38ae..a98ad5b333f 100755 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -150,6 +150,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 = 25 + inv_channel.test_vals = [-2.440884, 0.027508, -0.483209, 3.044825] + 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 = 25 + inv_crm_jst.test_vals = [-2.145237, -2.046222, -2.198081, -2.050411, -1.558285] + test_list.append(inv_crm_jst) + ########################## ### Compressible N-S ### ########################## @@ -202,6 +218,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 = 25 + lam_naca0012.test_vals = [-5.217967, -2.867946, -2.901995, 0.256977] + test_list.append(lam_naca0012) + ########################## ### Compressible RANS ### ########################## @@ -335,6 +359,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 = 25 + turb_sst_flatplate.test_vals = [-4.245474, -1.275603, -1.700304, 1.240340, -1.342766, 4.003679] + 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 = 25 + turb_s809.test_vals = [-4.604018, -3.617906, -3.593938, -2.207865, -10.285758] + test_list.append(turb_s809) + ####################################### ### Axisymmetric Compressible RANS ### #######################################