diff --git a/include/openmc/bank.h b/include/openmc/bank.h index 60d664638..da61b5117 100644 --- a/include/openmc/bank.h +++ b/include/openmc/bank.h @@ -7,11 +7,6 @@ #include "openmc/particle.h" #include "openmc/position.h" -// Without an explicit instantiation of vector, the Intel compiler -// will complain about the threadprivate directive on filter_matches. Note that -// this has to happen *outside* of the openmc namespace -extern template class std::vector; - namespace openmc { diff --git a/include/openmc/tallies/derivative.h b/include/openmc/tallies/derivative.h index 65650356d..a0db07da2 100644 --- a/include/openmc/tallies/derivative.h +++ b/include/openmc/tallies/derivative.h @@ -62,10 +62,6 @@ void zero_flux_derivs(std::vector v); // Global variables //============================================================================== -// Explicit vector template specialization declaration of threadprivate variable -// outside of the openmc namespace for the picky Intel compiler. -extern template class std::vector; - namespace openmc { namespace model { diff --git a/include/openmc/tallies/tally.h b/include/openmc/tallies/tally.h index 5706b8ccb..83cc21052 100644 --- a/include/openmc/tallies/tally.h +++ b/include/openmc/tallies/tally.h @@ -158,11 +158,6 @@ namespace simulation { extern "C" int32_t n_realizations; } -// It is possible to protect accumulate operations on global tallies by using an -// atomic update. However, when multiple threads accumulate to the same global -// tally, it can cause a higher cache miss rate due to invalidation. Thus, we -// use threadprivate variables to accumulate global tallies and then reduce at -// the end of a generation. extern double global_tally_absorption; extern double global_tally_collision; extern double global_tally_tracklength; diff --git a/src/simulation.cpp b/src/simulation.cpp index 66ec9ed5f..85b2bf6be 100644 --- a/src/simulation.cpp +++ b/src/simulation.cpp @@ -417,7 +417,7 @@ void finalize_generation() { auto& gt = simulation::global_tallies; - // Update global tallies with the omp private accumulation variables + // Update global tallies with the accumulation variables if (settings::run_mode == RUN_MODE_EIGENVALUE) { gt(K_COLLISION, RESULT_VALUE) += global_tally_collision; gt(K_ABSORPTION, RESULT_VALUE) += global_tally_absorption;