crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 13:45:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating my changes to match what was done on the main branch so that the git merge goes successfully.

Browse source
This commit is contained in:
Adam Nelson 2012-12-05 09:48:21 -05:00
parent 8164b888e1
commit 4b690dfc64
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/output.F90
View file

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

11
src/tally.F90
View file

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