From 05fcfd218306cc438319b49a33820d470c267ced Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 15 Jul 2012 19:16:37 -0400 Subject: [PATCH] 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. --- src/tally.F90 | 6 ++++-- src/tally_header.F90 | 2 +- src/xml-fortran/templates/tallies_t.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tally.F90 b/src/tally.F90 index a7a743a004..0f25b47939 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -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 diff --git a/src/tally_header.F90 b/src/tally_header.F90 index 3d8dd4d9a5..3ab7ad203b 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=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 diff --git a/src/xml-fortran/templates/tallies_t.xml b/src/xml-fortran/templates/tallies_t.xml index 9c4ecb665b..c0e2992914 100644 --- a/src/xml-fortran/templates/tallies_t.xml +++ b/src/xml-fortran/templates/tallies_t.xml @@ -24,7 +24,7 @@ - +