diff --git a/src/finalize.F90 b/src/finalize.F90 index 9f2239ec84..eddc3e34d1 100644 --- a/src/finalize.F90 +++ b/src/finalize.F90 @@ -24,15 +24,18 @@ contains call timer_start(time_finalize) if (run_mode /= MODE_PLOTTING) then - ! Calculate statistics for tallies and write to tallies.out - call tally_statistics() - if (master) call write_tallies() + if (output_tallies) then + ! Calculate statistics for tallies and write to tallies.out + call tally_statistics() + if (master) call write_tallies() + end if end if ! stop timers and show timing statistics call timer_stop(time_finalize) call timer_stop(time_total) - if (master .and. (run_mode /= MODE_PLOTTING)) call print_runtime() + if (master .and. (run_mode /= MODE_PLOTTING .and. & + run_mode /= MODE_TALLIES)) call print_runtime() #ifdef HDF5 ! Write time statistics to HDF5 output diff --git a/src/global.F90 b/src/global.F90 index 6c24b31ef8..c1f6bb82a7 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -258,6 +258,7 @@ module global ! Various output options logical :: output_summary = .false. logical :: output_xs = .false. + logical :: output_tallies = .true. contains diff --git a/src/initialize.F90 b/src/initialize.F90 index ee4789a76a..da17bc0654 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -310,9 +310,6 @@ contains path_state_point = argv(i) restart_run = .true. - ! Set path for binary source file - path_source = 'source.' // path_state_point(9 : & - len_trim(path_state_point)) case ('-?', '-help', '--help') call print_usage() stop diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 08b59ad673..1e3b2fdb76 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -515,6 +515,8 @@ contains output_summary = .true. case ('cross_sections') output_xs = .true. + case ('tallies') + output_tallies = .true. end select end do end if diff --git a/src/state_point.F90 b/src/state_point.F90 index d99759e638..0ebced01db 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -24,11 +24,11 @@ contains subroutine write_state_point() integer :: i ! loop index - integer :: n ! temporary array length type(TallyObject), pointer :: t => null() #ifdef MPI integer :: fh ! file handle + integer :: n ! temporary array length integer :: temp ! temporary variable integer :: size_offset_kind ! size of MPI_OFFSET_KIND (bytes) integer :: size_bank ! size of MPI_BANK type @@ -807,7 +807,7 @@ contains end if ! Read source bank for criticality run - if (mode == MODE_CRITICALITY) then + if (mode == MODE_CRITICALITY .and. run_mode /= MODE_TALLIES) then read(UNIT_STATE) source_bank end if