Skip to content

Commit 0e45e8b

Browse files
pcarruscagpcarruscag
committed
update turbo cases
1 parent 815d3f0 commit 0e45e8b

9 files changed

Lines changed: 31 additions & 19 deletions

File tree

‎SU2_CFD/src/drivers/CMultizoneDriver.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ void CMultizoneDriver::RunGaussSeidel() {
285285

286286
for (iZone = 0; iZone < nZone; iZone++) {
287287
config_container[iZone]->SetOuterIter(0ul);
288+
/*--- This is required for correct restarts with mixing plane interfaces and GS iterations,
289+
* for Jacobi we always do all the transfers before iterating all zones. ---*/
290+
if (mixingplane) SetMixingPlane(iZone);
288291
}
289292

290293
/*--- Loop over the number of outer iterations ---*/
@@ -314,6 +317,7 @@ void CMultizoneDriver::RunGaussSeidel() {
314317
if (DeformMesh) UpdateMesh+=1;
315318
}
316319
}
320+
317321
/*--- If a mesh update is required due to the transfer of data ---*/
318322
if (UpdateMesh > 0) DynamicMeshUpdate(iZone, TimeIter);
319323

‎TestCases/harmonic_balance/HB.cfg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ CFL_NUMBER= 1.0
5555
CFL_ADAPT= NO
5656
CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
5757
RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
58-
ITER= 10
58+
ITER= 30
5959

6060
% ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
6161
%
@@ -105,6 +105,7 @@ CONV_CAUCHY_EPS= 1E-6
105105

106106
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
107107
%
108+
SCREEN_OUTPUT= INNER_ITER, RMS_RES
108109
MESH_FILENAME= mesh_NACA64A010_inv.su2
109110
MESH_FORMAT= SU2
110111
MESH_OUT_FILENAME= mesh_out.su2

‎TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ CONV_CAUCHY_EPS= 1E-6
8989

9090
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
9191
%
92+
SCREEN_OUTPUT= INNER_ITER, RMS_RES
9293
MESH_FILENAME= n64a010_turb.su2
9394
MESH_FORMAT= SU2
9495
MESH_OUT_FILENAME= mesh_out.su2

‎TestCases/hybrid_regression.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -329,15 +329,15 @@ def main():
329329
harmonic_balance.cfg_dir = "harmonic_balance"
330330
harmonic_balance.cfg_file = "HB.cfg"
331331
harmonic_balance.test_iter = 25
332-
harmonic_balance.test_vals = [-1.589740, 3.922578, 0.006703, 0.099632]
332+
harmonic_balance.test_vals = [-1.589739, 0.790169, 0.937053, 3.922579]
333333
test_list.append(harmonic_balance)
334334

335335
# Turbulent pitching NACA 64a010 airfoil
336336
hb_rans_preconditioning = TestCase('hb_rans_preconditioning')
337337
hb_rans_preconditioning.cfg_dir = "harmonic_balance/hb_rans_preconditioning"
338338
hb_rans_preconditioning.cfg_file = "davis.cfg"
339339
hb_rans_preconditioning.test_iter = 25
340-
hb_rans_preconditioning.test_vals = [-1.902111, -5.949288, 0.007768, 0.128060]
340+
hb_rans_preconditioning.test_vals = [-1.902097, 0.484069, 0.601483, 3.609005, -5.949274]
341341
test_list.append(hb_rans_preconditioning)
342342

343343
#############################
@@ -539,25 +539,25 @@ def main():
539539
Jones_tc_restart.cfg_dir = "turbomachinery/APU_turbocharger"
540540
Jones_tc_restart.cfg_file = "Jones_restart.cfg"
541541
Jones_tc_restart.test_iter = 5
542-
Jones_tc_restart.test_vals = [-10.691521, -7.643723, 85.827890, 2.277151]
542+
Jones_tc_restart.test_vals = [-6.986563, -3.096834, -14.849532, -9.102914, -11.787851, -6.266208, 7.3266e+04, 7.3266e+04]
543543
test_list.append(Jones_tc_restart)
544544

545545
# 2D axial stage
546546
axial_stage2D = TestCase('axial_stage2D')
547547
axial_stage2D.cfg_dir = "turbomachinery/axial_stage_2D"
548548
axial_stage2D.cfg_file = "Axial_stage2D.cfg"
549549
axial_stage2D.test_iter = 20
550-
axial_stage2D.test_vals = [-1.937003, 5.338805, 73.357170, 0.915734]
551-
axial_stage2D.test_vals_aarch64 = [-1.933115, 5.365583, 73.354510, 0.925902]
550+
axial_stage2D.test_vals = [1.047323, 1.661341, -2.913940, 2.588179, -2.486770, 3.050954, 1.0638e+05, 1.0638e+05]
551+
axial_stage2D.test_vals_aarch64 = [1.047323, 1.661341, -2.913940, 2.588179, -2.486770, 3.050954, 1.0638e+05, 1.0638e+05]
552552
test_list.append(axial_stage2D)
553553

554554
# 2D transonic stator restart
555555
transonic_stator_restart = TestCase('transonic_stator_restart')
556556
transonic_stator_restart.cfg_dir = "turbomachinery/transonic_stator_2D"
557557
transonic_stator_restart.cfg_file = "transonic_stator_restart.cfg"
558558
transonic_stator_restart.test_iter = 20
559-
transonic_stator_restart.test_vals = [-6.796363, -0.743837, 5.003453, 0.002946]
560-
transonic_stator_restart.test_vals_aarch64 = [-6.619122, -0.615705, 5.002986, 0.002951]
559+
transonic_stator_restart.test_vals = [-7.534574, -6.838075, -6.618228, -1.567726, -6.767343, -0.738638, -4.7165e+05]
560+
transonic_stator_restart.test_vals_aarch64 = [-7.534574, -6.838075, -6.618228, -1.567726, -6.767343, -0.738638, -4.7165e+05]
561561
test_list.append(transonic_stator_restart)
562562

563563
######################################

‎TestCases/parallel_regression.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -842,15 +842,15 @@ def main():
842842
harmonic_balance.cfg_dir = "harmonic_balance"
843843
harmonic_balance.cfg_file = "HB.cfg"
844844
harmonic_balance.test_iter = 25
845-
harmonic_balance.test_vals = [-1.589739, 3.922579, 0.006702, 0.099632]
845+
harmonic_balance.test_vals = [-1.589739, 0.790169, 0.937053, 3.922579]
846846
test_list.append(harmonic_balance)
847847

848848
# Turbulent pitching NACA 64a010 airfoil
849849
hb_rans_preconditioning = TestCase('hb_rans_preconditioning')
850850
hb_rans_preconditioning.cfg_dir = "harmonic_balance/hb_rans_preconditioning"
851851
hb_rans_preconditioning.cfg_file = "davis.cfg"
852852
hb_rans_preconditioning.test_iter = 25
853-
hb_rans_preconditioning.test_vals = [-1.902098, -5.949275, 0.007768, 0.128061]
853+
hb_rans_preconditioning.test_vals = [-1.902097, 0.484069, 0.601483, 3.609005, -5.949274]
854854
test_list.append(hb_rans_preconditioning)
855855

856856
######################################
@@ -984,23 +984,23 @@ def main():
984984
Jones_tc_restart.cfg_dir = "turbomachinery/APU_turbocharger"
985985
Jones_tc_restart.cfg_file = "Jones_restart.cfg"
986986
Jones_tc_restart.test_iter = 5
987-
Jones_tc_restart.test_vals = [-10.691504, -7.643703, 85.827890, 2.277151]
987+
Jones_tc_restart.test_vals = [-6.986563, -3.096834, -14.849532, -9.102914, -11.787851, -6.266208, 7.3266e+04, 7.3266e+04]
988988
test_list.append(Jones_tc_restart)
989989

990990
# 2D axial stage
991991
axial_stage2D = TestCase('axial_stage2D')
992992
axial_stage2D.cfg_dir = "turbomachinery/axial_stage_2D"
993993
axial_stage2D.cfg_file = "Axial_stage2D.cfg"
994994
axial_stage2D.test_iter = 20
995-
axial_stage2D.test_vals = [-1.937007, 5.338943, 73.357200, 0.915725]
995+
axial_stage2D.test_vals = [1.047323, 1.661341, -2.913940, 2.588179, -2.486770, 3.050954, 1.0638e+05, 1.0638e+05]
996996
test_list.append(axial_stage2D)
997997

998998
# 2D transonic stator restart
999999
transonic_stator_restart = TestCase('transonic_stator_restart')
10001000
transonic_stator_restart.cfg_dir = "turbomachinery/transonic_stator_2D"
10011001
transonic_stator_restart.cfg_file = "transonic_stator_restart.cfg"
10021002
transonic_stator_restart.test_iter = 20
1003-
transonic_stator_restart.test_vals = [-6.801911, -0.746307, 5.003453, 0.002946]
1003+
transonic_stator_restart.test_vals = [-7.534574, -6.838075, -6.618228, -1.567726, -6.767343, -0.738638, -4.7165e+05]
10041004
test_list.append(transonic_stator_restart)
10051005

10061006
######################################

‎TestCases/serial_regression.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -718,15 +718,15 @@ def main():
718718
harmonic_balance.cfg_dir = "harmonic_balance"
719719
harmonic_balance.cfg_file = "HB.cfg"
720720
harmonic_balance.test_iter = 25
721-
harmonic_balance.test_vals = [-1.589739, 3.922579, 0.006702, 0.099632]
721+
harmonic_balance.test_vals = [-1.589739, 0.790169, 0.937053, 3.922579]
722722
test_list.append(harmonic_balance)
723723

724724
# Turbulent pitching NACA 64a010 airfoil
725725
hb_rans_preconditioning = TestCase('hb_rans_preconditioning')
726726
hb_rans_preconditioning.cfg_dir = "harmonic_balance/hb_rans_preconditioning"
727727
hb_rans_preconditioning.cfg_file = "davis.cfg"
728728
hb_rans_preconditioning.test_iter = 25
729-
hb_rans_preconditioning.test_vals = [-1.902098, -5.949277, 0.007768, 0.128061]
729+
hb_rans_preconditioning.test_vals = [-1.902097, 0.484069, 0.601483, 3.609005, -5.949274]
730730
test_list.append(hb_rans_preconditioning)
731731

732732
######################################
@@ -853,7 +853,7 @@ def main():
853853
Jones_tc_restart.cfg_dir = "turbomachinery/APU_turbocharger"
854854
Jones_tc_restart.cfg_file = "Jones_restart.cfg"
855855
Jones_tc_restart.test_iter = 5
856-
Jones_tc_restart.test_vals = [-10.691501, -7.643699, 85.827890, 2.277151] #last 4 columns
856+
Jones_tc_restart.test_vals = [-6.986563, -3.096834, -14.849532, -9.102914, -11.787851, -6.266208, 7.3266e+04, 7.3266e+04]
857857
Jones_tc_restart.tol = 0.0001
858858
test_list.append(Jones_tc_restart)
859859

@@ -862,15 +862,15 @@ def main():
862862
axial_stage2D.cfg_dir = "turbomachinery/axial_stage_2D"
863863
axial_stage2D.cfg_file = "Axial_stage2D.cfg"
864864
axial_stage2D.test_iter = 20
865-
axial_stage2D.test_vals = [-1.937012, 5.338671, 73.357200, 0.915728] #last 4 columns
865+
axial_stage2D.test_vals = [1.047323, 1.661341, -2.913940, 2.588179, -2.486770, 3.050954, 1.0638e+05, 1.0638e+05]
866866
test_list.append(axial_stage2D)
867867

868868
# 2D transonic stator restart
869869
transonic_stator_restart = TestCase('transonic_stator_restart')
870870
transonic_stator_restart.cfg_dir = "turbomachinery/transonic_stator_2D"
871871
transonic_stator_restart.cfg_file = "transonic_stator_restart.cfg"
872872
transonic_stator_restart.test_iter = 20
873-
transonic_stator_restart.test_vals = [-6.765890, -0.742094, 5.003454, 0.002946] #last 4 columns
873+
transonic_stator_restart.test_vals = [-7.534574, -6.838075, -6.618228, -1.567726, -6.767343, -0.738638, -4.7165e+05]
874874
test_list.append(transonic_stator_restart)
875875

876876

‎TestCases/turbomachinery/APU_turbocharger/Jones_restart.cfg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ MARKER_PERIODIC= (PER1, PER2, 0.0, 0.0, 0.0, 0.0, 0.0, 18.947368421, 0.0, 0.0, 0
6666
%-------- INFLOW/OUTFLOW BOUNDARY CONDITION SPECIFIC FOR TURBOMACHINERY --------%
6767
%
6868
MARKER_TURBOMACHINERY= (INFLOW, OUTMIX, INMIX, OUTFLOW)
69+
MARKER_ANALYZE= (OUTFLOW)
6970
MARKER_MIXINGPLANE_INTERFACE= (OUTMIX, INMIX)
7071
MARKER_GILES= (INFLOW, TOTAL_CONDITIONS_PT, 413.6E+03, 477.6, 1.0, 0.0, 0.0, 1.0, 0.0, OUTMIX, MIXING_OUT, 0.0, 0.0, 0.0, 0.0, 0.0, 0.3, 0.0, INMIX, MIXING_IN, 0.0, 0.0, 0.0, 0.0, 0.0, 0.3, 0.0, OUTFLOW, STATIC_PRESSURE_1D, 67.46E+03, 0.0, 0.0, 0.0, 0.0 , 1.0, 0.0)
7172
GILES_EXTRA_RELAXFACTOR= (0.05, 0.05)
@@ -136,6 +137,7 @@ CONV_CAUCHY_EPS= 1E-6
136137
%
137138
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
138139
%
140+
SCREEN_OUTPUT= OUTER_ITER, AVG_BGS_RES[0], AVG_BGS_RES[1], RMS_DENSITY[0], RMS_ENERGY[0], RMS_DENSITY[1], RMS_ENERGY[1], SURFACE_TOTAL_PRESSURE[1]
139141
MESH_FILENAME= mesh_jones_turbine.su2
140142
MESH_FORMAT= SU2
141143
MESH_OUT_FILENAME= meshout.su2
@@ -150,4 +152,4 @@ VOLUME_ADJ_FILENAME= adjoint
150152
GRAD_OBJFUNC_FILENAME= of_grad.dat
151153
SURFACE_FILENAME= surface_flow
152154
SURFACE_ADJ_FILENAME= surface_adjoint
153-
OUTPUT_WRT_FREQ= 100
155+
OUTPUT_WRT_FREQ= 100

‎TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ MARKER_PERIODIC= ( periodic1, periodic2, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.04
6767
%
6868
% Inflow and Outflow markers must be specified, for each blade (zone), following the natural groth of the machine (i.e, from the first blade to the last)
6969
MARKER_TURBOMACHINERY= (inflow, outmix, inmix, outflow)
70+
MARKER_ANALYZE= (outflow)
7071
%
7172
% Mixing-plane interface markers must be specified to activate the transfer of information between zones
7273
MARKER_MIXINGPLANE_INTERFACE= (outmix, inmix)
@@ -138,6 +139,7 @@ CONV_CAUCHY_EPS= 1E-6
138139
%
139140
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
140141
%
142+
SCREEN_OUTPUT= OUTER_ITER, AVG_BGS_RES[0], AVG_BGS_RES[1], RMS_DENSITY[0], RMS_ENERGY[0], RMS_DENSITY[1], RMS_ENERGY[1], SURFACE_TOTAL_PRESSURE[1]
141143
MESH_FILENAME= mesh_axial_stage_2d_turb.su2
142144
MESH_FORMAT= SU2
143145
MESH_OUT_FILENAME= meshout.su2

‎TestCases/turbomachinery/transonic_stator_2D/transonic_stator_restart.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ MARKER_PERIODIC= ( periodic_1, periodic_2, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.
6868
%-------- INFLOW/OUTFLOW BOUNDARY CONDITION SPECIFIC FOR TURBOMACHINERY --------%
6969
%
7070
MARKER_TURBOMACHINERY= (inflow, outflow)
71+
MARKER_ANALYZE= (inflow, outflow)
7172
MARKER_GILES= (inflow, TOTAL_CONDITIONS_PT, 13.8686E+05, 592.295, 1.0, 0.0, 0.0, 1.0, 1.0, outflow, STATIC_PRESSURE, 9.00E+05, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0)
7273
SPATIAL_FOURIER= YES
7374
%
@@ -137,6 +138,7 @@ CONV_CAUCHY_EPS= 1E-6
137138
%
138139
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
139140
%
141+
SCREEN_OUTPUT= INNER_ITER, RMS_RES, SURFACE_PRESSURE_DROP
140142
MESH_FILENAME= mesh_stator_turb.su2
141143
MESH_FORMAT= SU2
142144
MESH_OUT_FILENAME= su2mesh_per.su2

0 commit comments

Comments
 (0)