Skip to content

Allow zero bins in tally triggers #2928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulromano merged 14 commits into from
May 2, 2024
Merged

Allow zero bins in tally triggers #2928

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cc9e960
Add allow_zero option to Triggers
tjlaboss Mar 17, 2024
932f016
Add 'allow_zero' functionality to Trigger in Python API
tjlaboss Mar 18, 2024
44c2d7c
Test tally trigger with zeros allowed
tjlaboss Mar 19, 2024
65490e7
Ignore tallies with no contributions upon request.
tjlaboss Mar 19, 2024
29b0782
Do not check tally triggers until one active interval has run.
tjlaboss Mar 19, 2024
b629b6e
Run clang-format
tjlaboss Mar 19, 2024
4663858
Document tally trigger allow_zero
tjlaboss Mar 19, 2024
d388ec5
Make more similar to bools in settings.py
tjlaboss Mar 28, 2024
c407954
Needs more paticles with NNDC data?
tjlaboss Mar 28, 2024
96a96c6
Add ".. versionadded:: 0.14.1" to Trigger docstring
tjlaboss Apr 11, 2024
f821d7e
Revert "Do not check tally triggers until one active interval has run."
tjlaboss Apr 30, 2024
5adb9e1
Rename 'allow_zero' -> 'ignore_zeros'
tjlaboss Apr 30, 2024
41fb799
Add documentation informing the user of a possible pitfall
tjlaboss Apr 30, 2024
cc6498f
Small fixes
paulromano May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add allow_zero option to Triggers
  • Loading branch information
@tjlaboss
tjlaboss committed Mar 28, 2024
commit cc9e960b7b1d5bce0300d6f5ca159eda7ee6f3ef
1 change: 1 addition & 0 deletions include/openmc/tallies/trigger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ enum class TriggerMetric {
struct Trigger {
TriggerMetric metric; //!< The type of uncertainty (e.g. std dev) measured
double threshold; //!< Uncertainty value below which trigger is satisfied
bool allow_zero; //!< Whether to allow zero tally bins to be ignored
int score_index; //!< Index of the relevant score in the tally's arrays
};

Expand Down
10 changes: 8 additions & 2 deletions src/tallies/tally.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,12 @@ void Tally::init_triggers(pugi::xml_node node)
"Must specify trigger threshold for tally {} in tally XML file", id_));
}

// Read whether to allow zero-tally bins to be ignored.
bool allow_zero = false;
if (check_for_node(trigger_node, "allow_zero")) {
allow_zero = get_node_value_bool(trigger_node, "allow_zero");
}

// Read the trigger scores.
vector<std::string> trigger_scores;
if (check_for_node(trigger_node, "scores")) {
Expand All @@ -702,7 +708,7 @@ void Tally::init_triggers(pugi::xml_node node)
if (score_str == "all") {
triggers_.reserve(triggers_.size() + this->scores_.size());
for (auto i_score = 0; i_score < this->scores_.size(); ++i_score) {
triggers_.push_back({metric, threshold, i_score});
triggers_.push_back({metric, threshold, allow_zero, i_score});
}
} else {
int i_score = 0;
Expand All @@ -716,7 +722,7 @@ void Tally::init_triggers(pugi::xml_node node)
"{} but it was listed in a trigger on that tally",
score_str, id_));
}
triggers_.push_back({metric, threshold, i_score});
triggers_.push_back({metric, threshold, allow_zero, i_score});
}
}
}
Expand Down