From 8afbc6521730cbcf0b8372ef0c3ebe7dbe5827ee Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 14 Jul 2012 14:31:30 -0400 Subject: [PATCH] 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. --- src/tally.F90 | 8 ++++++-- src/tally_header.F90 | 2 +- src/xml-fortran/templates/tallies_t.xml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/tally.F90 b/src/tally.F90 index f2c40e131a..a7a743a004 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -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) diff --git a/src/tally_header.F90 b/src/tally_header.F90 index 8bfb7c1c96..3d8dd4d9a5 100644 --- a/src/tally_header.F90 +++ b/src/tally_header.F90 @@ -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 diff --git a/src/xml-fortran/templates/tallies_t.xml b/src/xml-fortran/templates/tallies_t.xml index bf0bf0a549..9c4ecb665b 100644 --- a/src/xml-fortran/templates/tallies_t.xml +++ b/src/xml-fortran/templates/tallies_t.xml @@ -24,7 +24,7 @@ - +