Remove special run mode --tallies.

This commit is contained in:
Paul Romano 2013-06-18 21:49:54 -04:00
parent a699e954e8
commit 509e2ea532
6 changed files with 3 additions and 22 deletions

View file

@ -356,8 +356,7 @@ module constants
MODE_FIXEDSOURCE = 1, & ! Fixed source mode
MODE_EIGENVALUE = 2, & ! K eigenvalue mode
MODE_PLOTTING = 3, & ! Plotting mode
MODE_TALLIES = 4, & ! Tally results mode
MODE_PARTICLE = 5 ! Particle restart mode
MODE_PARTICLE = 4 ! Particle restart mode
! Unit numbers
integer, parameter :: UNIT_SUMMARY = 11 ! unit # for writing summary file

View file

@ -50,7 +50,6 @@ contains
call time_finalize % stop()
call time_total % stop()
if (master .and. (run_mode /= MODE_PLOTTING .and. &
run_mode /= MODE_TALLIES .and. &
run_mode /= MODE_PARTICLE)) then
call print_runtime()
call print_results()

View file

@ -357,14 +357,6 @@ contains
particle_restart_run = .true.
end select
case ('-t', '-tallies', '--tallies')
run_mode = MODE_TALLIES
! Read path for state point
i = i + 1
path_state_point = argv(i)
restart_run = .true.
case ('-g', '-geometry-debug', '--geometry-debug')
check_overlaps = .true.

View file

@ -22,9 +22,6 @@ program main
call run_eigenvalue()
case (MODE_PLOTTING)
call run_plot()
case (MODE_TALLIES)
! For tallies-only mode, we just skip straight to finalize_run to write out
! the tally results
case (MODE_PARTICLE)
if (master) call run_particle_restart()
end select

View file

@ -170,7 +170,6 @@ contains
write(OUTPUT_UNIT,*) ' -p, --plot Run in plotting mode'
write(OUTPUT_UNIT,*) ' -r, --restart Restart a previous run from a state point'
write(OUTPUT_UNIT,*) ' or a particle restart file'
write(OUTPUT_UNIT,*) ' -t, --tallies Write tally results from state point'
write(OUTPUT_UNIT,*) ' -v, --version Show version information'
write(OUTPUT_UNIT,*) ' -?, --help Show this message'
end if
@ -1587,12 +1586,7 @@ contains
score_names(abs(SCORE_EVENTS)) = "Events"
! Create filename for tally output
if (run_mode == MODE_TALLIES) then
filename = trim(path_output) // "tallies." // &
trim(to_str(restart_batch)) // ".out"
else
filename = trim(path_output) // "tallies.out"
end if
filename = trim(path_output) // "tallies.out"
! Open tally file for writing
open(FILE=filename, UNIT=UNIT_TALLY, STATUS='replace', ACTION='write')

View file

@ -675,7 +675,7 @@ contains
end if
! Read source if in eigenvalue mode
if (run_mode == MODE_EIGENVALUE .and. run_mode /= MODE_TALLIES) then
if (run_mode == MODE_EIGENVALUE) then
! Check if source was written out separately
if (source_separate) then