From 06a99dde5e5a04413c3d53eca171bdf840492ebc Mon Sep 17 00:00:00 2001 From: guillaume Date: Thu, 6 Jul 2017 19:59:58 -0400 Subject: [PATCH] Changed score name from partial current to total current because of surface_filter behavior --- docs/source/io_formats/tallies.rst | 2 +- docs/source/usersguide/tallies.rst | 2 +- src/constants.F90 | 2 +- src/input_xml.F90 | 2 +- src/tally.F90 | 2 +- src/tally_filter.F90 | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/source/io_formats/tallies.rst b/docs/source/io_formats/tallies.rst index 93c58c3489..b0de8b6e6f 100644 --- a/docs/source/io_formats/tallies.rst +++ b/docs/source/io_formats/tallies.rst @@ -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. diff --git a/docs/source/usersguide/tallies.rst b/docs/source/usersguide/tallies.rst index 521735a833..f928263842 100644 --- a/docs/source/usersguide/tallies.rst +++ b/docs/source/usersguide/tallies.rst @@ -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. | diff --git a/src/constants.F90 b/src/constants.F90 index 5684e8c3b9..b2c34be04a 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -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) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index af759fd4e2..8b8367ca78 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -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') diff --git a/src/tally.F90 b/src/tally.F90 index a5c42e6ace..2c0f7de067 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -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) diff --git a/src/tally_filter.F90 b/src/tally_filter.F90 index 62f5afe0e5..6dc3310018 100644 --- a/src/tally_filter.F90 +++ b/src/tally_filter.F90 @@ -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(:)