crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-29 06:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed merge conflict with Filter.merge(...) routine

Browse source
This commit is contained in:
Will Boyd 2015-10-26 09:37:59 -04:00
parent e230ad3c8a
commit 19d821106c
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openmc/filter.py
View file

@ -302,11 +302,7 @@ class Filter(object):
merged_filter = copy.deepcopy(self)
# Merge unique filter bins
<<<<<<< HEAD
merged_bins = list(set(list(self.bins) + list(filter.bins)))
=======
merged_bins = list(set(np.concatenate((self.bins, filter.bins))))
>>>>>>> upstream/develop
merged_filter.bins = merged_bins
merged_filter.num_bins = len(merged_bins)