OK. Changed the way the tally labels are displayed. Regardless of whether or not there is a label, the phrase "Tally i" will be displayed. If a label is given, then it will say "Tally i: label". This is cleaner and more consistent. my next step is to update the manual.

This commit is contained in:
Adam Nelson 2012-07-15 19:16:37 -04:00
parent 8afbc65217
commit 05fcfd2183
3 changed files with 6 additions and 4 deletions

View file

@ -1869,9 +1869,11 @@ contains
! Write header block
if (t % label == "") then
call header("TALLY " // trim(to_str(t % id)), unit=UNIT_TALLY, level=3)
call header("TALLY " // trim(to_str(t % id)), unit=UNIT_TALLY, &
level=3)
else
call header("TALLY " // trim(t % label), unit=UNIT_TALLY, level=3)
call header("TALLY " // trim(to_str(t % id)) // ": " &
// trim(t % label), unit=UNIT_TALLY, level=3)
endif
! Handle surface current tallies separately

View file

@ -60,7 +60,7 @@ module tally_header
! Basic data
integer :: id ! user-defined identifier
character(len=55) :: label ! user-defined label
character(len=52) :: label ! user-defined label
integer :: type ! volume, surface current
integer :: estimator ! collision, track-length
real(8) :: volume ! volume of region

View file

@ -24,7 +24,7 @@
<typedef name="tally_xml">
<component name="id" type="integer" />
<component name="label" type="word" length="55" default="''" />
<component name="label" type="word" length="52" default="''" />
<component name="filters" type="filter_xml" />
<component name="scores" type="word" length="250" default="''" />
<component name="reactions" type="word" length="250" default="''" />