Skip to content

Add regressions for all convective numerical schemes for NEMO #1885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WallyMaier merged 11 commits into from
Jan 18, 2023
Merged

Add regressions for all convective numerical schemes for NEMO #1885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8251d01
update some version numbers, and add regressions for nemo schemes
WallyMaier Jan 12, 2023
a9473ea
update some regressions
WallyMaier Jan 12, 2023
c8675f7
fix regressions, one more needed
WallyMaier Jan 12, 2023
ddeea61
should work now
WallyMaier Jan 12, 2023
2dba8f7
Merge branch 'develop' into feature_nemo_ausm_regressions
WallyMaier Jan 12, 2023
c2fc6e5
Merge branch 'develop' into feature_nemo_ausm_regressions
WallyMaier Jan 13, 2023
f97c85d
change ausm+-up2 regression
WallyMaier Jan 18, 2023
12fd256
Merge branch 'feature_nemo_ausm_regressions' of https://github.com/su…
WallyMaier Jan 18, 2023
143cb13
Merge branch 'develop' into feature_nemo_ausm_regressions
WallyMaier Jan 18, 2023
f828f43
update ap2 regression values
WallyMaier Jan 18, 2023
0acfbbc
Merge branch 'feature_nemo_ausm_regressions' of https://github.com/su…
WallyMaier Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SU2_CFD/src/output/output_structure_legacy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2776,7 +2776,7 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry

Breakdown_file << "\n" <<"-------------------------------------------------------------------------" << "\n";
Breakdown_file <<"| ___ _ _ ___ |" << "\n";
Breakdown_file <<"| / __| | | |_ ) Release 7.4.0 \"Blackbird\" |" << "\n";
Breakdown_file <<"| / __| | | |_ ) Release 7.5.0 \"Blackbird\" |" << "\n";
Breakdown_file <<"| \\__ \\ |_| |/ / |" << "\n";
Breakdown_file <<"| |___/\\___//___| Suite (Computational Fluid Dynamics Code) |" << "\n";
Breakdown_file << "| |" << "\n";
Expand Down
2 changes: 1 addition & 1 deletion TestCases/nicf/coolprop/fluidModel.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
% Author: Peng Yan, Alberto Guardone %
% Institution: Politecnico di Milano %
% Date: 2022.10.8 %
% File Version 7.4.0 Blackbird %
% File Version 7.5.0 Blackbird %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Expand Down
2 changes: 1 addition & 1 deletion TestCases/nicf/coolprop/transportModel.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
% Author: Peng Yan, Alberto Guardone %
% Institution: Politecnico di Milano %
% Date: 2022.11.26 %
% File Version 7.4.0 Blackbird %
% File Version 7.5.0 Blackbird %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Expand Down
2 changes: 1 addition & 1 deletion ...ases/nonequilibrium/invwedge/invwedge.cfg → ...nonequilibrium/invwedge/invwedge_ausm.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% SU2 configuration file %
% Case description: Mach 5 inviscid flow over a 10deg wedge %
% Case description: Mach 5 inviscid flow over a 10deg wedge-AUSM %
% Author: C. Garbacz %
% Institution: Strathclyde University %
% Date: 2020.11.01 %
Expand Down
73 changes: 73 additions & 0 deletions TestCases/nonequilibrium/invwedge/invwedge_ausmplusup2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% SU2 configuration file %
% Case description: Mach 5 inviscid flow over a 10deg wedge- AUSM+-Up2 %
% File Version 7.5.0 "Blackbird" %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
%
SOLVER= NEMO_EULER
GAS_MODEL= AIR-5
GAS_COMPOSITION= (0.77, 0.23, 0.0, 0.0, 0.0)
MATH_PROBLEM= DIRECT
RESTART_SOL= NO

% ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
%
MACH_NUMBER= 5
AOA= 0.0
SIDESLIP_ANGLE= 0.0
FREESTREAM_PRESSURE= 101325.0
FREESTREAM_TEMPERATURE= 288.15
FREESTREAM_TEMPERATURE_VE= 288.15

% ---- NONEQUILIBRIUM GAS, IDEAL GAS, POLYTROPIC, VAN DER WAALS AND PENG ROBINSON CONSTANTS -------%
%
FLUID_MODEL= SU2_NONEQ

% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
%
MARKER_EULER= ( Euler, Wall )
MARKER_OUTLET= ( Exit, 10 )
MARKER_FAR = ( Farfield, Inlet )
MARKER_PLOTTING= (NONE )
MARKER_MONITORING= ( Wall )

% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
%
NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
CFL_NUMBER= 0.25
ITER= 11
LINEAR_SOLVER= BCGSTAB
LINEAR_SOLVER_ERROR= 1E-6
LINEAR_SOLVER_ITER= 5

% -----------------------------------------------------------------------%
%
CONV_NUM_METHOD_FLOW= AUSMPLUSUP2
MUSCL_FLOW= NO
SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
VENKAT_LIMITER_COEFF= 0.05
TIME_DISCRE_FLOW= EULER_EXPLICIT

% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
CONV_RESIDUAL_MINVAL= -50
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
CONV_CAUCHY_EPS= 1E-10

% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
SOLUTION_FILENAME= restart_flow.dat
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
RESTART_FILENAME= restart_flow.dat
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
OUTPUT_FILES= (RESTART_ASCII, PARAVIEW_ASCII)
73 changes: 73 additions & 0 deletions TestCases/nonequilibrium/invwedge/invwedge_lax.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% SU2 configuration file %
% Case description: Mach 5 inviscid flow over a 10deg wedge-LAX %
% File Version 7.5.0 "Blackbird" %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
%
SOLVER= NEMO_EULER
GAS_MODEL= AIR-5
GAS_COMPOSITION= (0.77, 0.23, 0.0, 0.0, 0.0)
MATH_PROBLEM= DIRECT
RESTART_SOL= NO

% ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
%
MACH_NUMBER= 5
AOA= 0.0
SIDESLIP_ANGLE= 0.0
FREESTREAM_PRESSURE= 101325.0
FREESTREAM_TEMPERATURE= 288.15
FREESTREAM_TEMPERATURE_VE= 288.15

% ---- NONEQUILIBRIUM GAS, IDEAL GAS, POLYTROPIC, VAN DER WAALS AND PENG ROBINSON CONSTANTS -------%
%
FLUID_MODEL= SU2_NONEQ

% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
%
MARKER_EULER= ( Euler, Wall )
MARKER_OUTLET= ( Exit, 10 )
MARKER_FAR = ( Farfield, Inlet )
MARKER_PLOTTING= (NONE )
MARKER_MONITORING= ( Wall )

% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
%
NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
CFL_NUMBER= 3
ITER= 11
LINEAR_SOLVER= BCGSTAB
LINEAR_SOLVER_ERROR= 1E-6
LINEAR_SOLVER_ITER= 5

% -----------------------------------------------------------------------%
%
CONV_NUM_METHOD_FLOW= LAX-FRIEDRICH
MUSCL_FLOW= YES
SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
VENKAT_LIMITER_COEFF= 0.05
TIME_DISCRE_FLOW= EULER_IMPLICIT

% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
CONV_RESIDUAL_MINVAL= -50
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
CONV_CAUCHY_EPS= 1E-10

% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
SOLUTION_FILENAME= restart_flow.dat
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
RESTART_FILENAME= restart_flow.dat
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
OUTPUT_FILES= (RESTART_ASCII, PARAVIEW_ASCII)
73 changes: 73 additions & 0 deletions TestCases/nonequilibrium/invwedge/invwedge_msw.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% SU2 configuration file %
% Case description: Mach 5 inviscid flow over a 10deg wedge-MSW %
% File Version 7.5.0 "Blackbird" %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
%
SOLVER= NEMO_EULER
GAS_MODEL= AIR-5
GAS_COMPOSITION= (0.77, 0.23, 0.0, 0.0, 0.0)
MATH_PROBLEM= DIRECT
RESTART_SOL= NO

% ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
%
MACH_NUMBER= 5
AOA= 0.0
SIDESLIP_ANGLE= 0.0
FREESTREAM_PRESSURE= 101325.0
FREESTREAM_TEMPERATURE= 288.15
FREESTREAM_TEMPERATURE_VE= 288.15

% ---- NONEQUILIBRIUM GAS, IDEAL GAS, POLYTROPIC, VAN DER WAALS AND PENG ROBINSON CONSTANTS -------%
%
FLUID_MODEL= SU2_NONEQ

% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
%
MARKER_EULER= ( Euler, Wall )
MARKER_OUTLET= ( Exit, 10 )
MARKER_FAR = ( Farfield, Inlet )
MARKER_PLOTTING= (NONE )
MARKER_MONITORING= ( Wall )

% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
%
NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
CFL_NUMBER= 3
ITER= 11
LINEAR_SOLVER= BCGSTAB
LINEAR_SOLVER_ERROR= 1E-6
LINEAR_SOLVER_ITER= 5

% -----------------------------------------------------------------------%
%
CONV_NUM_METHOD_FLOW= MSW
MUSCL_FLOW= YES
SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
VENKAT_LIMITER_COEFF= 0.05
TIME_DISCRE_FLOW= EULER_IMPLICIT

% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
CONV_RESIDUAL_MINVAL= -50
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
CONV_CAUCHY_EPS= 1E-10

% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
SOLUTION_FILENAME= restart_flow.dat
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
RESTART_FILENAME= restart_flow.dat
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
OUTPUT_FILES= (RESTART_ASCII, PARAVIEW_ASCII)
73 changes: 73 additions & 0 deletions TestCases/nonequilibrium/invwedge/invwedge_roe.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% SU2 configuration file %
% Case description: Mach 5 inviscid flow over a 10deg wedge-ROE %
% File Version 7.5.0 "Blackbird" %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
%
SOLVER= NEMO_EULER
GAS_MODEL= AIR-5
GAS_COMPOSITION= (0.77, 0.23, 0.0, 0.0, 0.0)
MATH_PROBLEM= DIRECT
RESTART_SOL= NO

% ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
%
MACH_NUMBER= 5
AOA= 0.0
SIDESLIP_ANGLE= 0.0
FREESTREAM_PRESSURE= 101325.0
FREESTREAM_TEMPERATURE= 288.15
FREESTREAM_TEMPERATURE_VE= 288.15

% ---- NONEQUILIBRIUM GAS, IDEAL GAS, POLYTROPIC, VAN DER WAALS AND PENG ROBINSON CONSTANTS -------%
%
FLUID_MODEL= SU2_NONEQ

% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
%
MARKER_EULER= ( Euler, Wall )
MARKER_OUTLET= ( Exit, 10 )
MARKER_FAR = ( Farfield, Inlet )
MARKER_PLOTTING= (NONE )
MARKER_MONITORING= ( Wall )

% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
%
NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
CFL_NUMBER= 3
ITER= 11
LINEAR_SOLVER= BCGSTAB
LINEAR_SOLVER_ERROR= 1E-6
LINEAR_SOLVER_ITER= 5

% -----------------------------------------------------------------------%
%
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= -50
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
CONV_CAUCHY_EPS= 1E-10

% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
SOLUTION_FILENAME= restart_flow.dat
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
RESTART_FILENAME= restart_flow.dat
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
OUTPUT_FILES= (RESTART_ASCII, PARAVIEW_ASCII)
58 changes: 49 additions & 9 deletions TestCases/parallel_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,55 @@ def main():
thermalbath_frozen.new_output = True
test_list.append(thermalbath_frozen)

# Inviscid single wedge, implicit
invwedge = TestCase('invwedge')
invwedge.cfg_dir = "nonequilibrium/invwedge"
invwedge.cfg_file = "invwedge.cfg"
invwedge.test_iter = 10
invwedge.test_vals = [-1.042842, -1.567605, -18.300680, -18.628055, -18.574084, 2.275192, 1.879772, 5.319421, 0.873699]
invwedge.test_vals_aarch64 = [-1.042842, -1.567605, -18.300025, -18.627409, -18.573428, 2.275192, 1.879772, 5.319421, 0.873699]
invwedge.new_output = True
test_list.append(invwedge)
# Inviscid single wedge, ausm, implicit
invwedge_a = TestCase('invwedge_ausm')
invwedge_a.cfg_dir = "nonequilibrium/invwedge"
invwedge_a.cfg_file = "invwedge_ausm.cfg"
invwedge_a.test_iter = 10
invwedge_a.test_vals = [-1.042842, -1.567605, -18.300680, -18.628055, -18.574084, 2.275192, 1.879772, 5.319421, 0.873699]
invwedge_a.test_vals_aarch64 = [-1.042842, -1.567605, -18.300025, -18.627409, -18.573428, 2.275192, 1.879772, 5.319421, 0.873699]
invwedge_a.new_output = True
test_list.append(invwedge_a)

# Inviscid single wedge, ausm+-up2, implicit
invwedge_ap2 = TestCase('invwedge_ap2')
invwedge_ap2.cfg_dir = "nonequilibrium/invwedge"
invwedge_ap2.cfg_file = "invwedge_ausmplusup2.cfg"
invwedge_ap2.test_iter = 10
invwedge_ap2.test_vals = [-0.952589, -1.477352, -16.736014, -17.064021, -17.009120, 2.387086, 1.287286, 5.403046, 0.956402]
invwedge_ap2.test_vals_aarch64 = [-0.952589, -1.477352, -16.736014, -17.064021, -17.009120, 2.387086, 1.287286, 5.403046, 0.956402]
invwedge_ap2.new_output = True
test_list.append(invwedge_ap2)

# Inviscid single wedge, msw, implicit
invwedge_msw = TestCase('invwedge_msw')
invwedge_msw.cfg_dir = "nonequilibrium/invwedge"
invwedge_msw.cfg_file = "invwedge_msw.cfg"
invwedge_msw.test_iter = 10
invwedge_msw.test_vals = [-1.165957, -1.690720, -18.298756, -18.626164, -18.572159, 2.151638, 1.721236, 5.193813, 0.751584]
invwedge_msw.test_vals_aarch64 = [-1.165957, -1.690720, -18.298756, -18.626164, -18.572159, 2.151638, 1.721236, 5.193813, 0.751584]
invwedge_msw.new_output = True
test_list.append(invwedge_msw)

# Inviscid single wedge, roe, implicit
invwedge_roe = TestCase('invwedge_roe')
invwedge_roe.cfg_dir = "nonequilibrium/invwedge"
invwedge_roe.cfg_file = "invwedge_roe.cfg"
invwedge_roe.test_iter = 10
invwedge_roe.test_vals = [-1.038582, -1.563344, -18.300307, -18.627706, -18.573706, 2.278987, 1.861307, 5.323753, 0.874900]
invwedge_roe.test_vals_aarch64 = [-1.038582, -1.563344, -18.300307, -18.627706, -18.573706, 2.278987, 1.861307, 5.323753, 0.874900]
invwedge_roe.new_output = True
test_list.append(invwedge_roe)

# Inviscid single wedge, lax, implicit
invwedge_lax = TestCase('invwedge_lax')
invwedge_lax.cfg_dir = "nonequilibrium/invwedge"
invwedge_lax.cfg_file = "invwedge_lax.cfg"
invwedge_lax.test_iter = 10
invwedge_lax.test_vals = [-1.075662, -1.600425, -32.000000, -32.000000, -24.972431, 2.252952, 1.725158, 5.282140, 0.848823]
invwedge_lax.test_vals_aarch64 = [-1.075662, -1.600425, -32.000000, -32.000000, -24.972431, 2.252952, 1.725158, 5.282140, 0.848823]
invwedge_lax.new_output = True
test_list.append(invwedge_lax)

# Inviscid single wedge, implicit, NEMO supersonic inlet
invwedge_ss_inlet = TestCase('invwedge_ss_inlet')
Expand Down
Loading