From 5f750f3976ec4d11aa7c512318f0cffdfedad294 Mon Sep 17 00:00:00 2001 From: Sam Shaner Date: Wed, 19 Oct 2016 11:58:32 -0400 Subject: [PATCH] updated setting of delayed groups in mgxs tests --- openmc/mgxs/library.py | 5 +++-- .../test_mgxs_library_condense/test_mgxs_library_condense.py | 5 +---- .../test_mgxs_library_distribcell.py | 5 +---- tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py | 5 +---- tests/test_mgxs_library_mesh/test_mgxs_library_mesh.py | 5 +---- .../test_mgxs_library_no_nuclides.py | 5 +---- 6 files changed, 8 insertions(+), 22 deletions(-) diff --git a/openmc/mgxs/library.py b/openmc/mgxs/library.py index 14f6ece3ce..7344445567 100644 --- a/openmc/mgxs/library.py +++ b/openmc/mgxs/library.py @@ -331,7 +331,7 @@ class Library(object): def num_delayed_groups(self, num_delayed_groups): cv.check_less_than('num delayed groups', num_delayed_groups, - MAX_DELAYED_GROUPS, equality=True) + openmc.mgxs.MAX_DELAYED_GROUPS, equality=True) cv.check_greater_than('num delayed groups', num_delayed_groups, 0, equality=True) self._num_delayed_groups = num_delayed_groups @@ -422,7 +422,8 @@ class Library(object): if self.num_delayed_groups == 0: mgxs.delayed_groups = None else: - delayed_groups = list(range(1,self.num_delayed_groups)) + delayed_groups \ + = list(range(1,self.num_delayed_groups+1)) mgxs.delayed_groups = delayed_groups # If a tally trigger was specified, add it to the MGXS diff --git a/tests/test_mgxs_library_condense/test_mgxs_library_condense.py b/tests/test_mgxs_library_condense/test_mgxs_library_condense.py index d3f2bc08e8..19c6ffda90 100644 --- a/tests/test_mgxs_library_condense/test_mgxs_library_condense.py +++ b/tests/test_mgxs_library_condense/test_mgxs_library_condense.py @@ -23,9 +23,6 @@ class MGXSTestHarness(PyAPITestHarness): energy_groups = openmc.mgxs.EnergyGroups(group_edges=[0, 0.625e-6, 20.]) - # Initialize a six-delayed-group structure - delayed_groups = list(range(1,7)) - # 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 @@ -34,7 +31,7 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES + \ openmc.mgxs.MDGXS_TYPES self.mgxs_lib.energy_groups = energy_groups - self.mgxs_lib.delayed_groups = delayed_groups + self.mgxs_lib.num_delayed_groups = 6 self.mgxs_lib.legendre_order = 3 self.mgxs_lib.domain_type = 'material' self.mgxs_lib.build_library() diff --git a/tests/test_mgxs_library_distribcell/test_mgxs_library_distribcell.py b/tests/test_mgxs_library_distribcell/test_mgxs_library_distribcell.py index 940985d916..5c402749ab 100644 --- a/tests/test_mgxs_library_distribcell/test_mgxs_library_distribcell.py +++ b/tests/test_mgxs_library_distribcell/test_mgxs_library_distribcell.py @@ -22,9 +22,6 @@ class MGXSTestHarness(PyAPITestHarness): # Initialize a one-group structure energy_groups = openmc.mgxs.EnergyGroups(group_edges=[0, 20.]) - # Initialize a six-delayed-group structure - delayed_groups = list(range(1,7)) - # Initialize MGXS Library for a few cross section types # for one material-filled cell in the geometry self.mgxs_lib = openmc.mgxs.Library(self._input_set.geometry) @@ -34,7 +31,7 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES + \ openmc.mgxs.MDGXS_TYPES self.mgxs_lib.energy_groups = energy_groups - self.mgxs_lib.delayed_groups = delayed_groups + self.mgxs_lib.num_delayed_groups = 6 self.mgxs_lib.legendre_order = 3 self.mgxs_lib.domain_type = 'distribcell' cells = self.mgxs_lib.openmc_geometry.get_all_material_cells() diff --git a/tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py b/tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py index b4d7e5dbbe..959f9e70a8 100644 --- a/tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py +++ b/tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py @@ -24,9 +24,6 @@ class MGXSTestHarness(PyAPITestHarness): energy_groups = openmc.mgxs.EnergyGroups(group_edges=[0, 0.625e-6, 20.]) - # Initialize a six-delayed-group structure - delayed_groups = list(range(1,7)) - # 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 @@ -35,7 +32,7 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES + \ openmc.mgxs.MDGXS_TYPES self.mgxs_lib.energy_groups = energy_groups - self.mgxs_lib.delayed_groups = delayed_groups + self.mgxs_lib.num_delayed_groups = 6 self.mgxs_lib.legendre_order = 3 self.mgxs_lib.domain_type = 'material' self.mgxs_lib.build_library() diff --git a/tests/test_mgxs_library_mesh/test_mgxs_library_mesh.py b/tests/test_mgxs_library_mesh/test_mgxs_library_mesh.py index 1f31bd5660..3a42ccd34e 100644 --- a/tests/test_mgxs_library_mesh/test_mgxs_library_mesh.py +++ b/tests/test_mgxs_library_mesh/test_mgxs_library_mesh.py @@ -18,9 +18,6 @@ class MGXSTestHarness(PyAPITestHarness): # Initialize a one-group structure energy_groups = openmc.mgxs.EnergyGroups(group_edges=[0, 20.]) - # Initialize a six-delayed-group structure - delayed_groups = list(range(1,7)) - # Initialize MGXS Library for a few cross section types # for one material-filled cell in the geometry self.mgxs_lib = openmc.mgxs.Library(self._input_set.geometry) @@ -30,7 +27,7 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES + \ openmc.mgxs.MDGXS_TYPES self.mgxs_lib.energy_groups = energy_groups - self.mgxs_lib.delayed_groups = delayed_groups + self.mgxs_lib.num_delayed_groups = 6 self.mgxs_lib.legendre_order = 3 self.mgxs_lib.domain_type = 'mesh' 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 edd41f1c56..a8eea412be 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 @@ -23,9 +23,6 @@ class MGXSTestHarness(PyAPITestHarness): energy_groups = openmc.mgxs.EnergyGroups(group_edges=[0, 0.625e-6, 20.]) - # Initialize a six-delayed-group structure - delayed_groups = list(range(1,7)) - # 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 @@ -34,7 +31,7 @@ class MGXSTestHarness(PyAPITestHarness): self.mgxs_lib.mgxs_types = openmc.mgxs.MGXS_TYPES + \ openmc.mgxs.MDGXS_TYPES self.mgxs_lib.energy_groups = energy_groups - self.mgxs_lib.delayed_groups = delayed_groups + self.mgxs_lib.num_delayed_groups = 6 self.mgxs_lib.legendre_order = 3 self.mgxs_lib.domain_type = 'material' self.mgxs_lib.build_library()