Skip to content

Commit c3ab015

Browse files
authored
Merge pull request #2755 from Sahilll10/fix/unsteady-testcase-config-keys
Fix unsteady testcase configs and add regression tests
2 parents f846a45 + ebade04 commit c3ab015

4 files changed

Lines changed: 52 additions & 16 deletions

File tree

TestCases/serial_regression.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,30 @@ def main():
819819
unst_inc_turb_naca0015_sa.test_vals = [-3.007635, -6.879816, 1.445300, 0.419281]
820820
unst_inc_turb_naca0015_sa.unsteady = True
821821
test_list.append(unst_inc_turb_naca0015_sa)
822+
# unsteady pitching NACA64A010, RANS, SA
823+
unst_pitching_naca64a010_rans = TestCase('unst_pitching_naca64a010_rans')
824+
unst_pitching_naca64a010_rans.cfg_dir = "unsteady/pitching_naca64a010_rans"
825+
unst_pitching_naca64a010_rans.cfg_file = "turb_NACA64A010.cfg"
826+
unst_pitching_naca64a010_rans.test_iter = 2
827+
unst_pitching_naca64a010_rans.test_vals = [-1.299045, -3.951372, 0.010139, 0.008244]
828+
unst_pitching_naca64a010_rans.unsteady = True
829+
test_list.append(unst_pitching_naca64a010_rans)
830+
# unsteady pitching NACA64A010, Euler
831+
unst_pitching_naca64a010_euler = TestCase('unst_pitching_naca64a010_euler')
832+
unst_pitching_naca64a010_euler.cfg_dir = "unsteady/pitching_naca64a010_euler"
833+
unst_pitching_naca64a010_euler.cfg_file = "pitching_NACA64A010.cfg"
834+
unst_pitching_naca64a010_euler.test_iter = 2
835+
unst_pitching_naca64a010_euler.test_vals = [-1.186839, 4.280301, -0.038811, 0.000913]
836+
unst_pitching_naca64a010_euler.unsteady = True
837+
test_list.append(unst_pitching_naca64a010_euler)
838+
# unsteady plunging NACA0012, Laminar NS
839+
unst_plunging_naca0012 = TestCase('unst_plunging_naca0012')
840+
unst_plunging_naca0012.cfg_dir = "unsteady/plunging_naca0012"
841+
unst_plunging_naca0012.cfg_file = "plunging_NACA0012.cfg"
842+
unst_plunging_naca0012.test_iter = 2
843+
unst_plunging_naca0012.test_vals = [-4.083462, 1.366757, -3.718481, -0.066605]
844+
unst_plunging_naca0012.unsteady = True
845+
test_list.append(unst_plunging_naca0012)
822846

823847
# unsteady pitching NACA0012, Euler, Deforming
824848
unst_deforming_naca0012 = TestCase('unst_deforming_naca0012')

TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
SOLVER= EULER
1515
KIND_TURB_MODEL= NONE
1616
MATH_PROBLEM= DIRECT
17-
RESTART_SOL= NO
17+
RESTART_SOL= YES
1818

1919
% ------------------------- UNSTEADY SIMULATION -------------------------------%
2020
%
@@ -26,7 +26,9 @@ TIME_STEP= 0.0023555025613149587
2626
MAX_TIME= 0.59
2727
% 10 periods: 0.5888756403287397
2828
%
29-
INNER_ITER= 110
29+
TIME_DOMAIN= YES
30+
TIME_ITER= 100
31+
INNER_ITER= 20
3032
UNST_ADJOINT_ITER= 251
3133

3234
% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
@@ -67,16 +69,15 @@ MARKER_DESIGNING = ( airfoil )
6769
% ------------- COMMON PARAMETERS TO DEFINE THE NUMERICAL METHOD --------------%
6870
%
6971
NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
70-
CFL_NUMBER= 10.0
72+
CFL_NUMBER= 200.0
7173
CFL_ADAPT= NO
7274
CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
7375
RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
74-
EXT_ITER= 99999
7576

7677
% ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
7778
%
7879
LINEAR_SOLVER= FGMRES
79-
LINEAR_SOLVER_PREC= LU_SGS
80+
LINEAR_SOLVER_PREC= ILU
8081
LINEAR_SOLVER_ERROR= 1E-6
8182
LINEAR_SOLVER_ITER= 5
8283

@@ -131,7 +132,7 @@ CONV_CAUCHY_EPS= 1E-6
131132
MESH_FILENAME= mesh_NACA64A010_inv.su2
132133
MESH_FORMAT= SU2
133134
MESH_OUT_FILENAME= mesh_out
134-
SOLUTION_FILENAME= restart_flow
135+
SOLUTION_FILENAME= solution_flow
135136
SOLUTION_ADJ_FILENAME= solution_adj
136137
TABULAR_FORMAT= CSV
137138
CONV_FILENAME= history
@@ -142,10 +143,13 @@ VOLUME_ADJ_FILENAME= adjoint
142143
GRAD_OBJFUNC_FILENAME= of_grad
143144
SURFACE_FILENAME= surface_flow
144145
SURFACE_ADJ_FILENAME= surface_adjoint
146+
SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
145147
OUTPUT_WRT_FREQ= 250
146148

147149
% --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
148150
%
149151
OPT_OBJECTIVE= DRAG * 0.001
150152
OPT_CONSTRAINT= ( LIFT = 0.0 ) * 0.001; ( AREA > 0.0660957 ) * 0.001
151153
DEFINITION_DV= ( 30, 1.0 | airfoil | 0, 0.961538461538 ); ( 30, 1.0 | airfoil | 0, 0.923076923077 ); ( 30, 1.0 | airfoil | 0, 0.884615384615 ); ( 30, 1.0 | airfoil | 0, 0.846153846154 ); ( 30, 1.0 | airfoil | 0, 0.807692307692 ); ( 30, 1.0 | airfoil | 0, 0.769230769231 ); ( 30, 1.0 | airfoil | 0, 0.730769230769 ); ( 30, 1.0 | airfoil | 0, 0.692307692308 ); ( 30, 1.0 | airfoil | 0, 0.653846153846 ); ( 30, 1.0 | airfoil | 0, 0.615384615385 ); ( 30, 1.0 | airfoil | 0, 0.576923076923 ); ( 30, 1.0 | airfoil | 0, 0.538461538462 ); ( 30, 1.0 | airfoil | 0, 0.5 ); ( 30, 1.0 | airfoil | 0, 0.461538461538 ); ( 30, 1.0 | airfoil | 0, 0.423076923077 ); ( 30, 1.0 | airfoil | 0, 0.384615384615 ); ( 30, 1.0 | airfoil | 0, 0.346153846154 ); ( 30, 1.0 | airfoil | 0, 0.307692307692 ); ( 30, 1.0 | airfoil | 0, 0.269230769231 ); ( 30, 1.0 | airfoil | 0, 0.230769230769 ); ( 30, 1.0 | airfoil | 0, 0.192307692308 ); ( 30, 1.0 | airfoil | 0, 0.153846153846 ); ( 30, 1.0 | airfoil | 0, 0.115384615385 ); ( 30, 1.0 | airfoil | 0, 0.0769230769231 ); ( 30, 1.0 | airfoil | 0, 0.0384615384615 ); ( 30, 1.0 | airfoil | 1, 0.0384615384615 ); ( 30, 1.0 | airfoil | 1, 0.0769230769231 ); ( 30, 1.0 | airfoil | 1, 0.115384615385 ); ( 30, 1.0 | airfoil | 1, 0.153846153846 ); ( 30, 1.0 | airfoil | 1, 0.192307692308 ); ( 30, 1.0 | airfoil | 1, 0.230769230769 ); ( 30, 1.0 | airfoil | 1, 0.269230769231 ); ( 30, 1.0 | airfoil | 1, 0.307692307692 ); ( 30, 1.0 | airfoil | 1, 0.346153846154 ); ( 30, 1.0 | airfoil | 1, 0.384615384615 ); ( 30, 1.0 | airfoil | 1, 0.423076923077 ); ( 30, 1.0 | airfoil | 1, 0.461538461538 ); ( 30, 1.0 | airfoil | 1, 0.5 ); ( 30, 1.0 | airfoil | 1, 0.538461538462 ); ( 30, 1.0 | airfoil | 1, 0.576923076923 ); ( 30, 1.0 | airfoil | 1, 0.615384615385 ); ( 30, 1.0 | airfoil | 1, 0.653846153846 ); ( 30, 1.0 | airfoil | 1, 0.692307692308 ); ( 30, 1.0 | airfoil | 1, 0.730769230769 ); ( 30, 1.0 | airfoil | 1, 0.769230769231 ); ( 30, 1.0 | airfoil | 1, 0.807692307692 ); ( 30, 1.0 | airfoil | 1, 0.846153846154 ); ( 30, 1.0 | airfoil | 1, 0.884615384615 ); ( 30, 1.0 | airfoil | 1, 0.923076923077 ); ( 30, 1.0 | airfoil | 1, 0.961538461538 )
154+
READ_BINARY_RESTART= NO
155+
RESTART_ITER= 2

TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
1313
%
14-
SOLVER= NAVIER_STOKES
14+
SOLVER= RANS
1515
KIND_TURB_MODEL= SA
1616
MATH_PROBLEM= DIRECT
17-
RESTART_SOL= NO
17+
RESTART_SOL= YES
1818

1919
% ------------------------- UNSTEADY SIMULATION -------------------------------%
2020
%
@@ -27,7 +27,9 @@ TIME_STEP= 0.0023555025613149587
2727
MAX_TIME= 0.59
2828
% 10 periods: 0.5888756403287397
2929
%
30-
INNER_ITER= 2000
30+
TIME_DOMAIN= YES
31+
TIME_ITER= 100
32+
INNER_ITER= 30
3133
UNST_ADJOINT_ITER= 251
3234
GRID_MOVEMENT= RIGID_MOTION
3335
MACH_MOTION= 0.796
@@ -65,16 +67,15 @@ MARKER_DESIGNING = ( airfoil )
6567
% ------------- COMMON PARAMETERS TO DEFINE THE NUMERICAL METHOD --------------%
6668
%
6769
NUM_METHOD_GRAD= GREEN_GAUSS
68-
CFL_NUMBER= 4.0
70+
CFL_NUMBER= 200.0
6971
CFL_ADAPT= NO
7072
CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
7173
RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
72-
EXT_ITER= 99999
7374

7475
% ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
7576
%
7677
LINEAR_SOLVER= FGMRES
77-
LINEAR_SOLVER_PREC= LU_SGS
78+
LINEAR_SOLVER_PREC= ILU
7879
LINEAR_SOLVER_ERROR= 1E-6
7980
LINEAR_SOLVER_ITER= 5
8081

@@ -139,7 +140,7 @@ CONV_CAUCHY_EPS= 1E-5
139140
MESH_FILENAME= mesh_NACA64A010_turb.su2
140141
MESH_FORMAT= SU2
141142
MESH_OUT_FILENAME= mesh_out
142-
SOLUTION_FILENAME= restart_flow
143+
SOLUTION_FILENAME= solution_flow
143144
SOLUTION_ADJ_FILENAME= restart_adj
144145
TABULAR_FORMAT= CSV
145146
CONV_FILENAME= history
@@ -150,10 +151,13 @@ VOLUME_ADJ_FILENAME= adjoint
150151
GRAD_OBJFUNC_FILENAME= of_grad
151152
SURFACE_FILENAME= surface_flow
152153
SURFACE_ADJ_FILENAME= surface_adjoint
154+
SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
153155
OUTPUT_WRT_FREQ= 1
154156

155157
% --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
156158
%
157159
OPT_OBJECTIVE= DRAG * 0.001
158160
OPT_CONSTRAINT= ( AREA > 0.0661121 ) * 0.001
159161
DEFINITION_DV= ( 30, 1.0 | airfoil | 0, 0.961538461538 ); ( 30, 1.0 | airfoil | 0, 0.923076923077 ); ( 30, 1.0 | airfoil | 0, 0.884615384615 ); ( 30, 1.0 | airfoil | 0, 0.846153846154 ); ( 30, 1.0 | airfoil | 0, 0.807692307692 ); ( 30, 1.0 | airfoil | 0, 0.769230769231 ); ( 30, 1.0 | airfoil | 0, 0.730769230769 ); ( 30, 1.0 | airfoil | 0, 0.692307692308 ); ( 30, 1.0 | airfoil | 0, 0.653846153846 ); ( 30, 1.0 | airfoil | 0, 0.615384615385 ); ( 30, 1.0 | airfoil | 0, 0.576923076923 ); ( 30, 1.0 | airfoil | 0, 0.538461538462 ); ( 30, 1.0 | airfoil | 0, 0.5 ); ( 30, 1.0 | airfoil | 0, 0.461538461538 ); ( 30, 1.0 | airfoil | 0, 0.423076923077 ); ( 30, 1.0 | airfoil | 0, 0.384615384615 ); ( 30, 1.0 | airfoil | 0, 0.346153846154 ); ( 30, 1.0 | airfoil | 0, 0.307692307692 ); ( 30, 1.0 | airfoil | 0, 0.269230769231 ); ( 30, 1.0 | airfoil | 0, 0.230769230769 ); ( 30, 1.0 | airfoil | 0, 0.192307692308 ); ( 30, 1.0 | airfoil | 0, 0.153846153846 ); ( 30, 1.0 | airfoil | 0, 0.115384615385 ); ( 30, 1.0 | airfoil | 0, 0.0769230769231 ); ( 30, 1.0 | airfoil | 0, 0.0384615384615 ); ( 30, 1.0 | airfoil | 1, 0.0384615384615 ); ( 30, 1.0 | airfoil | 1, 0.0769230769231 ); ( 30, 1.0 | airfoil | 1, 0.115384615385 ); ( 30, 1.0 | airfoil | 1, 0.153846153846 ); ( 30, 1.0 | airfoil | 1, 0.192307692308 ); ( 30, 1.0 | airfoil | 1, 0.230769230769 ); ( 30, 1.0 | airfoil | 1, 0.269230769231 ); ( 30, 1.0 | airfoil | 1, 0.307692307692 ); ( 30, 1.0 | airfoil | 1, 0.346153846154 ); ( 30, 1.0 | airfoil | 1, 0.384615384615 ); ( 30, 1.0 | airfoil | 1, 0.423076923077 ); ( 30, 1.0 | airfoil | 1, 0.461538461538 ); ( 30, 1.0 | airfoil | 1, 0.5 ); ( 30, 1.0 | airfoil | 1, 0.538461538462 ); ( 30, 1.0 | airfoil | 1, 0.576923076923 ); ( 30, 1.0 | airfoil | 1, 0.615384615385 ); ( 30, 1.0 | airfoil | 1, 0.653846153846 ); ( 30, 1.0 | airfoil | 1, 0.692307692308 ); ( 30, 1.0 | airfoil | 1, 0.730769230769 ); ( 30, 1.0 | airfoil | 1, 0.769230769231 ); ( 30, 1.0 | airfoil | 1, 0.807692307692 ); ( 30, 1.0 | airfoil | 1, 0.846153846154 ); ( 30, 1.0 | airfoil | 1, 0.884615384615 ); ( 30, 1.0 | airfoil | 1, 0.923076923077 ); ( 30, 1.0 | airfoil | 1, 0.961538461538 )
162+
READ_BINARY_RESTART= NO
163+
RESTART_ITER= 2

TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,21 @@
1414
SOLVER= NAVIER_STOKES
1515
KIND_TURB_MODEL= NONE
1616
MATH_PROBLEM= DIRECT
17-
RESTART_SOL= NO
17+
RESTART_SOL= YES
1818

1919
% ------------------------- UNSTEADY SIMULATION -------------------------------%
2020
%
2121
TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
2222
TIME_STEP= 0.0023555025613149587
23+
TIME_DOMAIN= YES
24+
TIME_ITER= 100
2325
% 24 steps per period: 0.0024536485013697488
2426
% 25 steps per period: 0.0023555025613149587
2527
%
2628
MAX_TIME= 0.5888756403287397
2729
% 10 periods: 0.5888756403287397
2830
%
29-
INNER_ITER= 1000
31+
INNER_ITER= 50
3032

3133
% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
3234
%
@@ -62,7 +64,6 @@ CFL_NUMBER= 1.0
6264
CFL_ADAPT= NO
6365
CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
6466
RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
65-
EXT_ITER= 99999
6667

6768
% ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
6869
%
@@ -118,4 +119,7 @@ VOLUME_ADJ_FILENAME= adjoint
118119
GRAD_OBJFUNC_FILENAME= of_grad
119120
SURFACE_FILENAME= surface_flow
120121
SURFACE_ADJ_FILENAME= surface_adjoint
122+
SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
121123
OUTPUT_WRT_FREQ= 1
124+
READ_BINARY_RESTART= NO
125+
RESTART_ITER= 2

0 commit comments

Comments
 (0)