Skip to content

Commit

Permalink
Merge pull request #2293 from su2code/fix_aachen_turbine
Browse files Browse the repository at this point in the history
Fix Aachen turbine test case
  • Loading branch information
jblueh authored Jun 27, 2024
2 parents 8d294b2 + 403c444 commit 30db707
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ jobs:
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
with:
# -t <Tutorials-branch> -c <Testcases-branch>
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
args: -b ${{github.ref}} -t develop -c fix_aachen_turbine -s ${{matrix.testscript}}
- name: Cleanup
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
with:
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
with:
# -t <Tutorials-branch> -c <Testcases-branch>
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tsan"
args: -b ${{github.ref}} -t develop -c fix_aachen_turbine -s ${{matrix.testscript}} -a "--tsan"
- name: Cleanup
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
with:
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
with:
# -t <Tutorials-branch> -c <Testcases-branch>
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--asan"
args: -b ${{github.ref}} -t develop -c fix_aachen_turbine -s ${{matrix.testscript}} -a "--asan"
- name: Cleanup
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
with:
Expand Down
2 changes: 1 addition & 1 deletion SU2_CFD/src/interfaces/CInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void CInterface::PreprocessAverage(CGeometry *donor_geometry, CGeometry *target_
for(iSpan = 1; iSpan <nSpanTarget-1; iSpan++){
dist = 10E+06;
dist2 = 10E+06;
for(jSpan = 0; jSpan < nSpanDonor;jSpan++){
for (jSpan = 1; jSpan < nSpanDonor - 1; jSpan++) {
test = abs(SpanValuesTarget[iSpan] - SpanValuesDonor[jSpan]);
test2 = abs(SpanValuesTarget[iSpan] - SpanValuesDonor[jSpan]);
if(test < dist && SpanValuesTarget[iSpan] > SpanValuesDonor[jSpan]){
Expand Down
2 changes: 1 addition & 1 deletion TestCases/parallel_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,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 = [-15.329206, -15.008622, -15.078888, -13.841072, -12.727840, -9.975729]
Aachen_3D_restart.test_vals = [-9.853215, -8.891480, -9.610418, -8.028579, -7.792957, -4.384186]
test_list.append(Aachen_3D_restart)

# Jones APU Turbocharger restart
Expand Down
3 changes: 1 addition & 2 deletions TestCases/serial_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -860,8 +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.enabled_with_asan = False
Aachen_3D_restart.test_vals = [-15.137167, -14.551444, -15.078894, -13.486154, -12.724891, -9.717612]
Aachen_3D_restart.test_vals = [-9.853207, -8.891479, -9.610411, -8.028566, -7.792947, -4.384177]
test_list.append(Aachen_3D_restart)

# Jones APU Turbocharger restart
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,10 @@ MESH_FORMAT= SU2
MESH_OUT_FILENAME= Aachen_3D_41_blade_coarse.su2
%
% Restart flow input file
SOLUTION_FILENAME= restart_flow.dat
SOLUTION_FILENAME= solution_flow.dat
%
% Restart adjoint input file
SOLUTION_ADJ_FILENAME= restart_adj.dat
SOLUTION_ADJ_FILENAME= solution_adj.dat
%
% Output file format
TABULAR_FORMAT= TECPLOT
Expand Down

0 comments on commit 30db707

Please sign in to comment.