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

Fix indexing bug in SphericalMesh and CylindricalMesh

Browse source
This commit is contained in:
Paul Romano 2022-07-08 08:09:16 -05:00
parent ff15c98b67
commit 620aaec5ee
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/mesh.cpp
View file

@ -379,7 +379,7 @@ void StructuredMesh::raytrace_mesh(
// TODO: when c++-17 is available, use "if constexpr ()" to compile-time
// enable/disable tally calls for now, T template type needs to provide both
// surface and track methods, which might be empty. modern optimizing
// compilers will (hopefully) eleminate the complete code (including
// compilers will (hopefully) eliminate the complete code (including
// calculation of parameters) but for the future: be explicit
// Compute the length of the entire track.
@ -957,7 +957,7 @@ double CylindricalMesh::find_r_crossing(
const Position& r, const Direction& u, double l, int shell) const
{
if ((shell < 0) || (shell >= shape_[0]))
if ((shell < 0) || (shell > shape_[0]))
return INFTY;
// solve r.x^2 + r.y^2 == r0^2
@ -1190,7 +1190,7 @@ StructuredMesh::MeshIndex SphericalMesh::get_indices(
double SphericalMesh::find_r_crossing(
const Position& r, const Direction& u, double l, int shell) const
{
if ((shell < 0) || (shell >= shape_[0]))
if ((shell < 0) || (shell > shape_[0]))
return INFTY;
// solve |r+s*u| = r0
@ -1312,20 +1312,17 @@ StructuredMesh::MeshDistance SphericalMesh::distance_to_grid_boundary(
{
if (i == 0) {
return std::min(
MeshDistance(ijk[i] + 1, true, find_r_crossing(r0, u, l, ijk[i])),
MeshDistance(ijk[i] - 1, false, find_r_crossing(r0, u, l, ijk[i] - 1)));
} else if (i == 1) {
return std::min(MeshDistance(sanitize_theta(ijk[i] + 1), true,
find_theta_crossing(r0, u, l, ijk[i])),
MeshDistance(sanitize_theta(ijk[i] - 1), false,
find_theta_crossing(r0, u, l, ijk[i] - 1)));
} else {
return std::min(MeshDistance(sanitize_phi(ijk[i] + 1), true,
find_phi_crossing(r0, u, l, ijk[i])),
MeshDistance(sanitize_phi(ijk[i] - 1), false,
@ -2567,8 +2564,9 @@ void read_meshes(pugi::xml_node root)
// Check to make sure multiple meshes in the same file don't share IDs
int id = std::stoi(get_node_value(node, "id"));
if (contains(mesh_ids, id)) {
fatal_error(
fmt::format("Two or more meshes use the same unique ID '{}' in the same input file", id));
fatal_error(fmt::format(
"Two or more meshes use the same unique ID '{}' in the same input file",
id));
}
mesh_ids.insert(id);

2
tests/regression_tests/filter_mesh/results_true.dat
View file

@ -1 +1 @@
6e02d01fc115c54e4c60477a9f963149bc83c82e6a7bdb2d29125b131546150c59de5ac3aae5b9469b89b343ecf2574f6c949b918ccb43231e8666ee2b7c1b7c
70243ebdb882e4367bf821667a9f4d41dea03eaf8b27d734e014a13e14922b5158cd47b0a7edf3733d4e23ca6a5ab06457220c9138b7e9720acf547f2eaa06e2