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

Incorporate @smharper suggestion for checking first inactive/active batch

Browse source
This commit is contained in:
Paul Romano 2018-10-28 09:43:32 -05:00
parent 6845bf14cd
commit cbd85a62d3
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/simulation.cpp
View file

@ -292,18 +292,23 @@ void initialize_batch()
// Reset total starting particle weight used for normalizing tallies
total_weight = 0.0;
if ((settings::n_inactive > 0 && simulation::current_batch == 1) ||
(settings::restart_run && simulation::restart_batch < settings::n_inactive &&
simulation::current_batch == simulation::restart_batch + 1)) {
// Turn on inactive timer
// Determine if this batch is the first inactive or active batch.
bool first_inactive = false;
bool first_active = false;
if (!settings::restart_run) {
first_inactive = settings::n_inactive > 0 && simulation::current_batch == 1;
first_active = simulation::current_batch == settings::n_inactive + 1;
} else if (simulation::current_batch == simulation::restart_batch + 1){
first_inactive = simulation::restart_batch < settings::n_inactive;
first_active = !first_inactive;
}
// Manage active/inactive timers and activate tallies if necessary.
if (first_inactive) {
time_inactive.start();
} else if ((simulation::current_batch == settings::n_inactive + 1) ||
(settings::restart_run && simulation::restart_batch > settings::n_inactive &&
simulation::current_batch == simulation::restart_batch + 1)) {
// Switch from inactive batch timer to active batch timer
} else if (first_active) {
time_inactive.stop();
time_active.start();
for (int i = 1; i <= n_tallies; ++i) {
// TODO: change one-based index
openmc_tally_set_active(i, true);