Trying again to add tally label support. turns out i needed it in input_xml.F90, which is now taken care of. the next step is to write it out in the tallies.out file.

This commit is contained in:
Adam Nelson 2012-07-14 14:15:40 -04:00
parent e1b1dec119
commit 2d7e3e7f7e
5 changed files with 11 additions and 6 deletions

View file

@ -28,7 +28,7 @@ contains
! Calculate statistics for tallies and write to tallies.out
call tally_statistics()
if (master) call write_tallies()
! Write out binary source
if (write_source) call write_source_binary()
end if

View file

@ -1033,6 +1033,9 @@ contains
! Copy material id
t % id = tally_(i) % id
! Copy tally labe
t % label = tally_(i) % label
! =======================================================================
! READ DATA FOR FILTERS

View file

@ -1869,7 +1869,7 @@ contains
! Write header block
call header("TALLY " // trim(to_str(t % id)), unit=UNIT_TALLY, level=3)
write(*,*) t % label
! Handle surface current tallies separately
if (t % type == TALLY_SURFACE_CURRENT) then
call write_surface_current(t)

View file

@ -59,10 +59,11 @@ module tally_header
type TallyObject
! Basic data
integer :: id ! user-defined identifier
integer :: type ! volume, surface current
integer :: estimator ! collision, track-length
real(8) :: volume ! volume of region
integer :: id ! user-defined identifier
character(len=10) :: label ! user-defined label
integer :: type ! volume, surface current
integer :: estimator ! collision, track-length
real(8) :: volume ! volume of region
! Information about what filters should be used

View file

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