From 6c80ea3a7cd6107c8437ac0d8f037ed30ed169f9 Mon Sep 17 00:00:00 2001 From: nmannall Date: Tue, 2 Jul 2024 15:02:58 +0100 Subject: [PATCH] Add support for plotting a subset of outputs --- reframe_tests/base_tests.py | 7 ++++++- reframe_tests/reframe_tests.py | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/reframe_tests/base_tests.py b/reframe_tests/base_tests.py index 43398ff7..d5d814b8 100644 --- a/reframe_tests/base_tests.py +++ b/reframe_tests/base_tests.py @@ -20,6 +20,8 @@ from reframe.core.builtins import ( from reframe.utility import udeps from utilities.deferrable import path_join +from gprMax.receivers import Rx + GPRMAX_ROOT_DIR = Path(__file__).parent.parent.resolve() PATH_TO_PYENV = os.path.join(".venv", "bin", "activate") @@ -91,6 +93,7 @@ class GprMaxRegressionTest(rfm.RunOnlyRegressionTest): extra_executable_opts = variable(typ.List[str], value=[]) executable = "time -p python -m gprMax --log-level 25" + rx_outputs = variable(typ.List[str], value=Rx.defaultoutputs) h5diff_header = f"{'=' * 10} h5diff output {'=' * 10}" @run_after("init") @@ -124,7 +127,9 @@ class GprMaxRegressionTest(rfm.RunOnlyRegressionTest): self.output_file = f"{self.model}.h5" self.executable_opts = [self.input_file, "-o", self.output_file] self.executable_opts += self.extra_executable_opts - self.postrun_cmds = [f"python -m toolboxes.Plotting.plot_Ascan -save {self.output_file}"] + self.postrun_cmds = [ + f"python -m toolboxes.Plotting.plot_Ascan -save {self.output_file} --outputs {' '.join(self.rx_outputs)}" + ] self.keep_files = [self.input_file, self.output_file, f"{self.model}.pdf"] if self.is_antenna_model: diff --git a/reframe_tests/reframe_tests.py b/reframe_tests/reframe_tests.py index 1d069234..ab3f693a 100644 --- a/reframe_tests/reframe_tests.py +++ b/reframe_tests/reframe_tests.py @@ -293,6 +293,7 @@ class TestSingleCellPml(GprMaxRegressionTest): tags = {"test", "serial", "geometery", "box", "pml"} sourcesdir = "src/pml_tests" model = parameter(["single_cell_pml_2d"]) + rx_outputs = ["Hx"] @rfm.simple_test @@ -302,3 +303,4 @@ class TestSingleCellPmlMpi(GprMaxMPIRegressionTest): mpi_layout = parameter([[2, 2, 1], [3, 3, 1]]) serial_dependency = TestSingleCellPml model = serial_dependency.model + rx_outputs = ["Hx"]