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

changed FilterBinIter interface to simplify things a little

Browse source
This commit is contained in:
John Tramm 2020-01-14 19:57:06 +00:00
parent d6d804600f
commit a7a7ceed12
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/openmc/tallies/tally_scoring.h
View file

@ -23,8 +23,7 @@ class FilterBinIter
public:
//! Construct an iterator over bins that match a given particle's state.
FilterBinIter(const Tally& tally, const Particle* p,
std::vector<FilterMatch>* particle_filter_matches);
FilterBinIter(const Tally& tally, Particle* p);
//! Construct an iterator over all filter bin combinations.
//

14
src/tallies/tally_scoring.cpp
View file

@ -26,8 +26,8 @@ namespace openmc {
// FilterBinIter implementation
//==============================================================================
FilterBinIter::FilterBinIter(const Tally& tally, const Particle* p, std::vector<FilterMatch>* particle_filter_matches)
: tally_{tally}, filter_matches_{*particle_filter_matches}
FilterBinIter::FilterBinIter(const Tally& tally, Particle* p)
: tally_{tally}, filter_matches_{p->filter_matches_}
{
// Find all valid bins in each relevant filter if they have not already been
// found for this event.
@ -2036,7 +2036,7 @@ void score_analog_tally_ce(Particle* p)
// Initialize an iterator over valid filter bin combinations. If there are
// no valid combinations, use a continue statement to ensure we skip the
// assume_separate break below.
auto filter_iter = FilterBinIter(tally, p, &p->filter_matches_);
auto filter_iter = FilterBinIter(tally, p);
auto end = FilterBinIter(tally, true, &p->filter_matches_);
if (filter_iter == end) continue;
@ -2093,7 +2093,7 @@ void score_analog_tally_mg(Particle* p)
// Initialize an iterator over valid filter bin combinations. If there are
// no valid combinations, use a continue statement to ensure we skip the
// assume_separate break below.
auto filter_iter = FilterBinIter(tally, p, &p->filter_matches_);
auto filter_iter = FilterBinIter(tally, p);
auto end = FilterBinIter(tally, true, &p->filter_matches_);
if (filter_iter == end) continue;
@ -2142,7 +2142,7 @@ score_tracklength_tally(Particle* p, double distance)
// Initialize an iterator over valid filter bin combinations. If there are
// no valid combinations, use a continue statement to ensure we skip the
// assume_separate break below.
auto filter_iter = FilterBinIter(tally, p, &p->filter_matches_);
auto filter_iter = FilterBinIter(tally, p);
auto end = FilterBinIter(tally, true, &p->filter_matches_);
if (filter_iter == end) continue;
@ -2210,7 +2210,7 @@ void score_collision_tally(Particle* p)
// Initialize an iterator over valid filter bin combinations. If there are
// no valid combinations, use a continue statement to ensure we skip the
// assume_separate break below.
auto filter_iter = FilterBinIter(tally, p, &p->filter_matches_);
auto filter_iter = FilterBinIter(tally, p);
auto end = FilterBinIter(tally, true, &p->filter_matches_);
if (filter_iter == end) continue;
@ -2270,7 +2270,7 @@ score_surface_tally(Particle* p, const std::vector<int>& tallies)
// Initialize an iterator over valid filter bin combinations. If there are
// no valid combinations, use a continue statement to ensure we skip the
// assume_separate break below.
auto filter_iter = FilterBinIter(tally, p, &p->filter_matches_);
auto filter_iter = FilterBinIter(tally, p);
auto end = FilterBinIter(tally, true, &p->filter_matches_);
if (filter_iter == end) continue;