From aa54ab74fee88caaeb079784074cab8a8b7a37ed Mon Sep 17 00:00:00 2001 From: Alessandro Cappiello Date: Thu, 3 Oct 2024 16:29:43 +0200 Subject: [PATCH 1/7] updated Aachen config and regression test --- .github/workflows/regression.yml | 6 ++--- .../Aachen_turbine/aachen_3D_MP_restart.cfg | 23 +++++++++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) mode change 100644 => 100755 TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 2502204b64c..d6e3c02fedd 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -209,7 +209,7 @@ jobs: uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536 with: # -t -c - args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} + args: -b ${{github.ref}} -t develop -c fix_aachen_testcase -s ${{matrix.testscript}} - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536 with: @@ -255,7 +255,7 @@ jobs: uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536 with: # -t -c - args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tsan" + args: -b ${{github.ref}} -t develop -c fix_aachen_testcase -s ${{matrix.testscript}} -a "--tsan" - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536 with: @@ -300,7 +300,7 @@ jobs: uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536 with: # -t -c - args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--asan" + args: -b ${{github.ref}} -t develop -c fix_aachen_testcase -s ${{matrix.testscript}} -a "--asan" - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536 with: diff --git a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg old mode 100644 new mode 100755 index 97f2e133e61..2f43ccffc39 --- a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg +++ b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg @@ -119,6 +119,15 @@ CONDUCTIVITY_MODEL= CONSTANT_PRANDTL %Navier-Stokes wall boundary marker(s) (NONE = no marker) MARKER_HEATFLUX= (BLADE1, 0.0, BLADE2, 0.0, BLADE3, 0.0, HUB1, 0.0, SHROUD1, 0.0, HUB2, 0.0, SHROUD2, 0.0, HUB3, 0.0, SHROUD3, 0.0) % +% ------------------------ WALL FUNCTION DEFINITION --------------------------% +% +MARKER_WALL_FUNCTIONS= ( BLADE1, STANDARD_WALL_FUNCTION , BLADE2, STANDARD_WALL_FUNCTION , BLADE3, STANDARD_WALL_FUNCTION , HUB1, STANDARD_WALL_FUNCTION , SHROUD1, STANDARD_WALL_FUNCTION , HUB2, STANDARD_WALL_FUNCTION , SHROUD2, STANDARD_WALL_FUNCTION , HUB3, STANDARD_WALL_FUNCTION , SHROUD3, STANDARD_WALL_FUNCTION ) +WALLMODEL_KAPPA= 0.41 +WALLMODEL_B= 5.5 +WALLMODEL_MINYPLUS= 5.0 +WALLMODEL_MAXITER= 200 +WALLMODEL_RELFAC= 0.5 + % Periodic boundary marker(s) (NONE = no marker) % Format: ( periodic marker, donor marker, rot_cen_x, rot_cen_y, rot_cen_z, rot_angle_x-axis, rot_angle_y-axis, rot_angle_z-axis, translation_x, translation_y, translation_z) MARKER_PERIODIC= (PER1_STATOR1, PER2_STATOR1, 0.0, 0.0, 0.0, 0.0, 0.0, 8.7804878, 0.0, 0.0, 0.0, PER1_ROTOR, PER2_ROTOR, 0.0, 0.0, 0.0, 0.0, 0.0, 8.7804878, 0.0, 0.0, 0.0, PER1_STATOR2, PER2_STATOR2, 0.0, 0.0, 0.0, 0.0, 0.0, 8.7804878, 0.0, 0.0, 0.0) @@ -164,10 +173,10 @@ MIXINGPLANE_INTERFACE_KIND= LINEAR_INTERPOLATION TURBULENT_MIXINGPLANE= YES % % Specify ramp option for Outlet pressure (YES, NO) default NO -RAMP_OUTLET_PRESSURE= NO +RAMP_OUTLET_PRESSURE= YES % % Parameters of the outlet pressure ramp (starting outlet pressure, updating-iteration-frequency, total number of iteration for the ramp) -RAMP_OUTLET_PRESSURE_COEFF= (140000.0, 10.0, 2000) +RAMP_OUTLET_PRESSURE_COEFF= (140000.0, 150.0, 2000) % % Specify Kind of average process for linearizing the Navier-Stokes equation at inflow and outflow BC included mixing-plane % (ALGEBRAIC, AREA, MASSSFLUX, MIXEDOUT) default AREA @@ -196,7 +205,7 @@ MARKER_MONITORING= (BLADE1, BLADE2, BLADE3) NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES % % Courant-Friedrichs-Lewy condition of the finest grid -CFL_NUMBER= 10 +CFL_NUMBER= 2 % % Adaptive CFL number (NO, YES) CFL_ADAPT= NO @@ -230,8 +239,8 @@ LIMITER_ITER= 999999 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % % Convective numerical method -CONV_NUM_METHOD_FLOW= ROE -ENTROPY_FIX_COEFF= 0.001 +CONV_NUM_METHOD_FLOW= JST +ENTROPY_FIX_COEFF= 0.3 % JST_SENSOR_COEFF= ( 0.5, 0.25 ) % Spatial numerical order integration @@ -294,7 +303,7 @@ CONV_RESIDUAL_MINVAL= -12 CONV_STARTITER= 10 % % Screen output fields (use 'SU2_CFD -d ' to view list of available fields) -SCREEN_OUTPUT= (OUTER_ITER, RMS_DENSITY[0], RMS_DENSITY[1], RMS_DENSITY[2], RMS_MOMENTUM-X[0], RMS_MOMENTUM-Y[0], RMS_ENERGY[0]) +SCREEN_OUTPUT= (OUTER_ITER, RMS_DENSITY[0], RMS_DENSITY[1], RMS_DENSITY[2], RMS_MOMENTUM-X[0], RMS_MOMENTUM-X[1], RMS_MOMENTUM-X[2], RMS_MOMENTUM-Y[0], RMS_MOMENTUM-Y[1], RMS_MOMENTUM-Y[2], RMS_MOMENTUM-Z[0], RMS_MOMENTUM-Z[1], RMS_MOMENTUM-Z[2], RMS_ENERGY[0], RMS_ENERGY[1], RMS_ENERGY[2]) % % History output groups (use 'SU2_CFD -d ' to view list of available fields) HISTORY_OUTPUT= (ITER, RMS_RES, TURBO_PERF) @@ -349,7 +358,7 @@ SURFACE_FILENAME= surface_flow SURFACE_ADJ_FILENAME= surface_adjoint % % Writing solution file frequency -OUTPUT_WRT_FREQ= 500 +OUTPUT_WRT_FREQ= 1000 % % Writing convergence history frequency HISTORY_WRT_FREQ_OUTER= 1 From 3a57fa35aa2f5a47b573debee911e16cbc8bb429 Mon Sep 17 00:00:00 2001 From: alecappiello Date: Thu, 17 Oct 2024 09:49:31 +0200 Subject: [PATCH 2/7] removing outlet pressure ramp --- .../turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg index 2f43ccffc39..05c383114b8 100755 --- a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg +++ b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg @@ -173,7 +173,7 @@ MIXINGPLANE_INTERFACE_KIND= LINEAR_INTERPOLATION TURBULENT_MIXINGPLANE= YES % % Specify ramp option for Outlet pressure (YES, NO) default NO -RAMP_OUTLET_PRESSURE= YES +RAMP_OUTLET_PRESSURE= NO % % Parameters of the outlet pressure ramp (starting outlet pressure, updating-iteration-frequency, total number of iteration for the ramp) RAMP_OUTLET_PRESSURE_COEFF= (140000.0, 150.0, 2000) From 618972c2e8b9bb6dcc6206e42f25aed59b75ba72 Mon Sep 17 00:00:00 2001 From: alecappiello Date: Thu, 17 Oct 2024 11:15:57 +0200 Subject: [PATCH 3/7] branch name change --- .github/workflows/regression.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index d6e3c02fedd..ca8bf820a84 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -209,7 +209,7 @@ jobs: uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536 with: # -t -c - args: -b ${{github.ref}} -t develop -c fix_aachen_testcase -s ${{matrix.testscript}} + args: -b ${{github.ref}} -t develop -c fix_aachen_test_case -s ${{matrix.testscript}} - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536 with: @@ -255,7 +255,7 @@ jobs: uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536 with: # -t -c - args: -b ${{github.ref}} -t develop -c fix_aachen_testcase -s ${{matrix.testscript}} -a "--tsan" + args: -b ${{github.ref}} -t develop -c fix_aachen_test_case -s ${{matrix.testscript}} -a "--tsan" - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536 with: @@ -300,7 +300,7 @@ jobs: uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536 with: # -t -c - args: -b ${{github.ref}} -t develop -c fix_aachen_testcase -s ${{matrix.testscript}} -a "--asan" + args: -b ${{github.ref}} -t develop -c fix_aachen_test_case -s ${{matrix.testscript}} -a "--asan" - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536 with: From bb7d8ee060ac6f7c3107b1c48a6342655d1b097c Mon Sep 17 00:00:00 2001 From: alecappiello Date: Thu, 17 Oct 2024 16:24:31 +0200 Subject: [PATCH 4/7] updating regression test files --- TestCases/parallel_regression.py | 2 +- TestCases/serial_regression.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 4047b6b39ba..9d6622a14a1 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -1083,7 +1083,7 @@ def main(): Aachen_3D_restart.cfg_file = "aachen_3D_MP_restart.cfg" Aachen_3D_restart.test_iter = 5 Aachen_3D_restart.enabled_with_asan = False - Aachen_3D_restart.test_vals = [-9.829186, -8.875103, -9.609509, -8.075211, -7.759491, -4.360714] + Aachen_3D_restart.test_vals = [-7.701448, -8.512241, -6.014939, -6.468738, -5.801759, -4.607179, -5.551037, -5.300771, -3.804188, -5.256055, -5.765160, -3.609605, -2.229276, -2.883962, -0.563469] test_list.append(Aachen_3D_restart) # Jones APU Turbocharger restart diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 08b45e3b3ff..9146f9a0778 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -860,7 +860,7 @@ def main(): Aachen_3D_restart.cfg_dir = "turbomachinery/Aachen_turbine" Aachen_3D_restart.cfg_file = "aachen_3D_MP_restart.cfg" Aachen_3D_restart.test_iter = 5 - Aachen_3D_restart.test_vals = [-9.829185, -8.875103, -9.609505, -8.075194, -7.759490, -4.360713] + Aachen_3D_restart.test_vals = [-7.701448, -8.512359, -6.014939, -6.468741, -5.801762, -4.607173, -5.551041, -5.300777, -3.804188, -5.256055, -5.765225, -3.609601, -2.229277, -2.883896, -0.563470] test_list.append(Aachen_3D_restart) # Jones APU Turbocharger restart From 6f7c44acca7ea67a1f78cb6452d711cbb4b15024 Mon Sep 17 00:00:00 2001 From: alecappiello Date: Thu, 17 Oct 2024 18:01:15 +0200 Subject: [PATCH 5/7] enabling asan in aachen parallel regression test --- TestCases/parallel_regression.py | 1 - 1 file changed, 1 deletion(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 5368d785abe..66aa66fb805 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -1078,7 +1078,6 @@ def main(): Aachen_3D_restart.cfg_dir = "turbomachinery/Aachen_turbine" Aachen_3D_restart.cfg_file = "aachen_3D_MP_restart.cfg" Aachen_3D_restart.test_iter = 5 - Aachen_3D_restart.enabled_with_asan = False Aachen_3D_restart.test_vals = [-7.701448, -8.512241, -6.014939, -6.468738, -5.801759, -4.607179, -5.551037, -5.300771, -3.804188, -5.256055, -5.765160, -3.609605, -2.229276, -2.883962, -0.563469] test_list.append(Aachen_3D_restart) From 1329c92fed1a9b8f78228a94eacc5f01f899ac6a Mon Sep 17 00:00:00 2001 From: alecappiello Date: Fri, 18 Oct 2024 10:53:41 +0200 Subject: [PATCH 6/7] entropy fix coefficient removed --- TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg index 05c383114b8..f46e6a62b92 100755 --- a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg +++ b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg @@ -240,7 +240,6 @@ LIMITER_ITER= 999999 % % Convective numerical method CONV_NUM_METHOD_FLOW= JST -ENTROPY_FIX_COEFF= 0.3 % JST_SENSOR_COEFF= ( 0.5, 0.25 ) % Spatial numerical order integration From ea397c20d523172a07ea755b3fdf6ff8e0758580 Mon Sep 17 00:00:00 2001 From: alecappiello Date: Tue, 22 Oct 2024 14:01:44 +0200 Subject: [PATCH 7/7] reintroducing entropy fix --- TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg index f46e6a62b92..05c383114b8 100755 --- a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg +++ b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg @@ -240,6 +240,7 @@ LIMITER_ITER= 999999 % % Convective numerical method CONV_NUM_METHOD_FLOW= JST +ENTROPY_FIX_COEFF= 0.3 % JST_SENSOR_COEFF= ( 0.5, 0.25 ) % Spatial numerical order integration