crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 21:55:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

removed additional unnecessary modifications

Browse source
This commit is contained in:
Sam Shaner 2017-04-26 12:58:27 -04:00
parent d9825f18a2
commit 4655aecde6
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
openmc/tallies.py
View file

@ -2062,8 +2062,7 @@ class Tally(object):
# the tensor product across scores.
if score_product == 'tensor':
self._mean = np.repeat(self.mean, other.num_scores, axis=2)
self._std_dev = np.repeat(self.std_dev, other.num_scores,
axis=2)
self._std_dev = np.repeat(self.std_dev, other.num_scores, axis=2)
other._mean = np.tile(other.mean, (1, 1, self.num_scores))
other._std_dev = np.tile(other.std_dev, (1, 1, self.num_scores))
@ -2080,12 +2079,8 @@ class Tally(object):
# Add scores present in self but not in other to other
for score in other_missing_scores:
other._mean = \
np.insert(other.mean, other.num_scores, 0,
axis=2)
other._std_dev = \
np.insert(other.std_dev, other.num_scores, 0,
axis=2)
other._mean = np.insert(other.mean, other.num_scores, 0, axis=2)
other._std_dev = np.insert(other.std_dev, other.num_scores, 0, axis=2)
other.scores.append(score)
# Add scores present in other but not in self to self