From c8755273a0825288830e96794720d57c74b93a40 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Tue, 17 Dec 2019 17:13:10 +0000 Subject: [PATCH] added in particle track outputting --- src/physics.cpp | 6 +++--- src/simulation.cpp | 9 +++++++++ tests/regression_tests/photon_production/test.py | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/physics.cpp b/src/physics.cpp index 132c45bc91..ac73f9c85c 100644 --- a/src/physics.cpp +++ b/src/physics.cpp @@ -211,9 +211,9 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx, // Write fission particles to nuBank if(use_fission_bank) { - p->nu_bank_[i].wgt = site->wgt; - p->nu_bank_[i].E = site->E; - p->nu_bank_[i].delayed_group = site->delayed_group; + p->nu_bank_[nu-1-i].wgt = site->wgt; + p->nu_bank_[nu-1-i].E = site->E; + p->nu_bank_[nu-1-i].delayed_group = site->delayed_group; } } diff --git a/src/simulation.cpp b/src/simulation.cpp index 00d9d391d4..2135fa9242 100644 --- a/src/simulation.cpp +++ b/src/simulation.cpp @@ -759,6 +759,15 @@ void transport() } } + // Finish particle track output. + for (int i = 0; i < n_particles; i++) { + Particle& p = particles[i]; + if (p.write_track_) { + write_particle_track(p); + finalize_particle_track(p); + } + } + remaining_work -= n_particles; source_offset += n_particles; diff --git a/tests/regression_tests/photon_production/test.py b/tests/regression_tests/photon_production/test.py index 1f645ebb94..72fdafb41f 100644 --- a/tests/regression_tests/photon_production/test.py +++ b/tests/regression_tests/photon_production/test.py @@ -75,6 +75,10 @@ class SourceTestHarness(PyAPITestHarness): outstr = '' for i, tally_ind in enumerate(sp.tallies): tally = sp.tallies[tally_ind] + print(tally) + print(tally.num_bins) + print(tally.shape) + print(tally.sum) results = np.zeros((tally.sum.size * 2, )) results[0::2] = tally.sum.ravel() results[1::2] = tally.sum_sq.ravel()