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

Convert remainder of tallies to C++

Browse source
This commit is contained in:
Paul Romano 2019-02-21 08:32:32 -06:00
parent 487b62f760
commit 0439eb0fa1
54 changed files with 410 additions and 1420 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/simulation.cpp
View file

@ -163,8 +163,8 @@ int openmc_simulation_finalize()
}
// Deactivate all tallies
for (int i = 1; i <= n_tallies; ++i) {
openmc_tally_set_active(i, false);
for (auto& t : model::tallies) {
t->active_ = false;
}
// Stop timers and show timing statistics
@ -342,9 +342,8 @@ void initialize_batch()
} else if (first_active) {
simulation::time_inactive.stop();
simulation::time_active.start();
for (int i = 1; i <= n_tallies; ++i) {
// TODO: change one-based index
openmc_tally_set_active(i, true);
for (auto& t : model::tallies) {
t->active_ = true;
}
}
@ -544,11 +543,11 @@ void calculate_work()
#ifdef OPENMC_MPI
void broadcast_results() {
// Broadcast tally results so that each process has access to results
for (int i = 0; i < n_tallies; ++i) {
for (auto& t : model::tallies) {
// Create a new datatype that consists of all values for a given filter
// bin and then use that to broadcast. This is done to minimize the
// chance of the 'count' argument of MPI_BCAST exceeding 2**31
auto& results = model::tallies[i]->results_;
auto& results = t->results_;
auto shape = results.shape();
int count_per_filter = shape[1] * shape[2];
@ -575,6 +574,12 @@ void broadcast_results() {
#endif
void free_memory_simulation()
{
simulation::k_generation.clear();
simulation::entropy.clear();
}
//==============================================================================
// Fortran compatibility
//==============================================================================