From 88ed67893674b9148cce721963be6e066c61d5d8 Mon Sep 17 00:00:00 2001 From: TobiKattmann Date: Wed, 23 Mar 2022 16:51:09 +0100 Subject: [PATCH 1/2] Clean air nozzle cfg from comments and unnecessary options. --- .../air_nozzle/air_nozzle.cfg | 135 +++--------------- 1 file changed, 16 insertions(+), 119 deletions(-) diff --git a/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg b/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg index 6b384a6b701d..d3bd1b785a15 100644 --- a/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg +++ b/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg @@ -7,202 +7,99 @@ % File Version 7.3.0 "Blackbird" % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - +% % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------% % -% Physical governing equations (EULER, NAVIER_STOKES, -% FEM_EULER, FEM_NAVIER_STOKES, FEM_RANS, FEM_LES, -% WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY, -% POISSON_EQUATION) SOLVER= RANS -% -% Specify turbulence model (NONE, SA, SA_NEG, SST, SA_E, SA_COMP, SA_E_COMP) KIND_TURB_MODEL= SST -% -% Restart solution (NO, YES) RESTART_SOL= YES % -% System of measurements (SI, US) -% International system of units (SI): ( meters, kilograms, Kelvins, -% Newtons = kg m/s^2, Pascals = N/m^2, -% Density = kg/m^3, Speed = m/s, -% Equiv. Area = m^2 ) -% United States customary units (US): ( inches, slug, Rankines, lbf = slug ft/s^2, -% psf = lbf/ft^2, Density = slug/ft^3, -% Speed = ft/s, Equiv. Area = ft^2 ) -SYSTEM_MEASUREMENTS= SI -% AXISYMMETRIC= YES % % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------% % -% Mach number (non-dimensional, based on the free-stream values) MACH_NUMBER= 1E-9 % -% Angle of attack (degrees, only for compressible flows) -AOA= 0.0 -% -% Side-slip angle (degrees, only for compressible flows) -SIDESLIP_ANGLE= 0.0 -% -% Init option to choose between Reynolds (default) or thermodynamics quantities -% for initializing the solution (REYNOLDS, TD_CONDITIONS) INIT_OPTION= TD_CONDITIONS % -% Free-stream option to choose between density and temperature (default) for -% initializing the solution (TEMPERATURE_FS, DENSITY_FS) FREESTREAM_OPTION= TEMPERATURE_FS -% -% Free-stream pressure (101325.0 N/m^2, 2116.216 psf by default) FREESTREAM_PRESSURE= 1400000 -% -% Free-stream temperature (288.15 K, 518.67 R by default) FREESTREAM_TEMPERATURE= 373.15 % -% Compressible flow non-dimensionalization (DIMENSIONAL, FREESTREAM_PRESS_EQ_ONE, -% FREESTREAM_VEL_EQ_MACH, FREESTREAM_VEL_EQ_ONE) REF_DIMENSIONALIZATION= DIMENSIONAL - +% % ---- IDEAL GAS, POLYTROPIC, VAN DER WAALS AND PENG ROBINSON CONSTANTS -------% % -% Fluid model (STANDARD_AIR, IDEAL_GAS, VW_GAS, PR_GAS, -% CONSTANT_DENSITY, INC_IDEAL_GAS, INC_IDEAL_GAS_POLY) FLUID_MODEL= STANDARD_AIR - +% % --------------------------- VISCOSITY MODEL ---------------------------------% % -% Viscosity model (SUTHERLAND, CONSTANT_VISCOSITY, POLYNOMIAL_VISCOSITY). VISCOSITY_MODEL= CONSTANT_VISCOSITY +MU_CONSTANT= 1.716E-5 % -% Molecular Viscosity that would be constant (1.716E-5 by default) -MU_CONSTANT= 1.716E-5 - % --------------------------- THERMAL CONDUCTIVITY MODEL ----------------------% % -% Laminar Conductivity model (CONSTANT_CONDUCTIVITY, CONSTANT_PRANDTL, -% POLYNOMIAL_CONDUCTIVITY). CONDUCTIVITY_MODEL= CONSTANT_PRANDTL -% -% Laminar Prandtl number (0.72 (air), only for CONSTANT_PRANDTL) PRANDTL_LAM= 0.72 -% -% Turbulent Prandtl number (0.9 (air) by default) PRANDTL_TURB= 0.90 - +% % -------------------- BOUNDARY CONDITION DEFINITION --------------------------% % -% Navier-Stokes (no-slip), constant heat flux wall marker(s) (NONE = no marker) -% Format: ( marker name, constant heat flux (J/m^2), ... ) MARKER_HEATFLUX= ( WALL, 0.0 ) -% -% Symmetry boundary marker(s) (NONE = no marker) MARKER_SYM= ( SYMMETRY ) +MARKER_RIEMANN= ( INFLOW, TOTAL_CONDITIONS_PT, 1400000.0, 373.15, 1.0, 0.0, 0.0, \ + OUTFLOW, STATIC_PRESSURE, 100000.0, 0.0, 0.0, 0.0, 0.0 ) % -% Riemann boundary marker(s) (NONE = no marker) -% Format: (marker, data kind flag, list of data) -MARKER_RIEMANN= ( INFLOW, TOTAL_CONDITIONS_PT, 1400000.0, 373.15, 1.0, 0.0, 0.0, OUTFLOW, STATIC_PRESSURE, 100000.0, 0.0, 0.0, 0.0, 0.0 ) - % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------% % -% Numerical method for spatial gradients (GREEN_GAUSS, WEIGHTED_LEAST_SQUARES) NUM_METHOD_GRAD= GREEN_GAUSS % -% CFL number (initial value for the adaptive CFL number) CFL_NUMBER= 1000.0 -% -% Adaptive CFL number (NO, YES) CFL_ADAPT= NO -% -% Parameters of the adaptive CFL number (factor down, factor up, CFL min value, -% CFL max value ) -CFL_ADAPT_PARAM= ( 0.1, 2.0, 10.0, 1000.0 ) -% -% Maximum Delta Time in local time stepping simulations MAX_DELTA_TIME= 1E6 - +% % ----------- SLOPE LIMITER AND DISSIPATION SENSOR DEFINITION -----------------% % -% Monotonic Upwind Scheme for Conservation Laws (TVD) in the flow equations. -% Required for 2nd order upwind schemes (NO, YES) MUSCL_FLOW= YES -% -% Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG, -% BARTH_JESPERSEN, VAN_ALBADA_EDGE) SLOPE_LIMITER_FLOW= NONE - +% % ------------------------ LINEAR SOLVER DEFINITION ---------------------------% % -% Linear solver or smoother for implicit formulations (BCGSTAB, FGMRES, SMOOTHER_JACOBI, -% SMOOTHER_ILU, SMOOTHER_LUSGS, -% SMOOTHER_LINELET) LINEAR_SOLVER= FGMRES -% -% Preconditioner of the Krylov linear solver (ILU, LU_SGS, LINELET, JACOBI) LINEAR_SOLVER_PREC= ILU -% -% Linear solver ILU preconditioner fill-in level (0 by default) LINEAR_SOLVER_ILU_FILL_IN= 0 -% -% Minimum error of the linear solver for implicit formulations LINEAR_SOLVER_ERROR= 0.01 -% -% Max number of iterations of the linear solver for the implicit formulation LINEAR_SOLVER_ITER= 10 - +% % -------------------------- MULTIGRID PARAMETERS -----------------------------% % -% Multi-grid levels (0 = no multi-grid) MGLEVEL= 0 - +% % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % -% Convective numerical method (JST, LAX-FRIEDRICH, CUSP, ROE, AUSM, AUSMPLUSUP, AUSMPLUSUP2, HLLC, -% TURKEL_PREC, MSW, FDS) CONV_NUM_METHOD_FLOW= ROE -% -% Entropy fix coefficient (0.0 implies no entropy fixing, 1.0 implies scalar -% artificial dissipation) ENTROPY_FIX_COEFF= 0.1 -% -% Time discretization (RUNGE-KUTTA_EXPLICIT, EULER_IMPLICIT, EULER_EXPLICIT) TIME_DISCRE_FLOW= EULER_IMPLICIT % - % -------------------- TURBULENT NUMERICAL METHOD DEFINITION ------------------% % -% Convective numerical method (SCALAR_UPWIND) CONV_NUM_METHOD_TURB= SCALAR_UPWIND -% -% Time discretization (EULER_IMPLICIT) TIME_DISCRE_TURB= EULER_IMPLICIT -% -% Reduction factor of the CFL coefficient in the turbulence problem CFL_REDUCTION_TURB= 1.0 - +% % --------------------------- CONVERGENCE PARAMETERS --------------------------% % -% Number of total iterations ITER= 1000 -% -% Min value of the residual (log10 of the residual) CONV_RESIDUAL_MINVAL= -12 -% -% Start convergence criteria at iteration number CONV_STARTITER= 10 - +% % ------------------------- INPUT/OUTPUT INFORMATION --------------------------% % -% Mesh input file MESH_FILENAME= nozzle.su2 % -% Mesh input file format (SU2, CGNS) -MESH_FORMAT= SU2 -% -% Restart flow input file SOLUTION_FILENAME= solution_flow.dat -% -% Writing solution file frequency OUTPUT_WRT_FREQ= 1000 % -% Screen output -SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION) +% Note: This .cfg is used for a primal and adjoint Testcase, therefore both residuals are present here. +SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION, \ + RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION) From 23e968f72c1ad0f9f5cf065b57e23782f9c4660f Mon Sep 17 00:00:00 2001 From: TobiKattmann <31306376+TobiKattmann@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:22:18 +0100 Subject: [PATCH 2/2] Fix to maybe trigger the reg tests? --- TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg b/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg index d3bd1b785a15..ec8f2749f6d2 100644 --- a/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg +++ b/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg @@ -100,6 +100,6 @@ MESH_FILENAME= nozzle.su2 SOLUTION_FILENAME= solution_flow.dat OUTPUT_WRT_FREQ= 1000 % -% Note: This .cfg is used for a primal and adjoint Testcase, therefore both residuals are present here. +% Note: This cfg is used for a primal and adjoint Testcase, therefore both residuals are present here. SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION, \ RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION)