Added output_tallies variable and associated option for <output>. tallies.out will still be written by default for now.

This commit is contained in:
Paul Romano 2012-08-23 18:32:23 -04:00
parent 9a44ac63b2
commit 84f2974459
5 changed files with 12 additions and 9 deletions

View file

@ -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

View file

@ -258,6 +258,7 @@ module global
! Various output options
logical :: output_summary = .false.
logical :: output_xs = .false.
logical :: output_tallies = .true.
contains

View file

@ -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

View file

@ -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

View file

@ -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