crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 14:15:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Added option to transpose array returned by ScatterMatrixXS.get_xs(...) method

Browse source
This commit is contained in:
Will Boyd 2016-04-29 22:13:41 -04:00
parent ae083cf5d4
commit ed5505cd97
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
openmc/mgxs/mgxs.py
View file

@ -654,7 +654,8 @@ class MGXS(object):
self.tallies[tally_type] = sp_tally
def get_xs(self, groups='all', subdomains='all', nuclides='all',
xs_type='macro', order_groups='increasing', value='mean'):
xs_type='macro', order_groups='increasing',
value='mean', **kwargs):
"""Returns an array of multi-group cross sections.
This method constructs a 2D NumPy array for the requested multi-group
@ -1143,7 +1144,7 @@ class MGXS(object):
def build_hdf5_store(self, filename='mgxs.h5', directory='mgxs',
subdomains='all', nuclides='all',
xs_type='macro', append=True):
xs_type='macro', row_column='inout', append=True):
"""Export the multi-group cross section data to an HDF5 binary file.
This method constructs an HDF5 file which stores the multi-group
@ -1172,6 +1173,9 @@ class MGXS(object):
xs_type: {'macro', 'micro'}
Store the macro or micro cross section in units of cm^-1 or barns.
Defaults to 'macro'.
row_column: {'inout', 'outin'}
Store scattering matrices indexed first by incoming group and second
by outgoing group ('inout'), or vice versa ('outin').
append : bool
If true, appends to an existing HDF5 file with the same filename
directory (if one exists). Defaults to True.
@ -1258,9 +1262,9 @@ class MGXS(object):
# Extract the cross section for this subdomain and nuclide
average = self.get_xs(subdomains=[subdomain], nuclides=[nuclide],
xs_type=xs_type, value='mean')
xs_type=xs_type, value='mean', row_column=row_column)
std_dev = self.get_xs(subdomains=[subdomain], nuclides=[nuclide],
xs_type=xs_type, value='std_dev')
xs_type=xs_type, value='std_dev', row_column=row_column)
average = average.squeeze()
std_dev = std_dev.squeeze()
@ -1973,7 +1977,8 @@ class ScatterMatrixXS(MGXS):
def get_xs(self, in_groups='all', out_groups='all',
subdomains='all', nuclides='all', xs_type='macro',
order_groups='increasing', value='mean'):
order_groups='increasing', row_column='inout',
value='mean', **kwargs):
"""Returns an array of multi-group cross sections.
This method constructs a 2D NumPy array for the requested scattering
@ -1999,6 +2004,9 @@ class ScatterMatrixXS(MGXS):
Return the cross section indexed according to increasing or
decreasing energy groups (decreasing or increasing energies).
Defaults to 'increasing'.
row_column: {'inout', 'outin'}
Return the cross section indexed first by incoming group and second
by outgoing group ('inout'), or vice versa ('outin').
value : str
A string for the type of value to return - 'mean', 'std_dev', or
'rel_err' are accepted. Defaults to the empty string.
@ -2092,6 +2100,10 @@ class ScatterMatrixXS(MGXS):
new_shape += xs.shape[1:]
xs = np.reshape(xs, new_shape)
# Transpose the scattering matrix if requested by user
if row_column == 'outin':
xs = np.swapaxes(xs, 1, 2)
# Reverse energies to align with increasing energy groups
xs = xs[:, ::-1, ::-1, :]
@ -2422,7 +2434,8 @@ class Chi(MGXS):
return merged_mgxs
def get_xs(self, groups='all', subdomains='all', nuclides='all',
xs_type='macro', order_groups='increasing', value='mean'):
xs_type='macro', order_groups='increasing',
value='mean', **kwargs):
"""Returns an array of the fission spectrum.
This method constructs a 2D NumPy array for the requested multi-group