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

Merge pull request #1830 from gridley/fix_1827

Browse source 
make sure failed neighbor list searches trigger exhaustive searches
This commit is contained in:
John Tramm 2021-04-30 10:10:58 -05:00 • committed by GitHub
commit c8944a8b4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/geometry.cpp
View file

@ -91,11 +91,26 @@ find_cell_inner(Particle& p, const NeighborList* neighbor_list)
break;
}
}
// If we're attempting a neighbor list search and fail, we
// now know we should return false. This will trigger an
// exhaustive search from neighbor_list_find_cell and make
// the result from that be appended to the neighbor list.
if (!found) {
return found;
}
}
// Check successively lower coordinate levels until finding material fill
for (;;++p.n_coord_) {
// If neighbor lists did not find a cell, must do exhaustive search
// If we did not attempt to use neighbor lists, i_cell is still C_NONE. In
// that case, we should now do an exhaustive search to find the right value
// of i_cell.
//
// Alternatively, neighbor list searches could have succeeded, but we found
// that the fill of the neighbor cell was another universe. As such, in the
// code below this conditional, we set i_cell back to C_NONE to indicate
// that.
if (i_cell == C_NONE) {
int i_universe = p.coord_[p.n_coord_-1].universe;
const auto& univ {*model::universes[i_universe]};
@ -238,6 +253,7 @@ find_cell_inner(Particle& p, const NeighborList* neighbor_list)
}
}
i_cell = C_NONE; // trip non-neighbor cell search at next iteration
found = false;
}
return found;