From 22df8cfe417d7cfe88361bd4cac75c315798f09e Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Tue, 18 Oct 2016 05:23:50 -0400 Subject: [PATCH] Incorporated @paulromano comments --- docs/source/io_formats/mgxs_library.rst | 2 +- openmc/mesh.py | 4 ++-- openmc/mgxs/library.py | 2 +- openmc/mgxs_library.py | 9 +++------ 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/docs/source/io_formats/mgxs_library.rst b/docs/source/io_formats/mgxs_library.rst index 2a1e63d435..4e5ea21969 100644 --- a/docs/source/io_formats/mgxs_library.rst +++ b/docs/source/io_formats/mgxs_library.rst @@ -9,7 +9,7 @@ nuclear data is available. In continuous-energy mode, the ``cross_sections.xml`` file contains necessary meta-data for each dataset, including the name and a file system location where the complete library can be found. In multi-group mode, the multi-group meta-data and the -nuclear data itself is contained within an ``mgxs.h5``. This portion of +nuclear data itself is contained within an ``mgxs.h5`` file. This portion of the manual describes the format of the multi-group data library required to be used in the ``mgxs.h5`` file. diff --git a/openmc/mesh.py b/openmc/mesh.py index 014cbc4679..21144469f1 100644 --- a/openmc/mesh.py +++ b/openmc/mesh.py @@ -286,8 +286,8 @@ class Mesh(object): openmc.XPlane(x0=self.upper_right[0], boundary_type=bc[1])] if len(self.dimension) == 1: - yplanes = [openmc.YPlane(y0=1000., boundary_type='reflective'), - openmc.YPlane(y0=1000., boundary_type='reflective')] + yplanes = [openmc.YPlane(y0=-1e10, boundary_type='reflective'), + openmc.YPlane(y0=1e10, boundary_type='reflective')] else: yplanes = [openmc.YPlane(y0=self.lower_left[1], boundary_type=bc[2]), diff --git a/openmc/mgxs/library.py b/openmc/mgxs/library.py index c03aa78771..eb07e80976 100644 --- a/openmc/mgxs/library.py +++ b/openmc/mgxs/library.py @@ -1283,7 +1283,7 @@ class Library(object): ('nu-transport' not in self.mgxs_types))): error_flag = True warn('A "nu-transport" MGXS type is required since a "P0" ' - 'correction is applied, but a "nu-transport" MGXS == ' + 'correction is applied, but a "nu-transport" MGXS is ' 'not provided.') elif (((self.correction is None) and ('total' not in self.mgxs_types))): diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index 35dff1223a..b62c3ac83f 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -1135,19 +1135,16 @@ class XSdata(object): if self.fissionable is not None: grp.attrs['fissionable'] = self.fissionable if self.representation is not None: - grp.attrs['representation'] = np.array(self.representation, - dtype='S') + grp.attrs['representation'] = np.string_(self.representation) if self.representation == 'angle': if self.num_azimuthal is not None: grp.attrs['num_azimuthal'] = self.num_azimuthal if self.num_polar is not None: grp.attrs['num_polar'] = self.num_polar if self.scatter_format is not None: - grp.attrs['scatter_format'] = np.array(self.scatter_format, - dtype='S') + grp.attrs['scatter_format'] = np.string_(self.scatter_format) if self.scatter_shape is not None: - grp.attrs['scatter_shape'] = np.array(self.scatter_shape, - dtype='S') + grp.attrs['scatter_shape'] = np.string_(self.scatter_shape) if self.order is not None: grp.attrs['order'] = self.order