From 8def35f300e8187a7b56fbbe583d32ea57d687c4 Mon Sep 17 00:00:00 2001 From: Miriam Date: Fri, 7 Aug 2020 20:05:27 +0000 Subject: [PATCH] Made explicit loop to exclude current from certain mgxs tests Previously used MGXS_TYPES[:-1] but to be explicit, I instead looped over all MGXS_TYPES and excluded current. These tests cannot run with current because: -distribcell is not a valid domain for current -nuclide/no_nuclides option is not relevant for current --- tests/regression_tests/mgxs_library_distribcell/test.py | 8 ++++++-- tests/regression_tests/mgxs_library_no_nuclides/test.py | 8 ++++++-- tests/regression_tests/mgxs_library_nuclides/test.py | 9 +++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tests/regression_tests/mgxs_library_distribcell/test.py b/tests/regression_tests/mgxs_library_distribcell/test.py index d6e0a6de03..a4fd63f27e 100644 --- a/tests/regression_tests/mgxs_library_distribcell/test.py +++ b/tests/regression_tests/mgxs_library_distribcell/test.py @@ -22,8 +22,12 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib = openmc.mgxs.Library(self._model.geometry) self.mgxs_lib.by_nuclide = False - # Test all MGXS types - self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES[:-1] + \ + # Test all relevant MGXS types + relevant_MGXS_TYPES = [] + for item in openmc.mgxs.MGXS_TYPES: + if item != 'current': + relevant_MGXS_TYPES = relevant_MGXS_TYPES + [item] + self.mgxs_lib.mgxs_types = tuple(relevant_MGXS_TYPES) + \ 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 65b24d78fc..d06c5954ca 100644 --- a/tests/regression_tests/mgxs_library_no_nuclides/test.py +++ b/tests/regression_tests/mgxs_library_no_nuclides/test.py @@ -19,8 +19,12 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib = openmc.mgxs.Library(self._model.geometry) self.mgxs_lib.by_nuclide = False - # Test all MGXS types - self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES[:-1] + \ + # Test all relevant MGXS types + relevant_MGXS_TYPES = [] + for item in openmc.mgxs.MGXS_TYPES: + if item != 'current': + relevant_MGXS_TYPES = relevant_MGXS_TYPES + [item] + self.mgxs_lib.mgxs_types = tuple(relevant_MGXS_TYPES) + \ 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 521373eb72..a08cb826d6 100644 --- a/tests/regression_tests/mgxs_library_nuclides/test.py +++ b/tests/regression_tests/mgxs_library_nuclides/test.py @@ -17,8 +17,13 @@ class MGXSTestHarness(PyAPITestHarness): # Initialize MGXS Library for a few cross section types 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[:-1] + + # Test relevant all MGXS types + relevant_MGXS_TYPES = [] + for item in openmc.mgxs.MGXS_TYPES: + if item != 'current': + relevant_MGXS_TYPES = relevant_MGXS_TYPES + [item] + self.mgxs_lib.mgxs_types = tuple(relevant_MGXS_TYPES) self.mgxs_lib.energy_groups = energy_groups self.mgxs_lib.legendre_order = 3 self.mgxs_lib.domain_type = 'material'