made surface tally default to net current, and changed tally_surface_current to tally_mesh_current

This commit is contained in:
guillaume 2017-07-13 23:09:27 -04:00
parent f445f3db6d
commit 53875b7034
4 changed files with 6 additions and 6 deletions

View file

@ -288,8 +288,8 @@ module constants
! Tally type
integer, parameter :: &
TALLY_VOLUME = 1, &
TALLY_SURFACE_CURRENT = 2, &
TALLY_SURFACE = 3
TALLY_MESH_CURRENT = 2, &
TALLY_SURFACE = 3
! Tally estimator types
integer, parameter :: &

View file

@ -3810,7 +3810,7 @@ contains
t % score_bins(j) = SCORE_FISS_Q_RECOV
case ('current')
t % score_bins(j) = SCORE_CURRENT
t % type = TALLY_SURFACE_CURRENT
t % type = TALLY_MESH_CURRENT
! Check to make sure that current is the only desired response
! for this tally

View file

@ -4565,7 +4565,7 @@ contains
elseif (user_tallies(i) % estimator == ESTIMATOR_COLLISION) then
call active_collision_tallies % push_back(i_user_tallies + i)
end if
elseif (user_tallies(i) % type == TALLY_SURFACE_CURRENT) then
elseif (user_tallies(i) % type == TALLY_MESH_CURRENT) then
call active_current_tallies % push_back(i_user_tallies + i)
elseif (user_tallies(i) % type == TALLY_SURFACE) then
call active_surface_tallies % push_back(i_user_tallies + i)
@ -4618,7 +4618,7 @@ contains
elseif (cmfd_tallies(i) % estimator == ESTIMATOR_TRACKLENGTH) then
call active_tracklength_tallies % push_back(i_cmfd_tallies + i)
end if
elseif (cmfd_tallies(i) % type == TALLY_SURFACE_CURRENT) then
elseif (cmfd_tallies(i) % type == TALLY_MESH_CURRENT) then
call active_current_tallies % push_back(i_cmfd_tallies + i)
end if
end do

View file

@ -963,7 +963,7 @@ contains
do i = 1, this % n_bins
if (abs(p % surface) == this % surfaces(i)) then
next_bin = i
weight = ONE
weight = sign(ONE, p % surface)
exit
end if
end do