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

Back to a vector of point locators.

Browse source
This commit is contained in:
Patrick Shriwise 2020-12-10 03:30:19 -06:00
parent a4add365dd
commit 324d349459
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/openmc/mesh.h
View file

@ -536,8 +536,7 @@ private:
// Data members
std::unique_ptr<libMesh::Mesh> m_; //!< pointer to the libMesh mesh instance
static std::unique_ptr<libMesh::PointLocatorBase> PL_; //!< per-thread point locators
#pragma omp threadprivate(PL_) // each thread has its own point locator
std::vector<std::unique_ptr<libMesh::PointLocatorBase>> PL_; //!< per-thread point locators
std::unique_ptr<libMesh::EquationSystems> equation_systems_; //!< pointer to the equation systems of the mesh
std::string eq_system_name_; //!< name of the equation system holding OpenMC results
std::map<std::string, unsigned int> variable_map_; //!< mapping of variable names (tally scores) to libMesh variable numbers

32
src/mesh.cpp
View file

@ -2108,8 +2108,6 @@ MOABMesh::write(std::string base_filename) const
#ifdef LIBMESH
std::unique_ptr<libMesh::PointLocatorBase> LibMesh::PL_ = nullptr;
LibMesh::LibMesh(pugi::xml_node node) : UnstructuredMesh(node)
{
initialize();
@ -2143,15 +2141,17 @@ void LibMesh::initialize()
libMesh::ExplicitSystem& eq_sys =
equation_systems_->add_system<libMesh::ExplicitSystem>(eq_system_name_);
// one point locator created per thread
#pragma omp parallel
{
#pragma omp critical
{
PL_ = m_->sub_point_locator();
}
PL_->set_contains_point_tol(FP_COINCIDENT);
PL_->enable_out_of_mesh_mode();
#ifdef _OPENMP
int n_threads = omp_get_max_threads();
#else
int n_threads = 1;
#endif
for (int i = 0; i < n_threads; i++) {
PL_.emplace_back(m_->sub_point_locator());
PL_.back()->set_contains_point_tol(FP_COINCIDENT);
PL_.back()->enable_out_of_mesh_mode();
}
// store first element in the mesh to use as an offset for bin indices
@ -2280,7 +2280,15 @@ LibMesh::get_bin(Position r) const
// quick rejection check
if (!bbox_.contains_point(p)) { return -1; }
auto e = (*LibMesh::PL_)(p);
#ifdef _OPENMP
int thread_num = omp_get_thread_num();
#else
int thread_num = 0;
#endif
const auto& point_locator = PL_.at(thread_num);
auto e = (*point_locator)(p);
if (!e) {
return -1;
} else {