From 2e706e5088f3fc1ab266fe45b837b0a0a517bc44 Mon Sep 17 00:00:00 2001 From: Miriam Date: Fri, 17 Jul 2020 03:37:59 +0000 Subject: [PATCH] Updated certain tests to circumvent current MGXS when calling all MGXS_TYPES These tests had to skip 'current' because current operates only with a mesh domain. However, these tests impose a material domain. Therefore, they should not be run with current. --- tests/regression_tests/mgxs_library_condense/test.py | 2 +- tests/regression_tests/mgxs_library_hdf5/test.py | 2 +- tests/regression_tests/mgxs_library_no_nuclides/test.py | 2 +- tests/regression_tests/mgxs_library_nuclides/test.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/regression_tests/mgxs_library_condense/test.py b/tests/regression_tests/mgxs_library_condense/test.py index 167772e2fd..15a4ff827b 100644 --- a/tests/regression_tests/mgxs_library_condense/test.py +++ b/tests/regression_tests/mgxs_library_condense/test.py @@ -19,7 +19,7 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib.by_nuclide = False # Test all MGXS types - self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES + \ + self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES[:-1] + \ openmc.mgxs.MDGXS_TYPES self.mgxs_lib.energy_groups = energy_groups self.mgxs_lib.num_delayed_groups = 6 diff --git a/tests/regression_tests/mgxs_library_hdf5/test.py b/tests/regression_tests/mgxs_library_hdf5/test.py index 9811ab2155..37d30516f7 100644 --- a/tests/regression_tests/mgxs_library_hdf5/test.py +++ b/tests/regression_tests/mgxs_library_hdf5/test.py @@ -23,7 +23,7 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib.by_nuclide = False # Test all MGXS types - self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES + \ + self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES[:-1] + \ openmc.mgxs.MDGXS_TYPES self.mgxs_lib.energy_groups = energy_groups self.mgxs_lib.num_delayed_groups = 6 diff --git a/tests/regression_tests/mgxs_library_no_nuclides/test.py b/tests/regression_tests/mgxs_library_no_nuclides/test.py index 506ac238fc..65b24d78fc 100644 --- a/tests/regression_tests/mgxs_library_no_nuclides/test.py +++ b/tests/regression_tests/mgxs_library_no_nuclides/test.py @@ -20,7 +20,7 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib.by_nuclide = False # Test all MGXS types - self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES + \ + self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES[:-1] + \ openmc.mgxs.MDGXS_TYPES self.mgxs_lib.energy_groups = energy_groups self.mgxs_lib.num_delayed_groups = 6 diff --git a/tests/regression_tests/mgxs_library_nuclides/test.py b/tests/regression_tests/mgxs_library_nuclides/test.py index c64c277098..521373eb72 100644 --- a/tests/regression_tests/mgxs_library_nuclides/test.py +++ b/tests/regression_tests/mgxs_library_nuclides/test.py @@ -18,7 +18,7 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib = openmc.mgxs.Library(self._model.geometry) self.mgxs_lib.by_nuclide = True # Test all MGXS types - self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES + self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES[:-1] self.mgxs_lib.energy_groups = energy_groups self.mgxs_lib.legendre_order = 3 self.mgxs_lib.domain_type = 'material'