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

Fixed Python 3 bug in both run_tests.py and distribcell_paths setter in summary.py

Browse source
This commit is contained in:
Will Boyd 2016-03-23 11:35:25 -04:00
parent 30641c5d37
commit fd94f6e806
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
openmc/summary.py
View file

@ -564,8 +564,9 @@ class Summary(object):
# Read in distribcell paths
if filter_type == 'distribcell':
new_filter.distribcell_paths = \
self._f['{0}/paths'.format(subsubbase)][...]
paths = self._f['{0}/paths'.format(subsubbase)][...]
paths = [path.decode() for path in paths]
new_filter.distribcell_paths = paths
# Add Filter to the Tally
tally.filters.append(new_filter)

6
tests/run_tests.py
View file

@ -363,10 +363,14 @@ sourcepoint_batch|statepoint_interval|survival_biasing|\
tally_assumesep|translation|uniform_fs|universe|void"
# Delete items of dictionary if valgrind or coverage and not in script mode
to_delete = []
if not script_mode:
for key in tests:
if re.search('valgrind|coverage', key):
del tests[key]
to_delete.append(key)
for key in to_delete:
del tests[key]
# Check if tests empty
if len(list(tests.keys())) == 0: