crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-29 06:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed bug in incoming energy filter for track-length tallies.

Browse source
This commit is contained in:
Paul Romano 2012-03-26 14:46:51 -04:00
parent a718407074
commit b2c40ee3c0
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tally.F90
View file

@ -727,14 +727,14 @@ contains
! determine incoming energy bin ! determine incoming energy bin
k = t % n_filter_bins(FILTER_ENERGYIN) k = t % n_filter_bins(FILTER_ENERGYIN)
! check if energy of the particle is within energy bins ! check if energy of the particle is within energy bins
if (p % last_E < t % energy_in(1) .or. & if (p % E < t % energy_in(1) .or. &
p % last_E > t % energy_in(k + 1)) then p % E > t % energy_in(k + 1)) then
found_bin = .false. found_bin = .false.
return return
end if end if
! search to find incoming energy bin ! search to find incoming energy bin
bins(FILTER_ENERGYIN) = binary_search(t % energy_in, k + 1, p % last_E) bins(FILTER_ENERGYIN) = binary_search(t % energy_in, k + 1, p % E)
end select end select
end do FILTER_LOOP end do FILTER_LOOP
@ -857,6 +857,7 @@ contains
integer :: i ! loop index for filters integer :: i ! loop index for filters
integer :: n ! number of bins for single filter integer :: n ! number of bins for single filter
integer :: mesh_bin ! index for mesh bin integer :: mesh_bin ! index for mesh bin
real(8) :: E ! particle energy
type(TallyObject), pointer :: t => null() type(TallyObject), pointer :: t => null()
type(StructuredMesh), pointer :: m => null() type(StructuredMesh), pointer :: m => null()
@ -928,15 +929,22 @@ contains
case (FILTER_ENERGYIN) case (FILTER_ENERGYIN)
! determine incoming energy bin ! determine incoming energy bin
n = t % n_filter_bins(FILTER_ENERGYIN) n = t % n_filter_bins(FILTER_ENERGYIN)
! make sure the correct energy is used
if (t % estimator == ESTIMATOR_TRACKLENGTH) then
E = p % E
else
E = p % last_E
end if
! check if energy of the particle is within energy bins ! check if energy of the particle is within energy bins
if (p % last_E < t % energy_in(1) .or. & if (E < t % energy_in(1) .or. E > t % energy_in(n + 1)) then
p % last_E > t % energy_in(n + 1)) then
found_bin = .false. found_bin = .false.
return return
end if end if
! search to find incoming energy bin ! search to find incoming energy bin
bins(FILTER_ENERGYIN) = binary_search(t % energy_in, n + 1, p % last_E) bins(FILTER_ENERGYIN) = binary_search(t % energy_in, n + 1, E)
case (FILTER_ENERGYOUT) case (FILTER_ENERGYOUT)
! determine outgoing energy bin ! determine outgoing energy bin