From 70e7ce9b3bf27660055211296fe7d18fa2cf5ea2 Mon Sep 17 00:00:00 2001 From: Sam Shaner Date: Wed, 25 Nov 2015 09:34:35 -0800 Subject: [PATCH] fixed issue with python 2 and 3 discrepancies for tally arithmetic tests --- openmc/tallies.py | 7 +- .../results_true.dat | 86 +++++++++---------- 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/openmc/tallies.py b/openmc/tallies.py index 77520750ce..a97428565c 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -1488,9 +1488,10 @@ class Tally(object): other_copy = copy.deepcopy(other) # Find any shared filters between the two tallies - self_filters = set(self_copy.filters) - other_filters = set(other_copy.filters) - filter_intersect = self_filters.intersection(other_filters) + filter_intersect = [] + for filter in self_copy.filters: + if filter in other_copy.filters: + filter_intersect.append(filter) # Align the shared filters in successive order for i, filter in enumerate(filter_intersect): diff --git a/tests/test_mgxs_library_condense/results_true.dat b/tests/test_mgxs_library_condense/results_true.dat index 58e0d14fcd..45891fc300 100644 --- a/tests/test_mgxs_library_condense/results_true.dat +++ b/tests/test_mgxs_library_condense/results_true.dat @@ -1,49 +1,49 @@ - group in material nuclide mean std. dev. -0 1 1 total 0.419289 0.01638 group in material nuclide mean std. dev. -0 1 1 total 0.07774 0.003273 group in material group out nuclide mean std. dev. + material group in nuclide mean std. dev. +0 1 1 total 0.419289 0.01638 material group in nuclide mean std. dev. +0 1 1 total 0.07774 0.003273 material group in group out nuclide mean std. dev. 0 1 1 1 total 0.352665 0.015654 material group out nuclide mean std. dev. -0 1 1 total 1 0.119622 group in material nuclide mean std. dev. -0 1 2 total 0.247316 0.009562 group in material nuclide mean std. dev. -0 1 2 total 0 0 group in material group out nuclide mean std. dev. -0 1 2 1 total 0.244838 0.009996 material group out nuclide mean std. dev. -0 2 1 total 0 0 group in material nuclide mean std. dev. -0 1 3 total 0.409938 0.042262 group in material nuclide mean std. dev. -0 1 3 total 0 0 group in material group out nuclide mean std. dev. -0 1 3 1 total 0.403354 0.041386 material group out nuclide mean std. dev. -0 3 1 total 0 0 group in material nuclide mean std. dev. -0 1 4 total 0.344007 0.05352 group in material nuclide mean std. dev. -0 1 4 total 0 0 group in material group out nuclide mean std. dev. -0 1 4 1 total 0.340438 0.052067 material group out nuclide mean std. dev. -0 4 1 total 0 0 group in material nuclide mean std. dev. -0 1 5 total 0 0 group in material nuclide mean std. dev. -0 1 5 total 0 0 group in material group out nuclide mean std. dev. -0 1 5 1 total 0 0 material group out nuclide mean std. dev. -0 5 1 total 0 0 group in material nuclide mean std. dev. -0 1 6 total 0 0 group in material nuclide mean std. dev. -0 1 6 total 0 0 group in material group out nuclide mean std. dev. -0 1 6 1 total 0 0 material group out nuclide mean std. dev. +0 1 1 total 1 0.119622 material group in nuclide mean std. dev. +0 2 1 total 0.247316 0.009562 material group in nuclide mean std. dev. +0 2 1 total 0 0 material group in group out nuclide mean std. dev. +0 2 1 1 total 0.244838 0.009996 material group out nuclide mean std. dev. +0 2 1 total 0 0 material group in nuclide mean std. dev. +0 3 1 total 0.409938 0.042262 material group in nuclide mean std. dev. +0 3 1 total 0 0 material group in group out nuclide mean std. dev. +0 3 1 1 total 0.403354 0.041386 material group out nuclide mean std. dev. +0 3 1 total 0 0 material group in nuclide mean std. dev. +0 4 1 total 0.344007 0.05352 material group in nuclide mean std. dev. +0 4 1 total 0 0 material group in group out nuclide mean std. dev. +0 4 1 1 total 0.340438 0.052067 material group out nuclide mean std. dev. +0 4 1 total 0 0 material group in nuclide mean std. dev. +0 5 1 total 0 0 material group in nuclide mean std. dev. +0 5 1 total 0 0 material group in group out nuclide mean std. dev. +0 5 1 1 total 0 0 material group out nuclide mean std. dev. +0 5 1 total 0 0 material group in nuclide mean std. dev. +0 6 1 total 0 0 material group in nuclide mean std. dev. +0 6 1 total 0 0 material group in group out nuclide mean std. dev. +0 6 1 1 total 0 0 material group out nuclide mean std. dev. 0 6 1 total 0 0 material group in nuclide mean std. dev. 0 7 1 total 0 0 material group in nuclide mean std. dev. 0 7 1 total 0 0 material group in group out nuclide mean std. dev. 0 7 1 1 total 0 0 material group out nuclide mean std. dev. -0 7 1 total 0 0 group in material nuclide mean std. dev. -0 1 8 total 0 0 group in material nuclide mean std. dev. -0 1 8 total 0 0 group in material group out nuclide mean std. dev. -0 1 8 1 total 0 0 material group out nuclide mean std. dev. -0 8 1 total 0 0 group in material nuclide mean std. dev. -0 1 9 total 0.751873 0.559701 group in material nuclide mean std. dev. -0 1 9 total 0 0 group in material group out nuclide mean std. dev. -0 1 9 1 total 0.695491 0.50757 material group out nuclide mean std. dev. -0 9 1 total 0 0 group in material nuclide mean std. dev. -0 1 10 total 0 0 group in material nuclide mean std. dev. -0 1 10 total 0 0 group in material group out nuclide mean std. dev. -0 1 10 1 total 0 0 material group out nuclide mean std. dev. -0 10 1 total 0 0 group in material nuclide mean std. dev. -0 1 11 total 0.457329 0.403578 group in material nuclide mean std. dev. -0 1 11 total 0 0 group in material group out nuclide mean std. dev. -0 1 11 1 total 0.446737 0.392775 material group out nuclide mean std. dev. -0 11 1 total 0 0 group in material nuclide mean std. dev. -0 1 12 total 0.574978 0.38864 group in material nuclide mean std. dev. -0 1 12 total 0 0 group in material group out nuclide mean std. dev. -0 1 12 1 total 0.559478 0.377512 material group out nuclide mean std. dev. +0 7 1 total 0 0 material group in nuclide mean std. dev. +0 8 1 total 0 0 material group in nuclide mean std. dev. +0 8 1 total 0 0 material group in group out nuclide mean std. dev. +0 8 1 1 total 0 0 material group out nuclide mean std. dev. +0 8 1 total 0 0 material group in nuclide mean std. dev. +0 9 1 total 0.751873 0.559701 material group in nuclide mean std. dev. +0 9 1 total 0 0 material group in group out nuclide mean std. dev. +0 9 1 1 total 0.695491 0.50757 material group out nuclide mean std. dev. +0 9 1 total 0 0 material group in nuclide mean std. dev. +0 10 1 total 0 0 material group in nuclide mean std. dev. +0 10 1 total 0 0 material group in group out nuclide mean std. dev. +0 10 1 1 total 0 0 material group out nuclide mean std. dev. +0 10 1 total 0 0 material group in nuclide mean std. dev. +0 11 1 total 0.457329 0.403578 material group in nuclide mean std. dev. +0 11 1 total 0 0 material group in group out nuclide mean std. dev. +0 11 1 1 total 0.446737 0.392775 material group out nuclide mean std. dev. +0 11 1 total 0 0 material group in nuclide mean std. dev. +0 12 1 total 0.574978 0.38864 material group in nuclide mean std. dev. +0 12 1 total 0 0 material group in group out nuclide mean std. dev. +0 12 1 1 total 0.559478 0.377512 material group out nuclide mean std. dev. 0 12 1 total 0 0 \ No newline at end of file