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

Merge pull request #665 from nelsonag/mergetally

Browse source 
Fix for #655: tally merging not thoroughly merging all tallies which can be merged.
This commit is contained in:
Will Boyd 2016-05-30 14:30:37 -05:00
commit 698c223482
2 changed files with 39 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

68
docs/source/pythonapi/examples/mgxs-part-iv.ipynb
View file

File diff suppressed because one or more lines are too long

11
openmc/tallies.py
View file

@ -827,9 +827,7 @@ class Tally(object):
# Search for each of this tally's scores in the other tally
for score in self.scores:
if score not in other.scores:
all_scores_match = False
else:
if score in other.scores:
no_scores_match = False
# Search for each of the other tally's scores in this tally
@ -3471,7 +3469,8 @@ class Tallies(cv.CheckedList):
"""
if not isinstance(tally, Tally):
msg = 'Unable to add a non-Tally "{0}" to the Tallies instance'.format(tally)
msg = 'Unable to add a non-Tally "{0}" to the ' \
'Tallies instance'.format(tally)
raise TypeError(msg)
if merge:
@ -3482,13 +3481,13 @@ class Tallies(cv.CheckedList):
# If a mergeable tally is found
if tally2.can_merge(tally):
# Replace tally 2 with the merged tally
# Replace tally2 with the merged tally
merged_tally = tally2.merge(tally)
self[i] = merged_tally
merged = True
break
# If not mergeable tally was found, simply add this tally
# If no mergeable tally was found, simply add this tally
if not merged:
super(Tallies, self).append(tally)