few more changes to make the develop merge work

This commit is contained in:
Gavin Ridley 2020-01-21 14:52:35 -05:00
parent 40885be7aa
commit b9bf4fc65b
5 changed files with 17 additions and 16 deletions

View file

@ -380,11 +380,11 @@ void finalize_generation()
// Update global tallies with the accumulation variables
if (settings::run_mode == RunMode::EIGENVALUE) {
gt(K_COLLISION, RESULT_VALUE) += global_tally_collision;
gt(K_ABSORPTION, RESULT_VALUE) += global_tally_absorption;
gt(K_TRACKLENGTH, RESULT_VALUE) += global_tally_tracklength;
gt(GlobalTally::K_COLLISION, TallyResult::VALUE) += global_tally_collision;
gt(GlobalTally::K_ABSORPTION, TallyResult::VALUE) += global_tally_absorption;
gt(GlobalTally::K_TRACKLENGTH, TallyResult::VALUE) += global_tally_tracklength;
}
gt(LEAKAGE, RESULT_VALUE) += global_tally_leakage;
gt(GlobalTally::LEAKAGE, TallyResult::VALUE) += global_tally_leakage;
// reset tallies
if (settings::run_mode == RunMode::EIGENVALUE) {