crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 14:15:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove unneeded rpn tokens in-place

Browse source
This commit is contained in:
Sterling Harper 2019-03-31 07:38:18 -04:00
parent 6bcec6fa19
commit 2dc02c5774
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/cell.cpp
View file

@ -325,7 +325,6 @@ CSGCell::CSGCell(pugi::xml_node cell_node)
// Convert the infix region spec to RPN.
rpn_ = generate_rpn(id_, region_);
rpn_.shrink_to_fit();
// Check if this is a simple cell.
simple_ = true;
@ -338,13 +337,18 @@ CSGCell::CSGCell(pugi::xml_node cell_node)
// If this cell is simple, remove all the superfluous operator tokens.
if (simple_) {
std::vector<int32_t> stack;
for (auto token : rpn_) {
if (token < OP_UNION) stack.push_back(token);
size_t i0 = 0;
size_t i1 = 0;
while (i1 < rpn_.size()) {
if (rpn_[i1] < OP_UNION) {
rpn_[i0] = rpn_[i1];
++i0;
}
++i1;
}
rpn_ = std::vector<int32_t>(stack.rbegin(), stack.rend());
rpn_.shrink_to_fit();
rpn_.resize(i0);
}
rpn_.shrink_to_fit();
// Read the translation vector.
if (check_for_node(cell_node, "translation")) {