From 4fe252ba8a1955c15c73d71ddecd5a961b2b1885 Mon Sep 17 00:00:00 2001 From: Will Boyd Date: Sun, 29 May 2016 23:14:09 -0400 Subject: [PATCH] Changes to address comments by @samuelshaner --- openmc/statepoint.py | 10 ---------- openmc/tallies.py | 2 -- 2 files changed, 12 deletions(-) diff --git a/openmc/statepoint.py b/openmc/statepoint.py index 329d3e41de..9f485619dd 100644 --- a/openmc/statepoint.py +++ b/openmc/statepoint.py @@ -504,16 +504,6 @@ class StatePoint(object): This routine searches the list of Tallies and returns the first Tally found which satisfies all of the input parameters. - If the "exactness" parameter is 0 (default), the input parameters - do not need to match the complete Tally specification and may only - represent a subset of the Tally's properties. If the "exactness" - parameter is 1 then the length of the scores, filters, nuclides - parameters must precisely match those of any matching Tally, but the - filter bins may represent a subset of those in any matching Tally - (useful if tallies are merged in the input). If the "exactness" - parameter is 2 then the values of the scores, nuclides and filters - parameters must precisely match those of any matching Tally. - NOTE: If any of the "exact" parameters are False (default), the input parameters do not need to match the complete Tally specification and may only represent a subset of the Tally's properties. If an "exact" diff --git a/openmc/tallies.py b/openmc/tallies.py index 641b6c26c0..9559adcade 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -762,8 +762,6 @@ class Tally(object): # If filters are the second mergeable filters encountered elif filter1.can_merge(filter2) and merge_filters: - merge_filters = True - mergeable_filter = True return False # If no mergeable filter was found, the tallies are not mergeable