From 8b5125d35f93d3834879701894d959d3071ce515 Mon Sep 17 00:00:00 2001 From: Matthew Falcone Date: Mon, 24 Aug 2026 10:26:57 +0100 Subject: [PATCH 1/2] Remove dependence on external tests for fixed-point restart --- .../fixed-point/restart_heated_plate/tests | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/test/tests/fixed-point/restart_heated_plate/tests b/test/tests/fixed-point/restart_heated_plate/tests index 93386941..8875ba75 100644 --- a/test/tests/fixed-point/restart_heated_plate/tests +++ b/test/tests/fixed-point/restart_heated_plate/tests @@ -4,10 +4,22 @@ type = RunCommand command = 'bash -c "foamCleanCase -case fluid-openfoam && blockMesh -case fluid-openfoam && decomposePar -case fluid-openfoam"' [] - [first] + [run_reference] type = RunApp prereq = heated_plate_restart/setup input = heated_plate.i + min_parallel = 4 + max_parallel = 4 + [] + [copy_reference] + type = RunCommand + command = 'bash -c "reconstructPar -case fluid-openfoam && mkdir -p gold && cp -r fluid-openfoam heated_plate_out.e gold/"' + prereq = heated_plate_restart/run_reference + [] + [first] + type = RunApp + prereq = heated_plate_restart/copy_reference + input = heated_plate.i cli_args = '--test-checkpoint-half-transient' min_parallel = 4 max_parallel = 4 @@ -19,7 +31,6 @@ cli_args = '--recover heated_plate_out_cp/LATEST' delete_output_before_running = false exodiff = heated_plate_out.e - gold_dir = '../heated_plate_converge' min_parallel=4 max_parallel=4 [] @@ -33,5 +44,10 @@ input = test.py prereq = heated_plate_restart/prep_verify [] + [clean] + type = RunCommand + command = 'bash -c "rm -rf gold"' + prereq = 'heated_plate_restart/verify' + [] [] [] From df20415b995c5274929568f3a902fd52be26631f Mon Sep 17 00:00:00 2001 From: Matthew Falcone Date: Mon, 24 Aug 2026 11:14:36 +0100 Subject: [PATCH 2/2] Add requirement and force remove gold directory at setup --- test/tests/fixed-point/restart_heated_plate/tests | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/tests/fixed-point/restart_heated_plate/tests b/test/tests/fixed-point/restart_heated_plate/tests index 8875ba75..2e1d3c07 100644 --- a/test/tests/fixed-point/restart_heated_plate/tests +++ b/test/tests/fixed-point/restart_heated_plate/tests @@ -1,8 +1,9 @@ [Tests] [heated_plate_restart] + requirement = "Test the cases using fixed-point iteration restart correctly" [setup] type = RunCommand - command = 'bash -c "foamCleanCase -case fluid-openfoam && blockMesh -case fluid-openfoam && decomposePar -case fluid-openfoam"' + command = 'bash -c "foamCleanCase -case fluid-openfoam && rm -rf gold && blockMesh -case fluid-openfoam && decomposePar -case fluid-openfoam"' [] [run_reference] type = RunApp