Skip to content
13 changes: 5 additions & 8 deletions TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@ MARKER_HEATFLUX= ( WALL, 0.0 )
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 )
%
MARKER_MONITORING = (WALL)

% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
%
NUM_METHOD_GRAD= GREEN_GAUSS
%
CFL_NUMBER= 1000.0
CFL_ADAPT= NO
MAX_DELTA_TIME= 1E6
OBJECTIVE_FUNCTION= DRAG
%
% ----------- SLOPE LIMITER AND DISSIPATION SENSOR DEFINITION -----------------%
%
Expand All @@ -71,10 +72,6 @@ LINEAR_SOLVER_ILU_FILL_IN= 0
LINEAR_SOLVER_ERROR= 0.01
LINEAR_SOLVER_ITER= 10
%
% -------------------------- MULTIGRID PARAMETERS -----------------------------%
%
MGLEVEL= 0
%
% -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------%
%
CONV_NUM_METHOD_FLOW= ROE
Expand All @@ -101,5 +98,5 @@ 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.
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION, \
RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION)
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION, TOTAL_HEATFLUX, \
RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION, SENS_AOA, SENS_MACH)
3 changes: 2 additions & 1 deletion TestCases/ddes/flatplate/ddes_flatplate.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ UNST_CFL_NUMBER= 0.0
%
% Number of internal iterations (dual time method)
INNER_ITER= 20

% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
%
% Navier-Stokes wall boundary marker(s) (NONE = no marker)
Expand Down Expand Up @@ -226,4 +227,4 @@ SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
%
% Screen output
SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the TIME_ITER to help with the regression scripts. Though the "SIM_VALUES" that are used in the regression don't seem to be the final simulation residual/coefficient values.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That may not be ideal, without time iter the script will look at time step 0, we should test more than that.
With time iter it will look at the first inner iteration for the timestep you want.

SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG, TOTAL_HEATFLUX)
38 changes: 19 additions & 19 deletions TestCases/hybrid_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,26 +109,26 @@ def main():
cylinder.cfg_dir = "navierstokes/cylinder"
cylinder.cfg_file = "lam_cylinder.cfg"
cylinder.test_iter = 25
cylinder.test_vals = [-6.765429, -1.297425, 0.019571, 0.310232]
cylinder.test_vals_aarch64 = [-6.765429, -1.297425, 0.019571, 0.310231]
cylinder.test_vals = [-6.765429, -1.297425, 0.019571, 0.310232, 0.123270]
cylinder.test_vals_aarch64 = [-6.765429, -1.297425, 0.019571, 0.310231, 0.123270]
test_list.append(cylinder)

# Laminar cylinder (low Mach correction)
cylinder_lowmach = TestCase('cylinder_lowmach')
cylinder_lowmach.cfg_dir = "navierstokes/cylinder"
cylinder_lowmach.cfg_file = "cylinder_lowmach.cfg"
cylinder_lowmach.test_iter = 25
cylinder_lowmach.test_vals = [-6.850130, -1.388096, -0.056036, 108.140811]
cylinder_lowmach.test_vals_aarch64 = [-6.850130, -1.388096, -0.056036, 108.140813]
cylinder_lowmach.test_vals = [-6.850130, -1.388096, -0.056036, 108.140811, 0.007988]
cylinder_lowmach.test_vals_aarch64 = [-6.850130, -1.388096, -0.056036, 108.140813, 0.007988]
test_list.append(cylinder_lowmach)

# 2D Poiseuille flow (body force driven with periodic inlet / outlet)
poiseuille = TestCase('poiseuille')
poiseuille.cfg_dir = "navierstokes/poiseuille"
poiseuille.cfg_file = "lam_poiseuille.cfg"
poiseuille.test_iter = 10
poiseuille.test_vals = [-5.048282, 0.650814, 0.008714, 13.677678]
poiseuille.test_vals_aarch64 = [-5.048282, 0.650814, 0.008713, 13.677691]
poiseuille.test_vals = [-5.048282, 0.650814, 0.008714, 13.677678, -2.054800]
poiseuille.test_vals_aarch64 = [-5.048282, 0.650814, 0.008713, 13.677691, -2.054800]
test_list.append(poiseuille)

# 2D Poiseuille flow (inlet profile file)
Expand Down Expand Up @@ -158,15 +158,15 @@ 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]
rae2822_sa.test_vals = [-2.020123, -5.269330, 0.807147, 0.060499, -80603.000000]
test_list.append(rae2822_sa)

# RAE2822 SST
rae2822_sst = TestCase('rae2822_sst')
rae2822_sst.cfg_dir = "rans/rae2822"
rae2822_sst.cfg_file = "turb_SST_RAE2822.cfg"
rae2822_sst.test_iter = 20
rae2822_sst.test_vals = [-0.510635, 4.871104, 0.811904, 0.061614]
rae2822_sst.test_vals = [-0.510635, 4.871104, 0.811904, 0.061614, -82395.000000]
test_list.append(rae2822_sst)

# RAE2822 SST_SUST
Expand All @@ -190,25 +190,25 @@ 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.388836, -6.689414, 0.230320, 0.157640]
turb_oneram6.test_vals = [-2.388836, -6.689414, 0.230320, 0.157640, -32539.000000]
test_list.append(turb_oneram6)

# NACA0012 (SA, FUN3D finest grid results: CL=1.0983, CD=0.01242)
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_vals = [-8.627052, -10.377936, 1.064491, 0.019710, 20.000000, -1.763095, 20.000000, -4.794176]
turb_naca0012_sa.test_vals_aarch64 = [-8.627052, -10.377936, 1.064491, 0.019710, 20.000000, -1.763093, 20.000000, -4.794073]
turb_naca0012_sa.test_vals = [-8.627052, -10.377936, 1.064491, 0.019710, 20.000000, -1.763095, 20.000000, -4.794176, -46.506000]
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)

# NACA0012 (SST, FUN3D finest grid results: CL=1.0840, CD=0.01253)
turb_naca0012_sst = TestCase('turb_naca0012_sst')
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 = [-11.450475, -12.797872, -5.863655, 1.049989, 0.019163, -1.856263]
turb_naca0012_sst.test_vals_aarch64 = [-11.450473, -12.797872, -5.863655, 1.049989, 0.019163, -1.856266]
turb_naca0012_sst.test_vals = [-11.450475, -12.797872, -5.863655, 1.049989, 0.019163, -1.856263, -38.694000]
turb_naca0012_sst.test_vals_aarch64 = [-11.450473, -12.797872, -5.863655, 1.049989, 0.019163, -1.856266, -38.694000]
test_list.append(turb_naca0012_sst)

# NACA0012 (SST_SUST, FUN3D finest grid results: CL=1.0840, CD=0.01253)
Expand Down Expand Up @@ -254,8 +254,8 @@ def main():
axi_rans_air_nozzle.cfg_dir = "axisymmetric_rans/air_nozzle"
axi_rans_air_nozzle.cfg_file = "air_nozzle.cfg"
axi_rans_air_nozzle.test_iter = 10
axi_rans_air_nozzle.test_vals = [-12.093575, -6.630426, -8.798725, -2.399130]
axi_rans_air_nozzle.test_vals_aarch64 = [-12.093539, -6.630357, -8.798732, -2.399130]
axi_rans_air_nozzle.test_vals = [-12.093575, -6.630426, -8.798725, -2.399130, -1938.200000]
axi_rans_air_nozzle.test_vals_aarch64 = [-12.093539, -6.630357, -8.798732, -2.399130, -1938.200000]
test_list.append(axi_rans_air_nozzle)

#################################
Expand Down Expand Up @@ -392,8 +392,8 @@ def main():
inc_poly_cylinder.cfg_dir = "incomp_navierstokes/cylinder"
inc_poly_cylinder.cfg_file = "poly_cylinder.cfg"
inc_poly_cylinder.test_iter = 20
inc_poly_cylinder.test_vals = [-7.851512, -2.093420, 0.029974, 1.921595]
inc_poly_cylinder.test_vals_aarch64 = [-7.851510, -2.093419, 0.029974, 1.921595]
inc_poly_cylinder.test_vals = [-7.851512, -2.093420, 0.029974, 1.921595, -175.300000]
inc_poly_cylinder.test_vals_aarch64 = [-7.851510, -2.093419, 0.029974, 1.921595, -175.300000]
inc_poly_cylinder.new_output = True
test_list.append(inc_poly_cylinder)

Expand Down Expand Up @@ -457,7 +457,7 @@ def main():
square_cylinder.cfg_dir = "unsteady/square_cylinder"
square_cylinder.cfg_file = "turb_square.cfg"
square_cylinder.test_iter = 3
square_cylinder.test_vals = [-1.162564, 0.066401, 1.399788, 2.220402, 1.399743, 2.218603]
square_cylinder.test_vals = [-2.558087, -1.162564, 0.066401, 1.399788, 2.220402, 1.399743, 2.218603, -0.453110]
square_cylinder.unsteady = True
test_list.append(square_cylinder)

Expand Down Expand Up @@ -486,7 +486,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.883004, -0.215005, 0.023783]
ddes_flatplate.test_vals = [-2.714758, -5.883004, -0.215005, 0.023783, -618.160000]
ddes_flatplate.unsteady = True
test_list.append(ddes_flatplate)

Expand Down
1 change: 0 additions & 1 deletion TestCases/incomp_navierstokes/bend/lam_bend.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,4 @@ SURFACE_ADJ_FILENAME= surface_adjoint
% Writing solution file frequency
OUTPUT_WRT_FREQ= 1000
%
%
SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
1 change: 0 additions & 1 deletion TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ SURFACE_FILENAME= surface_flow
% Writing solution file frequency
OUTPUT_WRT_FREQ= 100
%
%
% Screen output fields
SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)

2 changes: 1 addition & 1 deletion TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -287,4 +287,4 @@ OUTPUT_WRT_FREQ= 250
%
%
% Screen output fields
SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_TEMPERATURE, LIFT, DRAG)
SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_TEMPERATURE, LIFT, DRAG, TOTAL_HEATFLUX)
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OUTER_ITER = 31
%
CONV_RESIDUAL_MINVAL= -26
%
SCREEN_OUTPUT= (OUTER_ITER, BGS_PRESSURE[0], BGS_TEMPERATURE[0], BGS_TEMPERATURE[1], STREAMWISE_MASSFLOW[0], STREAMWISE_DP[0], AVG_TEMPERATURE[1] )
SCREEN_OUTPUT= (OUTER_ITER, BGS_PRESSURE[0], BGS_TEMPERATURE[0], BGS_TEMPERATURE[1], STREAMWISE_MASSFLOW[0], STREAMWISE_DP[0], AVG_TEMPERATURE[1], TOTAL_HEATFLUX[0] )
SCREEN_WRT_FREQ_OUTER= 100
%
HISTORY_OUTPUT= ( ITER, RMS_RES[0], RMS_RES[1], STREAMWISE_PERIODIC[0], FLOW_COEFF[0], HEAT[1] )
Expand Down
2 changes: 1 addition & 1 deletion TestCases/incomp_rans/naca0012/naca0012.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -242,5 +242,5 @@ OUTPUT_WRT_FREQ= 100
%
%
% Screen output fields
SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_NU_TILDE, LIFT, DRAG)
SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_NU_TILDE, LIFT, DRAG, TOTAL_HEATFLUX)

2 changes: 1 addition & 1 deletion TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,4 @@ OUTPUT_WRT_FREQ= 250
%
%
% Screen output fields
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG, TOTAL_HEATFLUX)
2 changes: 1 addition & 1 deletion TestCases/navierstokes/cylinder/lam_cylinder.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,4 @@ OUTPUT_WRT_FREQ= 250
%
%
% Screen output fields
SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG, TOTAL_HEATFLUX)
2 changes: 1 addition & 1 deletion TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,6 @@ OUTPUT_WRT_FREQ= 500
%
%
% Screen output
SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG, TOTAL_HEATFLUX)
%
OUTPUT_FILES=(RESTART_ASCII)
81 changes: 3 additions & 78 deletions TestCases/nonequilibrium/axi_visccone/axi_visccone.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,151 +4,76 @@
% Case description: Mach 5 viscous flow over a 10deg wedge %
% Author: C. Garbacz %
% Institution: Strathclyde University %
% Date: 2020.11.01 %
% File Version 7.3.1 "Blackbird" %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
%
% Physical governing equations (EULER, NAVIER_STOKES,
% WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
% POISSON_EQUATION)
SOLVER= NEMO_NAVIER_STOKES
%
GAS_MODEL= AIR-5
%
GAS_COMPOSITION= (0.77, 0.23, 0.0, 0.0, 0.0)
%
% Mathematical problem (DIRECT, CONTINUOUS_ADJOINT)
MATH_PROBLEM= DIRECT
%
% Restart solution (NO, YES)
RESTART_SOL= NO
%
% Axisymmetric simulation, only compressible flows (NO, YES)
AXISYMMETRIC= YES

% ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
%
% Mach number (non-dimensional, based on the free-stream values)
MACH_NUMBER= 5
%
% Angle of attack (degrees)
AOA= 0.0
%
% Side-slip angle (degrees)
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 pressure (101325.0 N/m^2 by default, only Euler flows)
FREESTREAM_PRESSURE= 10.0
%
% Free-stream temperature (288.15 K by default)
FREESTREAM_TEMPERATURE= 288.15
FREESTREAM_TEMPERATURE_VE= 288.15
%
% Reynolds number (non-dimensional, based on the free-stream values)
REYNOLDS_NUMBER= 10000
KIND_TURB_MODEL= NONE

% ---- NONEQUILIBRIUM GAS, 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, MUTATIONPP, SU2_NONEQ)
FLUID_MODEL= SU2_NONEQ

% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
%
% Euler wall boundary marker(s) (NONE = no marker)
MARKER_EULER= ( Euler)
MARKER_ISOTHERMAL= (Wall, 300)
MARKER_OUTLET= ( Exit, 5 )
MARKER_FAR= ( Farfield, Inlet )
%
% Marker(s) of the surface to be plotted or designed
MARKER_PLOTTING= (NONE )
%
% Marker(s) of the surface where the functional (Cd, Cl, etc.) will be evaluated
MARKER_MONITORING= ( Wall )

% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
%
% Numerical method for spatial gradients (GREEN_GAUSS, LEAST_SQUARES,
% WEIGHTED_LEAST_SQUARES)
NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
%
% Courant-Friedrichs-Lewy condition of the finest grid
CFL_NUMBER= 3.0
%
% Number of total iterations
ITER= 11
%
% Linear solver for the implicit formulation (BCGSTAB, FGMRES)
LINEAR_SOLVER= BCGSTAB
%
% Min error of the linear solver for the implicit formulation
LINEAR_SOLVER_ERROR= 1E-6
%
% Max number of iterations of the linear solver for the implicit formulation
LINEAR_SOLVER_ITER= 5

% -----------------------------------------------------------------------%
%
% Convective numerical method (JST, LAX-FRIEDRICH, CUSP, ROE, AUSM, HLLC,
% TURKEL_PREC, MSW)
CONV_NUM_METHOD_FLOW= AUSM
%
% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)
%
MUSCL_FLOW= YES
%
% Slope limiter (VENKATAKRISHNAN, MINMOD)
SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
%
% Coefficient for the Venkat's limiter (upwind scheme). A larger values decrease
% the extent of limiting, values approaching zero cause
% lower-order approximation to the solution (0.05 by default)
VENKAT_LIMITER_COEFF= 0.05
%
% Time discretization (RUNGE-KUTTA_EXPLICIT, EULER_IMPLICIT, EULER_EXPLICIT)
TIME_DISCRE_FLOW= EULER_IMPLICIT

% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
% Start convergence criteria at iteration number
CONV_STARTITER= 10
%

% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
% Mesh input file
MESH_FILENAME= viscwedge.su2
%
% Mesh input file format (SU2, CGNS)
MESH_FORMAT= SU2
%
% Restart flow input file
SOLUTION_FILENAME= restart_flow.dat
%
TABULAR_FORMAT= TECPLOT
%
% Output file convergence history (w/o extension)
CONV_FILENAME= convergence
%
% Output file restart flow
RESTART_FILENAME= restart_flow.dat
%
% Output file flow (w/o extension) variables
VOLUME_FILENAME= soln_volume
%
% Output file surface flow coefficient (w/o extension)
SURFACE_FILENAME= soln_surface
%
OUTPUT_WRT_FREQ= 100
%
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY_0, RMS_DENSITY_1, RMS_DENSITY_2, RMS_DENSITY_3, RMS_DENSITY_4, RMS_ENERGY, RMS_ENERGY_VE, LIFT, DRAG, TOTAL_HEATFLUX)
OUTPUT_FILES= (RESTART_ASCII, PARAVIEW_ASCII)
Loading