From 62b87961f56f1f5cc631ff1d1168d1fb61333682 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Wed, 15 Jan 2025 22:45:58 +0100 Subject: [PATCH 01/24] regression --- .github/workflows/regression.yml | 2 +- TestCases/tutorials.py | 52 ++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 2502204b64c..a869184925d 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -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 design_pipe -c tutorial_bend_Design -s ${{matrix.testscript}} -a "--asan" - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536 with: diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index e819ff246c1..f5b42acaa9b 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -73,6 +73,7 @@ def main(): cht_CR.multizone = True test_list.append(cht_CR) + ### Incompressible Flow # 2D pin case massflow periodic with heatflux BC and prescribed extracted outlet heat @@ -91,6 +92,34 @@ def main(): sp_pinArray_2d_dp_hf_tp.test_vals = [-4.640621, 1.436697, -0.707302, 208.023676] test_list.append(sp_pinArray_2d_dp_hf_tp) + # 90 degree pipe bend with wall functions from the experiments of Sudo et al. + sudo_tutorial = TestCase('sudo_bend') + sudo_tutorial.cfg_dir = "../Tutorials/incompressible_flow/Inc_Turbulent_Bend_Wallfunctions" + sudo_tutorial.cfg_file = "sudo.cfg" + sudo_tutorial.test_iter = 10 + sudo_tutorial.test_vals = [-14.579462, -13.203791, -13.601782, -12.616876, -14.005299, -10.817605, 15.000000, -2.296083] + sudo_tutorial.command = TestCase.Command("mpirun -n 2", "SU2_CFD") + test_list.append(sudo_tutorial) + + # design-primal: 90 degree pipe bend with wall functions from the experiments of Sudo et al. + sudo_design_primal = TestCase('sudo_bend_design_primal') + sudo_design_primal.cfg_dir = "../Tutorials/incompressible_flow/Inc_Turbulent_Bend_Wallfunctions" + sudo_design_primal.cfg_file = "sudo_primal.cfg" + sudo_design_primal.test_iter = 10 + sudo_design_primal.test_vals = [-14.579462, -13.203791, -13.601782, -12.616876, -14.005299, -10.817605, 15.000000, -2.296083] + sudo_design_primal.command = TestCase.Command("mpirun -n 2", "SU2_CFD") + test_list.append(sudo_design_primal) + + # design-adjoint: 90 degree pipe bend with wall functions from the experiments of Sudo et al. + sudo_design_adjoint = TestCase('sudo_bend_design_adjoint') + sudo_design_adjoint.cfg_dir = "../Tutorials/incompressible_flow/Inc_Turbulent_Bend_Wallfunctions" + sudo_design_adjoint.cfg_file = "sudo_adjoint.cfg" + sudo_design_adjoint.test_iter = 10 + sudo_design_adjoint.test_vals = [-14.579462, -13.203791, -13.601782, -12.616876, -14.005299, -10.817605, 15.000000, -2.296083] + sudo_design_adjoint.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD") + test_list.append(sudo_design_adjoint) + + ### Species Transport # 3 species (2 eq) primitive venturi mixing @@ -116,18 +145,20 @@ def main(): kenics_mixer_tutorial.cfg_dir = "../Tutorials/incompressible_flow/Inc_Species_Transport_Composition_Dependent_Model" kenics_mixer_tutorial.cfg_file = "kenics_mixer_tutorial.cfg" kenics_mixer_tutorial.test_iter = 10 - kenics_mixer_tutorial.test_vals = [-7.489796, -6.823473, -6.838032, -5.157793, -7.911512, -3.166212, -7.447901, 5.000000, -1.862212, 4.000000, -5.131048, 3.000000, -6.380193, 0.025472, 0.000000, 0.025472, 0.000000, 64.105000, 8.479200, 48.099000, 7.526700] + kenics_mixer_tutorial.test_vals = [-7.490002, -6.823162, -6.837602, -5.156401, -7.928720, -3.089782, -7.447883, 5.000000, -1.863052, 4.000000, -5.174773, 3.000000, -6.382946, 0.025471, 0.000000, 0.025471, 0.000000, 64.126000, 8.479400, 48.120000, 7.526800] kenics_mixer_tutorial.command = TestCase.Command("mpirun -n 2", "SU2_CFD") test_list.append(kenics_mixer_tutorial) - # 90 degree pipe bend with wall functions from the experiments of Sudo et al. - sudo_tutorial = TestCase('sudo_bend') - sudo_tutorial.cfg_dir = "../Tutorials/incompressible_flow/Inc_Turbulent_Bend_Wallfunctions" - sudo_tutorial.cfg_file = "sudo.cfg" - sudo_tutorial.test_iter = 10 - sudo_tutorial.test_vals = [-14.579462, -13.203791, -13.601782, -12.616876, -14.005299, -10.817605, 15.000000, -2.296083] - sudo_tutorial.command = TestCase.Command("mpirun -n 2", "SU2_CFD") - test_list.append(sudo_tutorial) + # 3 species (2 eq) primitive venturi mixing + DAspecies3_primitiveVenturi = TestCase('DAspecies3_primitiveVenturi') + DAspecies3_primitiveVenturi.cfg_dir = "../Tutorials/incompressible_flow/Inc_Species_Transport" + DAspecies3_primitiveVenturi.cfg_file = "DAspecies3_primitiveVenturi.cfg" + DAspecies3_primitiveVenturi.test_iter = 50 + DAspecies3_primitiveVenturi.test_vals = [-7.584508, -7.211527, -6.740742, -6.896386, -11.472089, -10.865347, -10.096770] + DAspecies3_primitiveVenturi.test_vals_aarch64 = [-7.865411, -7.548131, -7.347978, -7.217536, -11.822422, -10.968444, -10.193225] + DAspecies3_primitiveVenturi.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD") + test_list.append(DAspecies3_primitiveVenturi) + ### Incompressible Combustion @@ -139,6 +170,7 @@ def main(): premixed_hydrogen.test_vals = [-9.809794, -10.369804, -11.044267, -4.332945, -11.883789] test_list.append(premixed_hydrogen) + ### Compressible Flow # Inviscid Bump @@ -254,7 +286,7 @@ def main(): tutorial_nicfd_nozzle.cfg_dir = "../Tutorials/compressible_flow/NICFD_nozzle" tutorial_nicfd_nozzle.cfg_file = "NICFD_nozzle.cfg" tutorial_nicfd_nozzle.test_iter = 20 - tutorial_nicfd_nozzle.test_vals = [-2.056675, -2.124123, 3.687027, 0.000000, 0.000000] + tutorial_nicfd_nozzle.test_vals = [-2.056675, -2.124123, 3.687857, 0.000000, 0.000000] tutorial_nicfd_nozzle.no_restart = True test_list.append(tutorial_nicfd_nozzle) From b70c3fe2593c087fadb31dfc7c17dc5fb79e8bb5 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Thu, 16 Jan 2025 23:23:08 +0100 Subject: [PATCH 02/24] regression --- TestCases/tutorials.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index f5b42acaa9b..63ba071851a 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -73,7 +73,6 @@ def main(): cht_CR.multizone = True test_list.append(cht_CR) - ### Incompressible Flow # 2D pin case massflow periodic with heatflux BC and prescribed extracted outlet heat @@ -103,7 +102,7 @@ def main(): # design-primal: 90 degree pipe bend with wall functions from the experiments of Sudo et al. sudo_design_primal = TestCase('sudo_bend_design_primal') - sudo_design_primal.cfg_dir = "../Tutorials/incompressible_flow/Inc_Turbulent_Bend_Wallfunctions" + sudo_design_primal.cfg_dir = "../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions" sudo_design_primal.cfg_file = "sudo_primal.cfg" sudo_design_primal.test_iter = 10 sudo_design_primal.test_vals = [-14.579462, -13.203791, -13.601782, -12.616876, -14.005299, -10.817605, 15.000000, -2.296083] @@ -112,7 +111,7 @@ def main(): # design-adjoint: 90 degree pipe bend with wall functions from the experiments of Sudo et al. sudo_design_adjoint = TestCase('sudo_bend_design_adjoint') - sudo_design_adjoint.cfg_dir = "../Tutorials/incompressible_flow/Inc_Turbulent_Bend_Wallfunctions" + sudo_design_adjoint.cfg_dir = "../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions" sudo_design_adjoint.cfg_file = "sudo_adjoint.cfg" sudo_design_adjoint.test_iter = 10 sudo_design_adjoint.test_vals = [-14.579462, -13.203791, -13.601782, -12.616876, -14.005299, -10.817605, 15.000000, -2.296083] @@ -145,20 +144,10 @@ def main(): kenics_mixer_tutorial.cfg_dir = "../Tutorials/incompressible_flow/Inc_Species_Transport_Composition_Dependent_Model" kenics_mixer_tutorial.cfg_file = "kenics_mixer_tutorial.cfg" kenics_mixer_tutorial.test_iter = 10 - kenics_mixer_tutorial.test_vals = [-7.490002, -6.823162, -6.837602, -5.156401, -7.928720, -3.089782, -7.447883, 5.000000, -1.863052, 4.000000, -5.174773, 3.000000, -6.382946, 0.025471, 0.000000, 0.025471, 0.000000, 64.126000, 8.479400, 48.120000, 7.526800] + kenics_mixer_tutorial.test_vals = [kenics_mixer_tutorial.test_vals = [-7.489796, -6.823473, -6.838032, -5.157793, -7.911512, -3.166212, -7.447901, 5.000000, -1.862212, 4.000000, -5.131048, 3.000000, -6.380193, 0.025472, 0.000000, 0.025472, 0.000000, 64.105000, 8.479200, 48.099000, 7.526700] kenics_mixer_tutorial.command = TestCase.Command("mpirun -n 2", "SU2_CFD") test_list.append(kenics_mixer_tutorial) - # 3 species (2 eq) primitive venturi mixing - DAspecies3_primitiveVenturi = TestCase('DAspecies3_primitiveVenturi') - DAspecies3_primitiveVenturi.cfg_dir = "../Tutorials/incompressible_flow/Inc_Species_Transport" - DAspecies3_primitiveVenturi.cfg_file = "DAspecies3_primitiveVenturi.cfg" - DAspecies3_primitiveVenturi.test_iter = 50 - DAspecies3_primitiveVenturi.test_vals = [-7.584508, -7.211527, -6.740742, -6.896386, -11.472089, -10.865347, -10.096770] - DAspecies3_primitiveVenturi.test_vals_aarch64 = [-7.865411, -7.548131, -7.347978, -7.217536, -11.822422, -10.968444, -10.193225] - DAspecies3_primitiveVenturi.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD") - test_list.append(DAspecies3_primitiveVenturi) - ### Incompressible Combustion @@ -286,7 +275,7 @@ def main(): tutorial_nicfd_nozzle.cfg_dir = "../Tutorials/compressible_flow/NICFD_nozzle" tutorial_nicfd_nozzle.cfg_file = "NICFD_nozzle.cfg" tutorial_nicfd_nozzle.test_iter = 20 - tutorial_nicfd_nozzle.test_vals = [-2.056675, -2.124123, 3.687857, 0.000000, 0.000000] + tutorial_nicfd_nozzle.test_vals = [-2.056675, -2.124123, 3.687027, 0.000000, 0.000000] tutorial_nicfd_nozzle.no_restart = True test_list.append(tutorial_nicfd_nozzle) From fafba321aff2a756afe240e07067c150c96b8c3a Mon Sep 17 00:00:00 2001 From: bigfooted Date: Thu, 16 Jan 2025 23:53:04 +0100 Subject: [PATCH 03/24] regression --- TestCases/tutorials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 63ba071851a..5cae096f0b7 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -144,7 +144,7 @@ def main(): kenics_mixer_tutorial.cfg_dir = "../Tutorials/incompressible_flow/Inc_Species_Transport_Composition_Dependent_Model" kenics_mixer_tutorial.cfg_file = "kenics_mixer_tutorial.cfg" kenics_mixer_tutorial.test_iter = 10 - kenics_mixer_tutorial.test_vals = [kenics_mixer_tutorial.test_vals = [-7.489796, -6.823473, -6.838032, -5.157793, -7.911512, -3.166212, -7.447901, 5.000000, -1.862212, 4.000000, -5.131048, 3.000000, -6.380193, 0.025472, 0.000000, 0.025472, 0.000000, 64.105000, 8.479200, 48.099000, 7.526700] + kenics_mixer_tutorial.test_vals = [-7.489796, -6.823473, -6.838032, -5.157793, -7.911512, -3.166212, -7.447901, 5.000000, -1.862212, 4.000000, -5.131048, 3.000000, -6.380193, 0.025472, 0.000000, 0.025472, 0.000000, 64.105000, 8.479200, 48.099000, 7.526700] kenics_mixer_tutorial.command = TestCase.Command("mpirun -n 2", "SU2_CFD") test_list.append(kenics_mixer_tutorial) From e9fe4e8a10df30f638980c8d006be27480ac8b05 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Fri, 17 Jan 2025 08:24:58 +0100 Subject: [PATCH 04/24] regression --- .github/workflows/regression.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index a869184925d..528dba96bf9 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 design_pipe -c tutorial_bend_Design -s ${{matrix.testscript}} - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2: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 design_pipe -c tutorial_bend_Design -s ${{matrix.testscript}} -a "--asan" + args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--asan" - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536 with: From 89d73a4a47130f673d2d3b1cfe9eebbb31e25df9 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Fri, 17 Jan 2025 09:37:32 +0100 Subject: [PATCH 05/24] regression --- .github/workflows/regression.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 528dba96bf9..e3340aba167 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 design_pipe -c tutorial_bend_Design -s ${{matrix.testscript}} + args: -b ${{github.ref}} -t design_pipe -c develop -s ${{matrix.testscript}} - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536 with: From b49e352043e355502bd0f9286bed99112c0b00c8 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Fri, 17 Jan 2025 10:30:54 +0100 Subject: [PATCH 06/24] regression --- TestCases/tutorials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 5cae096f0b7..86f5d5c50b8 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -105,7 +105,7 @@ def main(): sudo_design_primal.cfg_dir = "../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions" sudo_design_primal.cfg_file = "sudo_primal.cfg" sudo_design_primal.test_iter = 10 - sudo_design_primal.test_vals = [-14.579462, -13.203791, -13.601782, -12.616876, -14.005299, -10.817605, 15.000000, -2.296083] + sudo_design_primal.test_vals = [-7.971711, -8.161161, -7.869243, -4.884869, 5.000000, -0.666692, 5.000000, -2.567875] sudo_design_primal.command = TestCase.Command("mpirun -n 2", "SU2_CFD") test_list.append(sudo_design_primal) From 7d46701caf3724f741f22c78d6fcb92e24279b14 Mon Sep 17 00:00:00 2001 From: Nijso Date: Sun, 26 Jan 2025 13:16:01 +0100 Subject: [PATCH 07/24] Update TestCases/tutorials.py Co-authored-by: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> --- TestCases/tutorials.py | 1 - 1 file changed, 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 86f5d5c50b8..58a9be5639a 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -159,7 +159,6 @@ def main(): premixed_hydrogen.test_vals = [-9.809794, -10.369804, -11.044267, -4.332945, -11.883789] test_list.append(premixed_hydrogen) - ### Compressible Flow # Inviscid Bump From 68f5ac584d0c4f65699b799a9390298a049880da Mon Sep 17 00:00:00 2001 From: Nijso Date: Sun, 26 Jan 2025 13:16:09 +0100 Subject: [PATCH 08/24] Update TestCases/tutorials.py Co-authored-by: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> --- TestCases/tutorials.py | 1 - 1 file changed, 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 58a9be5639a..60e0f878f82 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -118,7 +118,6 @@ def main(): sudo_design_adjoint.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD") test_list.append(sudo_design_adjoint) - ### Species Transport # 3 species (2 eq) primitive venturi mixing From b418cc0832070d87ab8b1ab72588dea10f1e6a09 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sun, 26 Jan 2025 15:40:41 +0100 Subject: [PATCH 09/24] fado regression --- TestCases/tutorials.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 60e0f878f82..ac726c8942a 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -118,6 +118,7 @@ def main(): sudo_design_adjoint.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD") test_list.append(sudo_design_adjoint) + ### Species Transport # 3 species (2 eq) primitive venturi mixing @@ -343,6 +344,22 @@ def main(): pass_list = [ test.run_test() for test in test_list ] + + # design-FADO: 90 degree pipe bend optimization + sudo_design_fado = TestCase('sudo_bend_design_fado') + sudo_design_fado.command = TestCase.Command("python", "optimization.py") + sudo_design_fado.cfg_dir = "../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions" + sudo_design_fado.cfg_file = "sudo.cfg" + sudo_design_fado.multizone = False + sudo_design_fado.test_iter = 10 + sudo_design_fado.timeout = 1600 + sudo_design_fado.reference_file = "optim.csv.ref" + sudo_design_fado.test_file = "optim.csv" + sudo_design_fado.comp_threshold = 1e-6 + sudo_design_fado.tol_file_percent = 0.1 + pass_list.append(sudo_design_fado.run_filediff()) + test_list.append(sudo_design_fado) + # Tests summary print('==================================================================') print('Summary of the parallel tests') From c5d3ae04467f221535e2b909ed5127aa9b29c7c4 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sun, 26 Jan 2025 22:25:06 +0100 Subject: [PATCH 10/24] modify for regression test --- TestCases/tutorials.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index ac726c8942a..be759101871 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -105,7 +105,7 @@ def main(): sudo_design_primal.cfg_dir = "../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions" sudo_design_primal.cfg_file = "sudo_primal.cfg" sudo_design_primal.test_iter = 10 - sudo_design_primal.test_vals = [-7.971711, -8.161161, -7.869243, -4.884869, 5.000000, -0.666692, 5.000000, -2.567875] + sudo_design_primal.test_vals = [-13.474698, -12.487574, -12.441102, -11.418111, -12.552674, -9.712569, 89.034000] sudo_design_primal.command = TestCase.Command("mpirun -n 2", "SU2_CFD") test_list.append(sudo_design_primal) @@ -114,7 +114,7 @@ def main(): sudo_design_adjoint.cfg_dir = "../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions" sudo_design_adjoint.cfg_file = "sudo_adjoint.cfg" sudo_design_adjoint.test_iter = 10 - sudo_design_adjoint.test_vals = [-14.579462, -13.203791, -13.601782, -12.616876, -14.005299, -10.817605, 15.000000, -2.296083] + sudo_design_adjoint.test_vals = [-4.133194, -3.691046, -2.581693, -3.476472, -3.837900, -6.900137] sudo_design_adjoint.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD") test_list.append(sudo_design_adjoint) From e4e670b38a748c127670fa0a0f72aa7daffb2e15 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Mon, 27 Jan 2025 22:21:02 +0100 Subject: [PATCH 11/24] change fado regression to exec --- TestCases/tutorials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index be759101871..2d7aee33d8e 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -347,7 +347,7 @@ def main(): # design-FADO: 90 degree pipe bend optimization sudo_design_fado = TestCase('sudo_bend_design_fado') - sudo_design_fado.command = TestCase.Command("python", "optimization.py") + sudo_design_fado.command = TestCase.Command(exec = "python", param = "optimization.py") sudo_design_fado.cfg_dir = "../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions" sudo_design_fado.cfg_file = "sudo.cfg" sudo_design_fado.multizone = False From d69757e1bf6f8aa465cd997c6a111e48dedb8b89 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Tue, 28 Jan 2025 19:14:37 +0100 Subject: [PATCH 12/24] fado regression --- TestCases/tutorials.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 2d7aee33d8e..4d49f58826e 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -345,6 +345,21 @@ def main(): pass_list = [ test.run_test() for test in test_list ] + # design-FADO: 90 degree pipe bend optimization + test1 = TestCase('test1') + test1.command = TestCase.Command(exec = "python", param = "optimization1.py") + test1.cfg_dir = "../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions" + test1.cfg_file = "sudo.cfg" + test1.multizone = False + test1.test_iter = 10 + test1.timeout = 1600 + test1.reference_file = "optim.csv.ref" + test1.test_file = "optim.csv" + test1.comp_threshold = 1e-6 + test1.tol_file_percent = 0.1 + pass_list.append(test1.run_filediff()) + test_list.append(test1) + # design-FADO: 90 degree pipe bend optimization sudo_design_fado = TestCase('sudo_bend_design_fado') sudo_design_fado.command = TestCase.Command(exec = "python", param = "optimization.py") @@ -352,7 +367,7 @@ def main(): sudo_design_fado.cfg_file = "sudo.cfg" sudo_design_fado.multizone = False sudo_design_fado.test_iter = 10 - sudo_design_fado.timeout = 1600 + sudo_design_fado.timeout = 3200 sudo_design_fado.reference_file = "optim.csv.ref" sudo_design_fado.test_file = "optim.csv" sudo_design_fado.comp_threshold = 1e-6 From 329492d52bf3ec0a68f6d10e6422c4d0c3073ebd Mon Sep 17 00:00:00 2001 From: bigfooted Date: Tue, 28 Jan 2025 20:01:10 +0100 Subject: [PATCH 13/24] remove test --- TestCases/tutorials.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 4d49f58826e..6979f86e7c1 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -345,21 +345,6 @@ def main(): pass_list = [ test.run_test() for test in test_list ] - # design-FADO: 90 degree pipe bend optimization - test1 = TestCase('test1') - test1.command = TestCase.Command(exec = "python", param = "optimization1.py") - test1.cfg_dir = "../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions" - test1.cfg_file = "sudo.cfg" - test1.multizone = False - test1.test_iter = 10 - test1.timeout = 1600 - test1.reference_file = "optim.csv.ref" - test1.test_file = "optim.csv" - test1.comp_threshold = 1e-6 - test1.tol_file_percent = 0.1 - pass_list.append(test1.run_filediff()) - test_list.append(test1) - # design-FADO: 90 degree pipe bend optimization sudo_design_fado = TestCase('sudo_bend_design_fado') sudo_design_fado.command = TestCase.Command(exec = "python", param = "optimization.py") From d5fc0b05dc592501192da76e61fdf91db564b635 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Tue, 28 Jan 2025 21:04:18 +0100 Subject: [PATCH 14/24] change diff output --- TestCases/TestCase.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py index 320c913ebd2..17b0f965468 100644 --- a/TestCases/TestCase.py +++ b/TestCases/TestCase.py @@ -361,7 +361,14 @@ def run_filediff(self, with_tsan=False, with_asan=False): # Assert that both files have the same number of lines if len(fromlines) != len(tolines): - diff = ["ERROR: Number of lines in " + fromfile + " and " + tofile + " differ: " + len(fromlines) + " vs " + len(tolines) + "."] + stringerr = "ERROR: Number of lines in " + str(fromfile) + " and " + str(tofile) + " differ: " + str(len(fromlines)) + " vs " + str(len(tolines)) + "." + diff = [stringerr] + print("generated file = ") + for i_line in range(0, len(tolines)): + print(i_line) + for i_line in range(0, len(fromlines)): + print(i_line) + passed = False # Loop through all lines From 63d194a0a3ebee980661aa380f91362bb060d221 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Tue, 28 Jan 2025 22:59:33 +0100 Subject: [PATCH 15/24] change diff output --- TestCases/TestCase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py index 17b0f965468..91b08199f5e 100644 --- a/TestCases/TestCase.py +++ b/TestCases/TestCase.py @@ -364,9 +364,9 @@ def run_filediff(self, with_tsan=False, with_asan=False): stringerr = "ERROR: Number of lines in " + str(fromfile) + " and " + str(tofile) + " differ: " + str(len(fromlines)) + " vs " + str(len(tolines)) + "." diff = [stringerr] print("generated file = ") - for i_line in range(0, len(tolines)): + for i_line in tolines: print(i_line) - for i_line in range(0, len(fromlines)): + for i_line in fromlines: print(i_line) passed = False From 984f45a01e9403ce1904f51f8fe0880465570d45 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Wed, 29 Jan 2025 00:19:39 +0100 Subject: [PATCH 16/24] small change --- TestCases/tutorials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 6979f86e7c1..2d7aee33d8e 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -352,7 +352,7 @@ def main(): sudo_design_fado.cfg_file = "sudo.cfg" sudo_design_fado.multizone = False sudo_design_fado.test_iter = 10 - sudo_design_fado.timeout = 3200 + sudo_design_fado.timeout = 1600 sudo_design_fado.reference_file = "optim.csv.ref" sudo_design_fado.test_file = "optim.csv" sudo_design_fado.comp_threshold = 1e-6 From cfcb6e59a78c2500e47605e882fec14e994c2f81 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Fri, 31 Jan 2025 22:46:37 +0100 Subject: [PATCH 17/24] move reference file --- TestCases/tutorials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 2d7aee33d8e..6488a2027a3 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -353,7 +353,7 @@ def main(): sudo_design_fado.multizone = False sudo_design_fado.test_iter = 10 sudo_design_fado.timeout = 1600 - sudo_design_fado.reference_file = "optim.csv.ref" + sudo_design_fado.reference_file = "../../../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref" sudo_design_fado.test_file = "optim.csv" sudo_design_fado.comp_threshold = 1e-6 sudo_design_fado.tol_file_percent = 0.1 From 78598eaf25d0cd5b9d9e42b320e83406b7f0d043 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Fri, 31 Jan 2025 23:21:30 +0100 Subject: [PATCH 18/24] move reference file --- TestCases/tutorials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 6488a2027a3..f4a151bdaad 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -353,7 +353,7 @@ def main(): sudo_design_fado.multizone = False sudo_design_fado.test_iter = 10 sudo_design_fado.timeout = 1600 - sudo_design_fado.reference_file = "../../../Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref" + sudo_design_fado.reference_file = "../../../TestCases/Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref" sudo_design_fado.test_file = "optim.csv" sudo_design_fado.comp_threshold = 1e-6 sudo_design_fado.tol_file_percent = 0.1 From a20f50c931546cc153fd8231b48b44c6ba7de49e Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sat, 1 Feb 2025 00:26:09 +0100 Subject: [PATCH 19/24] move reference file --- TestCases/tutorials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index f4a151bdaad..3d25da56e40 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -353,7 +353,7 @@ def main(): sudo_design_fado.multizone = False sudo_design_fado.test_iter = 10 sudo_design_fado.timeout = 1600 - sudo_design_fado.reference_file = "../../../TestCases/Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref" + sudo_design_fado.reference_file = "../../../tests/TestCases/Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref" sudo_design_fado.test_file = "optim.csv" sudo_design_fado.comp_threshold = 1e-6 sudo_design_fado.tol_file_percent = 0.1 From 6672b9bfdcd1945704e658f4e111b4bd658fb09c Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sat, 1 Feb 2025 00:51:17 +0100 Subject: [PATCH 20/24] copy tutorials folder using docker --- TestCases/tutorials.py | 2 +- docker/test/runTests.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 3d25da56e40..2d7aee33d8e 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -353,7 +353,7 @@ def main(): sudo_design_fado.multizone = False sudo_design_fado.test_iter = 10 sudo_design_fado.timeout = 1600 - sudo_design_fado.reference_file = "../../../tests/TestCases/Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref" + sudo_design_fado.reference_file = "optim.csv.ref" sudo_design_fado.test_file = "optim.csv" sudo_design_fado.comp_threshold = 1e-6 sudo_design_fado.tol_file_percent = 0.1 diff --git a/docker/test/runTests.sh b/docker/test/runTests.sh index 9cb55113c99..b79853d49bf 100755 --- a/docker/test/runTests.sh +++ b/docker/test/runTests.sh @@ -102,6 +102,7 @@ else fi fi cp -R ./Tutorials/ tests/. +cp -r src/SU2/TestCases/Tutorials tests/. # Set the environment variables export SU2_RUN=$PWD/install/bin From 83cc22eeea58533d52a563322c0292fa3681708d Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sat, 1 Feb 2025 10:12:51 +0100 Subject: [PATCH 21/24] copy tutorials folder using docker --- docker/test/runTests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/test/runTests.sh b/docker/test/runTests.sh index b79853d49bf..c6beeb08f85 100755 --- a/docker/test/runTests.sh +++ b/docker/test/runTests.sh @@ -101,8 +101,10 @@ else exit 1 fi fi +echo "Copying Tutorials folder to tests folder." cp -R ./Tutorials/ tests/. -cp -r src/SU2/TestCases/Tutorials tests/. +echo "Copying TestCases/Tutorials folder to tests/Tutorials folder" +cp -R src/SU2/TestCases/Tutorials/* tests/Tutorials/. # Set the environment variables export SU2_RUN=$PWD/install/bin From 4944325d4a756abf73b13769b5f022cd5fa19b55 Mon Sep 17 00:00:00 2001 From: bigfooted Date: Sat, 1 Feb 2025 20:13:42 +0100 Subject: [PATCH 22/24] move reference file --- .../design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 TestCases/Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref diff --git a/TestCases/Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref b/TestCases/Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref new file mode 100644 index 00000000000..2f0fb6fc297 --- /dev/null +++ b/TestCases/Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref @@ -0,0 +1,2 @@ +ITER, avg_dp +1, 89.03358290403737 From 9888bc5a6b002ae7e1a9f468ae0a70fd5b0360c2 Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Sat, 1 Feb 2025 14:10:12 -0800 Subject: [PATCH 23/24] Apply suggestions from code review --- TestCases/tutorials.py | 2 +- docker/test/runTests.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 2d7aee33d8e..f4a151bdaad 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -353,7 +353,7 @@ def main(): sudo_design_fado.multizone = False sudo_design_fado.test_iter = 10 sudo_design_fado.timeout = 1600 - sudo_design_fado.reference_file = "optim.csv.ref" + sudo_design_fado.reference_file = "../../../TestCases/Tutorials/design/Inc_Turbulent_Bend_Wallfunctions/optim.csv.ref" sudo_design_fado.test_file = "optim.csv" sudo_design_fado.comp_threshold = 1e-6 sudo_design_fado.tol_file_percent = 0.1 diff --git a/docker/test/runTests.sh b/docker/test/runTests.sh index c6beeb08f85..9cb55113c99 100755 --- a/docker/test/runTests.sh +++ b/docker/test/runTests.sh @@ -101,10 +101,7 @@ else exit 1 fi fi -echo "Copying Tutorials folder to tests folder." cp -R ./Tutorials/ tests/. -echo "Copying TestCases/Tutorials folder to tests/Tutorials folder" -cp -R src/SU2/TestCases/Tutorials/* tests/Tutorials/. # Set the environment variables export SU2_RUN=$PWD/install/bin From cff3b3850a160b9ebdf21d497df02790025af630 Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Sat, 1 Feb 2025 15:12:18 -0800 Subject: [PATCH 24/24] Update .github/workflows/regression.yml --- .github/workflows/regression.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index e3340aba167..2502204b64c 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 design_pipe -c develop -s ${{matrix.testscript}} + args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} - name: Cleanup uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536 with: