diff --git a/src/output.F90 b/src/output.F90 index 037bc41c21..530cd42fb3 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -1579,30 +1579,30 @@ contains end if write(UNIT=UNIT_TALLY, FMT='(1X,2A,1X,A,"+/- ",A)') & repeat(" ", indent), score_name, & - to_str(t % scores(score_index,filter_index) % sum), & - trim(to_str(t % scores(score_index,filter_index) % sum_sq)) + to_str(t % results(score_index,filter_index) % sum), & + trim(to_str(t % results(score_index,filter_index) % sum_sq)) else if (t % score_bins(k) == SCORE_SCATTER_PN) then score_name = "Scattering Rate" write(UNIT=UNIT_TALLY, FMT='(1X,2A,1X,A,"+/- ",A)') & repeat(" ", indent), score_name, & - to_str(t % scores(score_index,filter_index) % sum), & - trim(to_str(t % scores(score_index,filter_index) % sum_sq)) + to_str(t % results(score_index,filter_index) % sum), & + trim(to_str(t % results(score_index,filter_index) % sum_sq)) do n_order = 1, t % scatt_order(k) score_index = score_index + 1 score_name = 'P' // trim(to_str(n_order)) // & ' Scattering Moment' write(UNIT=UNIT_TALLY, FMT='(1X,2A,1X,A,"+/- ",A)') & repeat(" ", indent), score_name, & - to_str(t % scores(score_index,filter_index) % sum), & - trim(to_str(t % scores(score_index,filter_index) % sum_sq)) + to_str(t % results(score_index,filter_index) % sum), & + trim(to_str(t % results(score_index,filter_index) % sum_sq)) end do k = k + n_order - 1 else score_name = score_names(abs(t % score_bins(k))) write(UNIT=UNIT_TALLY, FMT='(1X,2A,1X,A,"+/- ",A)') & repeat(" ", indent), score_name, & - to_str(t % scores(score_index,filter_index) % sum), & - trim(to_str(t % scores(score_index,filter_index) % sum_sq)) + to_str(t % results(score_index,filter_index) % sum), & + trim(to_str(t % results(score_index,filter_index) % sum_sq)) end if end do indent = indent - 2 diff --git a/src/tally.F90 b/src/tally.F90 index 6a982df025..2f81d8cfee 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -193,8 +193,12 @@ contains score_index = score_index + 1 ! get the score and tally it score = last_wgt * calc_pn(n, mu) - if (n < t % scatt_order(j)) & - call add_to_score(t % scores(score_index, filter_index), score) + ! Do not do if its the last time through, the scores += at + ! the end of this select case will handle that one. + if (n < t % scatt_order(j)) then + t % results(score_index, filter_index) % value = & + t % results(score_index, filter_index) + score + end if end do j = j + t % scatt_order(j) @@ -323,7 +327,8 @@ contains end select ! Add score to tally - call add_to_score(t % scores(score_index, filter_index), score) + t % results(score_index, filter_index) % value = & + t % results(score_index, filter_index) + score end do SCORE_LOOP