From 3baec522e1202c61c836a15546fc973c33c48128 Mon Sep 17 00:00:00 2001 From: Matthew Falcone Date: Thu, 15 Jan 2026 09:44:00 +0000 Subject: [PATCH 1/3] Attempt to use two processes for coaxial pipe tests --- test/tests/components/coaxial_pipe/tests | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/tests/components/coaxial_pipe/tests b/test/tests/components/coaxial_pipe/tests index 1c3b3c9..f521e2b 100644 --- a/test/tests/components/coaxial_pipe/tests +++ b/test/tests/components/coaxial_pipe/tests @@ -2,8 +2,8 @@ [fp_err] type = RunException input = energy_balance.i - min_parallel = 4 - max_parallel = 4 + min_parallel = 2 + max_parallel = 2 requirement = "Checks that copyParamFromParamWithGlobal works properly" expect_err = "Either inner_fp or fp must be set" [] @@ -11,8 +11,8 @@ [run] type = RunApp input = energy_balance.i - min_parallel = 4 - max_parallel = 4 + min_parallel = 2 + max_parallel = 2 requirement = "Checks energy balance for the coaxial pipe" cli_args = "GlobalParams/fp=fluid" [] @@ -44,8 +44,8 @@ [run] type = RunApp input = energy_balance_outer.i - min_parallel = 4 - max_parallel = 4 + min_parallel = 2 + max_parallel = 2 [] [test] type= PythonUnitTest @@ -55,4 +55,4 @@ [] requirement = "Checks that outer pipe conserved energy in isolation" [] -[] \ No newline at end of file +[] From b861b80b799d5fe3b12b2ca21426f67b663883e3 Mon Sep 17 00:00:00 2001 From: Matthew Falcone Date: Thu, 15 Jan 2026 09:51:00 +0000 Subject: [PATCH 2/3] Reduce computational cost of coaxial pipe tests so that the non-heavy ones run in serial --- test/tests/components/coaxial_pipe/energy_balance.i | 2 +- .../components/coaxial_pipe/energy_balance_inner.i | 2 +- .../components/coaxial_pipe/energy_balance_outer.i | 2 +- test/tests/components/coaxial_pipe/test.py | 4 ++-- test/tests/components/coaxial_pipe/tests | 10 ++-------- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/test/tests/components/coaxial_pipe/energy_balance.i b/test/tests/components/coaxial_pipe/energy_balance.i index 5802ada..5fe441d 100644 --- a/test/tests/components/coaxial_pipe/energy_balance.i +++ b/test/tests/components/coaxial_pipe/energy_balance.i @@ -61,7 +61,7 @@ qw = 1e4 [coaxial] type = CoaxialPipe1Phase length = ${L} - n_elems = 100 + n_elems = 20 orientation = '1 0 0' position = '0 0 0' shell_inner_radius = 0.075 diff --git a/test/tests/components/coaxial_pipe/energy_balance_inner.i b/test/tests/components/coaxial_pipe/energy_balance_inner.i index caed60c..ae55d12 100644 --- a/test/tests/components/coaxial_pipe/energy_balance_inner.i +++ b/test/tests/components/coaxial_pipe/energy_balance_inner.i @@ -62,7 +62,7 @@ qw = 1e4 [coaxial] type = CoaxialPipe1Phase length = ${L} - n_elems = 100 + n_elems = 20 orientation = '1 0 0' position = '0 0 0' shell_inner_radius = 0.075 diff --git a/test/tests/components/coaxial_pipe/energy_balance_outer.i b/test/tests/components/coaxial_pipe/energy_balance_outer.i index 17b2a51..ebf5539 100644 --- a/test/tests/components/coaxial_pipe/energy_balance_outer.i +++ b/test/tests/components/coaxial_pipe/energy_balance_outer.i @@ -62,7 +62,7 @@ qw = 1e4 [coaxial] type = CoaxialPipe1Phase length = ${L} - n_elems = 100 + n_elems = 20 orientation = '1 0 0' position = '0 0 0' shell_inner_radius = 0.075 diff --git a/test/tests/components/coaxial_pipe/test.py b/test/tests/components/coaxial_pipe/test.py index 2f79ee8..65ba671 100644 --- a/test/tests/components/coaxial_pipe/test.py +++ b/test/tests/components/coaxial_pipe/test.py @@ -27,7 +27,7 @@ def test_energy_balance(self): total_energy = m_dot*cp*(delta_t_inner + delta_t_outer) rel_diff = abs(total_energy - q)/q - assert rel_diff < 0.00025, f"Rel. energy difference greater than 0.00025: {rel_diff}" + assert rel_diff < 0.00028, f"Rel. energy difference greater than 0.00025: {rel_diff}" def test_energy_balance_inner(self): """Compares energy increase in the inner pipe to heat flux input on shell exterior.""" @@ -73,4 +73,4 @@ def test_energy_balance_outer(self): total_energy = m_dot*cp*delta_t_outer rel_diff = abs(total_energy - q)/q - assert rel_diff < 0.00046, f"Rel. energy difference greater than 0.00046: {rel_diff}" + assert rel_diff < 0.00048, f"Rel. energy difference greater than 0.00046: {rel_diff}" diff --git a/test/tests/components/coaxial_pipe/tests b/test/tests/components/coaxial_pipe/tests index f521e2b..b6828ae 100644 --- a/test/tests/components/coaxial_pipe/tests +++ b/test/tests/components/coaxial_pipe/tests @@ -2,8 +2,6 @@ [fp_err] type = RunException input = energy_balance.i - min_parallel = 2 - max_parallel = 2 requirement = "Checks that copyParamFromParamWithGlobal works properly" expect_err = "Either inner_fp or fp must be set" [] @@ -11,8 +9,6 @@ [run] type = RunApp input = energy_balance.i - min_parallel = 2 - max_parallel = 2 requirement = "Checks energy balance for the coaxial pipe" cli_args = "GlobalParams/fp=fluid" [] @@ -27,8 +23,8 @@ [run] type = RunApp input = energy_balance_inner.i - min_parallel = 4 - max_parallel = 4 + min_parallel = 2 + max_parallel = 2 heavy=true max_time = 7200 [] @@ -44,8 +40,6 @@ [run] type = RunApp input = energy_balance_outer.i - min_parallel = 2 - max_parallel = 2 [] [test] type= PythonUnitTest From 5187af429ca587b67504a0996ad24667c5e68ac1 Mon Sep 17 00:00:00 2001 From: Matthew Falcone Date: Thu, 15 Jan 2026 11:03:53 +0000 Subject: [PATCH 3/3] Make sure unit test runs for heavy tests --- test/tests/components/coaxial_pipe/tests | 1 + 1 file changed, 1 insertion(+) diff --git a/test/tests/components/coaxial_pipe/tests b/test/tests/components/coaxial_pipe/tests index b6828ae..f6b8225 100644 --- a/test/tests/components/coaxial_pipe/tests +++ b/test/tests/components/coaxial_pipe/tests @@ -32,6 +32,7 @@ type= PythonUnitTest input = test.py test_case = TestCoaxialPipe.test_energy_balance_outer + heavy=true prereq = energy_balance_inner/run [] requirement = "Checks that inner pipe conserved energy in isolation"