Fix current tallies

QingmingHe · Jun 27, 2016 · 065fe6f · 065fe6f
1 parent 64c77a2
commit 065fe6f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/output.F90 b/src/output.F90
@@ -737,7 +737,6 @@ subroutine write_tallies()
     integer :: k            ! loop index for scoring bins
     integer :: n            ! loop index for nuclides
     integer :: l            ! loop index for user scores
-    integer :: type         ! type of tally filter
     integer :: indent       ! number of spaces to preceed output
     integer :: filter_index ! index in results array for filters
     integer :: score_index  ! scoring bin index
@@ -1033,8 +1032,8 @@ subroutine write_surface_current(t, unit_tally)
 
               ! Write incoming energy bin
               write(UNIT=unit_tally, FMT='(3X,A)') &
-                   t % filters(i_filter_ein) % obj % text_label( &
-                   matching_bins(i_filter_ein))
+                   trim(t % filters(i_filter_ein) % obj % text_label( &
+                   matching_bins(i_filter_ein)))
             end if
 
             ! Left Surface

diff --git a/src/tally.F90 b/src/tally.F90
@@ -2345,11 +2345,12 @@ subroutine score_surface_current(p)
       ! Copy particle's direction
       uvw = p % coord(1) % uvw
 
-      ! determine incoming energy bin
+      ! Determine incoming energy bin.  We need to tell the energy filter this
+      ! is a tracklength tally so it uses the pre-collision energy.
       j = t % find_filter(FILTER_ENERGYIN)
       if (j > 0) then
         matching_bins(j) = t % filters(j) % obj &
-             % get_next_bin(p, ESTIMATOR_COLLISION, NO_BIN_FOUND)
+             % get_next_bin(p, ESTIMATOR_TRACKLENGTH, NO_BIN_FOUND)
         if (matching_bins(j) == NO_BIN_FOUND) cycle
       end if