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

Fixed bug in Tally.diagonalize_filter(...) routine for multiple nuclides, scores

Browse source
This commit is contained in:
Will Boyd 2015-09-30 13:09:30 -04:00
parent 731ee261e1
commit d075e10fbb
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openmc/filter.py
View file

@ -55,7 +55,6 @@ class Filter(object):
self._type = None
self._num_bins = 0
self._bins = None
self._bins = None
self._mesh = None
self._offset = -1
self._stride = None
@ -314,8 +313,9 @@ class Filter(object):
Returns
-------
boolean
bool
Whether or not the other filter is a subset of this filter
"""
if not isinstance(other, Filter):

8
openmc/tallies.py
View file

@ -2517,16 +2517,16 @@ class Tally(object):
if self.sum is not None:
new_tally._sum = np.zeros(new_shape, dtype=np.float64)
new_tally._sum[diag_indices, :, :] = self.sum
new_tally._sum[indices, :self.num_nuclides, :self.num_scores] = self.sum
if self.sum_sq is not None:
new_tally._sum_sq = np.zeros(new_shape, dtype=np.float64)
new_tally._sum_sq[diag_indices, :, :] = self.sum_sq
new_tally._sum_sq[indices, :self.num_nuclides, :self.num_scores] = self.sum_sq
if self.mean is not None:
new_tally._mean = np.zeros(new_shape, dtype=np.float64)
new_tally._mean[diag_indices, :, :] = self.mean
new_tally._mean[indices, :self.num_nuclides, :self.num_scores] = self.mean
if self.std_dev is not None:
new_tally._std_dev = np.zeros(new_shape, dtype=np.float64)
new_tally._std_dev[diag_indices, :, :] = self.std_dev
new_tally._std_dev[indices, :self.num_nuclides, :self.num_scores] = self.std_dev
# Correct each Filter's stride
stride = new_tally.num_nuclides * new_tally.num_score_bins