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

Added return for a parenthesis depth of 0

Browse source
This commit is contained in:
myerspat 2022-08-17 08:19:22 -04:00
parent 82bbf71413
commit 630117aab5
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cell.cpp
View file

@ -869,6 +869,7 @@ bool CSGCell::contains_complex(
Position r, Direction u, int32_t on_surface) const
{
bool in_cell = true;
int total_depth = 0;
// For each token
for (auto it = region_infix_.begin(); it != region_infix_.end(); it++) {
@ -889,6 +890,13 @@ bool CSGCell::contains_complex(
}
} else if ((token == OP_UNION && in_cell == true) ||
(token == OP_INTERSECTION && in_cell == false)) {
// If the total depth is zero return
if (total_depth == 0) {
return in_cell;
}
total_depth--;
// While the iterator is within the bounds of the vector
int depth = 1;
do {
@ -905,7 +913,11 @@ bool CSGCell::contains_complex(
depth++;
}
}
} while (depth > 0 && it < region_infix_.end() - 1);
} while (depth > 0);
} else if (token == OP_LEFT_PAREN) {
total_depth++;
} else if (token == OP_RIGHT_PAREN) {
total_depth--;
}
}
return in_cell;