From 3368d7aebeedd4f741c4aa2975bcdcd1aac0e927 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 29 May 2016 14:18:31 -0400 Subject: [PATCH] Converting test_mgxs_library_*_nuclides tests to use openmc.mgxs.MGXS_TYPES so the test always tests the latest list of Mgxs classes --- .../test_mgxs_library_no_nuclides.py | 11 ++++------- .../test_mgxs_library_nuclides.py | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tests/test_mgxs_library_no_nuclides/test_mgxs_library_no_nuclides.py b/tests/test_mgxs_library_no_nuclides/test_mgxs_library_no_nuclides.py index 1413f869c..8f074f4f6 100644 --- a/tests/test_mgxs_library_no_nuclides/test_mgxs_library_no_nuclides.py +++ b/tests/test_mgxs_library_no_nuclides/test_mgxs_library_no_nuclides.py @@ -20,17 +20,14 @@ class MGXSTestHarness(PyAPITestHarness): super(MGXSTestHarness, self)._build_inputs() # Initialize a two-group structure - energy_groups = openmc.mgxs.EnergyGroups(group_edges=[0, 0.625e-6, 20.]) + energy_groups = openmc.mgxs.EnergyGroups(group_edges=[0, 0.625e-6, + 20.]) # Initialize MGXS Library for a few cross section types self.mgxs_lib = openmc.mgxs.Library(self._input_set.geometry) self.mgxs_lib.by_nuclide = False - self.mgxs_lib.mgxs_types = ['total', 'transport', 'nu-transport', - 'absorption', 'capture', 'fission', - 'nu-fission', 'kappa-fission', 'scatter', - 'nu-scatter', 'scatter matrix', - 'nu-scatter matrix', 'multiplicity matrix', - 'nu-fission matrix', 'chi'] + # Test all MGXS types + self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES self.mgxs_lib.energy_groups = energy_groups self.mgxs_lib.legendre_order = 3 self.mgxs_lib.domain_type = 'material' diff --git a/tests/test_mgxs_library_nuclides/test_mgxs_library_nuclides.py b/tests/test_mgxs_library_nuclides/test_mgxs_library_nuclides.py index b9ffdbcaa..0bd773248 100644 --- a/tests/test_mgxs_library_nuclides/test_mgxs_library_nuclides.py +++ b/tests/test_mgxs_library_nuclides/test_mgxs_library_nuclides.py @@ -20,17 +20,14 @@ class MGXSTestHarness(PyAPITestHarness): super(MGXSTestHarness, self)._build_inputs() # Initialize a two-group structure - energy_groups = openmc.mgxs.EnergyGroups(group_edges=[0, 0.625e-6, 20.]) + energy_groups = openmc.mgxs.EnergyGroups(group_edges=[0, 0.625e-6, + 20.]) # Initialize MGXS Library for a few cross section types self.mgxs_lib = openmc.mgxs.Library(self._input_set.geometry) self.mgxs_lib.by_nuclide = True - self.mgxs_lib.mgxs_types = ['total', 'transport', 'nu-transport', - 'absorption', 'capture', 'fission', - 'nu-fission', 'kappa-fission', 'scatter', - 'nu-scatter', 'scatter matrix', - 'nu-scatter matrix', 'multiplicity matrix', - 'nu-fission matrix', 'chi'] + # Test all MGXS types + self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES self.mgxs_lib.energy_groups = energy_groups self.mgxs_lib.legendre_order = 3 self.mgxs_lib.domain_type = 'material'