Merge remote-tracking branch 'upstream/develop' into oo_filters

This commit is contained in:
Sterling Harper 2016-08-02 08:20:03 -05:00
commit dce068d777
2 changed files with 10 additions and 4 deletions

View file

@ -475,6 +475,12 @@ contains
score = micro_xs(i_nuclide) % fission * nuclides(i_nuclide) % &
nu(E, EMISSION_PROMPT) * atom_density * flux
else
! make sure the correct energy is used
if (t % estimator == ESTIMATOR_TRACKLENGTH) then
E = p % E
else
E = p % last_E
end if
score = ZERO

View file

@ -126,7 +126,7 @@
3 2 2 1 1 total 3.799163e-07 1.806470e-07
mesh 1 group in nuclide mean std. dev.
x y z
0 1 1 1 1 total 0.025735 0.002840
1 1 2 1 1 total 0.028773 0.006349
2 2 1 1 1 total 0.022306 0.004010
3 2 2 1 1 total 0.024549 0.009379
0 1 1 1 1 total 0.025920 0.002893
1 1 2 1 1 total 0.028922 0.006394
2 2 1 1 1 total 0.022467 0.004039
3 2 2 1 1 total 0.024923 0.009632