Changed score name from partial current to total current because of surface_filter behavior

This commit is contained in:
guillaume 2017-07-06 19:59:58 -04:00
parent f7a85dda54
commit 06a99dde5e
6 changed files with 6 additions and 7 deletions

View file

@ -159,7 +159,7 @@ should be set to:
:surface:
This filter allows the tally to be scored when crossing a surface. A list of
surface IDs should be given.It does not specify in which direction the
surface IDs should be given. It does not specify in which direction the
surface is crossed, and a cellfrom or a cell filter may be used to tally
partial currents.

View file

@ -268,7 +268,7 @@ The following tables show all valid scores:
| |may not be used in conjunction with any other |
| |score. Only energy and mesh filters may be used. |
+----------------------+---------------------------------------------------+
|partial_current |Partial currents on any surface previously defined |
|total-current |Total currents on any surface previously defined |
| |in the geometry. Units are particles per source |
| |particle. Note that this score cannot be used with |
| |a current score or a mesh filter. |

View file

@ -319,7 +319,7 @@ module constants
SCORE_FISSION = -10, & ! fission rate
SCORE_NU_FISSION = -11, & ! neutron production rate
SCORE_KAPPA_FISSION = -12, & ! fission energy production rate
SCORE_CURRENT = -13, & ! partial current
SCORE_CURRENT = -13, & ! current
SCORE_FLUX_YN = -14, & ! angular moment of flux
SCORE_TOTAL_YN = -15, & ! angular moment of total reaction rate
SCORE_SCATTER_YN = -16, & ! angular flux-weighted scattering moment (0:N)

View file

@ -3899,7 +3899,7 @@ contains
t % find_filter(FILTER_SURFACE) = n_filter
t % filter(n_filter) = i_filt
case ('partial_current')
case ('total-current')
t % type = TALLY_SURFACE
t % score_bins(j) = SCORE_CURRENT
case ('events')

View file

@ -3139,7 +3139,7 @@ contains
!===============================================================================
! score_surface_tally is called at every surface crossing and can be used to
! tally partial currents between two cells
! tally total or partial currents between two cells
!===============================================================================
subroutine score_surface_tally(p)

View file

@ -109,8 +109,7 @@ module tally_filter
end type CellbornFilter
!===============================================================================
! SURFACEFILTER is currently not implemented for usual geometric surfaces, but
! it is used as a placeholder for mesh surfaces used in current tallies.
! SURFACEFILTER specifies which surface particles are crossing
!===============================================================================
type, extends(TallyFilter) :: SurfaceFilter
integer, allocatable :: surfaces(:)