resolved some conflicts when rebasing with develop

This commit is contained in:
John Tramm 2019-12-11 16:15:33 +00:00
parent 796844fd0b
commit 20161c4581
3 changed files with 4 additions and 4 deletions

View file

@ -357,7 +357,7 @@ void process_advance_particle_events()
} else if (p->macro_xs_.total == 0.0) {
d_collision = INFINITY;
} else {
d_collision = -std::log(prn(p->prn_seeds_ + p->stream_)) / p->macro_xs_.total;
d_collision = -std::log(prn(p->current_seed())) / p->macro_xs_.total;
}
// -------------- break here? -------------------