Merge pull request #774 from nelsonag/tally_mgxs_fixes

Minor code cleanup in the score_general_mg routine
This commit is contained in:
Paul Romano 2016-12-22 07:07:18 -06:00 committed by GitHub
commit 533ef970f7

View file

@ -1262,7 +1262,6 @@ contains
class(Mgxs), pointer :: nucxs
! Set the direction and group to use with get_xs
! this only depends on if we
if (t % estimator == ESTIMATOR_ANALOG .or. &
t % estimator == ESTIMATOR_COLLISION) then
@ -1518,13 +1517,6 @@ contains
case (SCORE_FISSION)
! make sure the correct energy is used
if (t % estimator == ESTIMATOR_TRACKLENGTH) then
p_g = p % g
else
p_g = p % last_g
end if
if (t % estimator == ESTIMATOR_ANALOG) then
if (survival_biasing) then
! No fission events occur if survival biasing is on -- need to
@ -1560,13 +1552,6 @@ contains
case (SCORE_NU_FISSION)
! make sure the correct energy is used
if (t % estimator == ESTIMATOR_TRACKLENGTH) then
p_g = p % g
else
p_g = p % last_g
end if
if (t % estimator == ESTIMATOR_ANALOG) then
if (survival_biasing .or. p % fission) then
if (t % find_filter(FILTER_ENERGYOUT) > 0) then
@ -1621,13 +1606,6 @@ contains
case (SCORE_PROMPT_NU_FISSION)
! make sure the correct energy is used
if (t % estimator == ESTIMATOR_TRACKLENGTH) then
p_g = p % g
else
p_g = p % last_g
end if
if (t % estimator == ESTIMATOR_ANALOG) then
if (survival_biasing .or. p % fission) then
if (t % find_filter(FILTER_ENERGYOUT) > 0) then
@ -1683,13 +1661,6 @@ contains
case (SCORE_DELAYED_NU_FISSION)
! make sure the correct energy is used
if (t % estimator == ESTIMATOR_TRACKLENGTH) then
p_g = p % g
else
p_g = p % last_g
end if
! Set the delayedgroup filter index and the number of delayed group bins
dg_filter = t % find_filter(FILTER_DELAYEDGROUP)
@ -1830,13 +1801,6 @@ contains
case (SCORE_DECAY_RATE)
! make sure the correct energy is used
if (t % estimator == ESTIMATOR_TRACKLENGTH) then
p_g = p % g
else
p_g = p % last_g
end if
! Set the delayedgroup filter index and the number of delayed group bins
dg_filter = t % find_filter(FILTER_DELAYEDGROUP)
@ -2019,13 +1983,6 @@ contains
case (SCORE_KAPPA_FISSION)
! make sure the correct energy is used
if (t % estimator == ESTIMATOR_TRACKLENGTH) then
p_g = p % g
else
p_g = p % last_g
end if
if (t % estimator == ESTIMATOR_ANALOG) then
if (survival_biasing) then
! No fission events occur if survival biasing is on -- need to