Looks like the tally label is working great. Willing to merge back to master after i give it some time to make sure this is feature complete.

This commit is contained in:
Adam Nelson 2012-07-14 14:31:30 -04:00
parent 2d7e3e7f7e
commit 8afbc65217
3 changed files with 8 additions and 4 deletions

View file

@ -1868,8 +1868,12 @@ contains
t => tallies(i)
! Write header block
call header("TALLY " // trim(to_str(t % id)), unit=UNIT_TALLY, level=3)
write(*,*) t % label
if (t % label == "") then
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)
endif
! Handle surface current tallies separately
if (t % type == TALLY_SURFACE_CURRENT) then
call write_surface_current(t)

View file

@ -60,7 +60,7 @@ module tally_header
! Basic data
integer :: id ! user-defined identifier
character(len=10) :: label ! user-defined label
character(len=55) :: 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="10" default="''" />
<component name="label" type="word" length="55" default="''" />
<component name="filters" type="filter_xml" />
<component name="scores" type="word" length="250" default="''" />
<component name="reactions" type="word" length="250" default="''" />