From 2adb4f284ff47357e3097105ab43d03143241f22 Mon Sep 17 00:00:00 2001 From: Sam Shaner Date: Fri, 11 Nov 2016 18:29:40 -0500 Subject: [PATCH] addressed PR comments --- docs/source/pythonapi/index.rst | 2 ++ openmc/mgxs/mdgxs.py | 33 ++++++++++++++------------------- openmc/mgxs/mgxs.py | 4 ++-- openmc/mgxs_library.py | 4 +++- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/docs/source/pythonapi/index.rst b/docs/source/pythonapi/index.rst index 7e310857c..e364452b1 100644 --- a/docs/source/pythonapi/index.rst +++ b/docs/source/pythonapi/index.rst @@ -293,6 +293,7 @@ Multi-group Cross Sections openmc.mgxs.NuScatterXS openmc.mgxs.NuScatterMatrixXS openmc.mgxs.PromptNuFissionXS + openmc.mgxs.PromptNuFissionMatrixXS openmc.mgxs.ScatterXS openmc.mgxs.ScatterMatrixXS openmc.mgxs.TotalXS @@ -309,6 +310,7 @@ Multi-delayed-group Cross Sections openmc.mgxs.MDGXS openmc.mgxs.ChiDelayed openmc.mgxs.DelayedNuFissionXS + openmc.mgxs.DelayedNuFissionMatrixXS openmc.mgxs.Beta openmc.mgxs.DecayRate diff --git a/openmc/mgxs/mdgxs.py b/openmc/mgxs/mdgxs.py index 5a0aee80b..5b2f451c2 100644 --- a/openmc/mgxs/mdgxs.py +++ b/openmc/mgxs/mdgxs.py @@ -1840,7 +1840,7 @@ class MatrixMDGXS(MDGXS): energy = openmc.EnergyFilter(group_edges) energyout = openmc.EnergyoutFilter(group_edges) - if self.delayed_groups != None: + if self.delayed_groups is not None: delayed = openmc.DelayedGroupFilter(self.delayed_groups) return [[energy], [delayed, energy, energyout]] else: @@ -1894,7 +1894,7 @@ class MatrixMDGXS(MDGXS): Returns ------- - ndarray + numpy.ndarray A NumPy array of the multi-group cross section indexed in the order each group and subdomain is listed in the parameters. @@ -2150,20 +2150,19 @@ class MatrixMDGXS(MDGXS): for subdomain in subdomains: if self.domain_type == 'distribcell': - string += \ - '{0: <16}=\t{1}\n'.format('\tSubdomain', subdomain) + string += '{: <16}=\t{}\n'.format('\tSubdomain', subdomain) # Loop over all Nuclides for nuclide in nuclides: # Build header for nuclide type if xs_type != 'sum': - string += '{0: <16}=\t{1}\n'.format('\tNuclide', nuclide) + string += '{: <16}=\t{}\n'.format('\tNuclide', nuclide) # Build header for cross section type - string += '{0: <16}\n'.format(xs_header) + string += '{: <16}\n'.format(xs_header) - if self.delayed_groups != None: + if self.delayed_groups is not None: for delayed_group in self.delayed_groups: @@ -2177,22 +2176,20 @@ class MatrixMDGXS(MDGXS): for in_group in range(1, self.num_groups + 1): for out_group in range(1, self.num_groups + 1): string += template.format('', in_group, out_group) - average = \ - self.get_xs([in_group], [out_group], + average = self.get_xs([in_group], [out_group], [subdomain], [nuclide], xs_type=xs_type, value='mean', delayed_groups=[delayed_group]) - rel_err = \ - self.get_xs([in_group], [out_group], + rel_err = self.get_xs([in_group], [out_group], [subdomain], [nuclide], xs_type=xs_type, value='rel_err', delayed_groups=[delayed_group]) average = average.flatten()[0] rel_err = rel_err.flatten()[0] * 100. - string += '{:1.2e} +/- {:1.2e}%'.format(average, - rel_err) + string += '{:.2e} +/- {:.2e}%'.format(average, + rel_err) string += '\n' string += '\n' string += '\n' @@ -2204,18 +2201,16 @@ class MatrixMDGXS(MDGXS): for in_group in range(1, self.num_groups + 1): for out_group in range(1, self.num_groups + 1): string += template.format('', in_group, out_group) - average = \ - self.get_xs([in_group], [out_group], + average = self.get_xs([in_group], [out_group], [subdomain], [nuclide], xs_type=xs_type, value='mean') - rel_err = \ - self.get_xs([in_group], [out_group], + rel_err = self.get_xs([in_group], [out_group], [subdomain], [nuclide], xs_type=xs_type, value='rel_err') average = average.flatten()[0] rel_err = rel_err.flatten()[0] * 100. - string += '{:1.2e} +/- {:1.2e}%'.format(average, - rel_err) + string += '{:.2e} +/- {:.2e}%'.format(average, + rel_err) string += '\n' string += '\n' string += '\n' diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index a7a2a7811..1936697ee 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -1755,7 +1755,7 @@ class MatrixMGXS(MGXS): Returns ------- - ndarray + numpy.ndarray A NumPy array of the multi-group cross section indexed in the order each group and subdomain is listed in the parameters. @@ -3590,7 +3590,7 @@ class ScatterMatrixXS(MatrixMGXS): Returns ------- - ndarray + numpy.ndarray A NumPy array of the multi-group cross section indexed in the order each group and subdomain is listed in the parameters. diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index ac12847aa..3f3a38b06 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -1092,7 +1092,9 @@ class XSdata(object): def set_prompt_nu_fission_mgxs(self, prompt_nu_fission, temperature=294., nuclide='total', xs_type='macro', subdomain=None): - """This method allows for an openmc.mgxs.PromptNuFissionXS or + """Sets the prompt-nu-fission cross section. + + This method allows for an openmc.mgxs.PromptNuFissionXS or openmc.mgxs.PromptNuFissionMatrixXS to be used to set the prompt-nu-fission cross section for this XSdata object.