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

@ -3,8 +3,8 @@
<!-- Define how many particles to run and for how many batches -->
<run_mode>eigenvalue</run_mode>
<batches>10</batches>
<inactive>5</inactive>
<batches>100</batches>
<inactive>10</inactive>
<particles>1000</particles>
<!-- The starting source is a uniform distribution over the entire pin

View file

@ -184,7 +184,7 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx,
site->parent_id = p->id_;
// Sample delayed group and angle/energy for fission reaction
sample_fission_neutron(i_nuclide, rx, p->E_, &site, p->current_seed());
sample_fission_neutron(i_nuclide, rx, p->E_, site, p->current_seed());
// Set the delayed group on the particle as well
p->delayed_group_ = site->delayed_group;

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? -------------------