crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 14:15:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

remove print_cmfd and change order in which print_batch_keff is called

Browse source
This commit is contained in:
Shikhar Kumar 2018-03-01 15:56:24 -05:00
parent f15f824c99
commit bedf99d2fe
2 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/output.F90
View file

@ -356,9 +356,9 @@ contains
integer :: n ! number of active generations
! Determine overall generation and number of active generations
i = overall_generation()
i = overall_generation() - 1
n = i - n_inactive*gen_per_batch
! write out information batch and option independent output
write(UNIT=OUTPUT_UNIT, FMT='(2X,A9)', ADVANCE='NO') &
trim(to_str(current_batch)) // "/" // trim(to_str(gen_per_batch))
@ -377,16 +377,6 @@ contains
write(UNIT=OUTPUT_UNIT, FMT='(23X)', ADVANCE='NO')
end if
end subroutine print_batch_keff
!===============================================================================
! PRINT_CMFD displays the CMFD related information to output after CMFD is
! executed. Will print blank line if CMFD is not on, to ensure consistent
! formatting of output columns
!===============================================================================
subroutine print_cmfd()
! write out cmfd keff if it is active and other display info
if (cmfd_on) then
write(UNIT=OUTPUT_UNIT, FMT='(3X, F8.5)', ADVANCE='NO') &
@ -410,7 +400,7 @@ contains
! next line
write(UNIT=OUTPUT_UNIT, FMT=*)
end subroutine print_cmfd
end subroutine print_batch_keff
!===============================================================================
! PRINT_PLOT displays selected options for plotting

8
src/simulation.F90
View file

@ -24,8 +24,7 @@ module simulation
use nuclide_header, only: micro_xs, n_nuclides
use output, only: header, print_columns, &
print_batch_keff, print_generation, print_runtime, &
print_results, print_overlap_check, write_tallies, &
print_cmfd
print_results, print_overlap_check, write_tallies
use particle_header, only: Particle
use random_lcg, only: set_particle_seed
use settings
@ -295,8 +294,6 @@ contains
if (master .and. verbosity >= 7) then
if (current_gen /= gen_per_batch) then
call print_generation()
else
call print_batch_keff()
end if
end if
@ -339,7 +336,8 @@ contains
if (run_mode == MODE_EIGENVALUE) then
! Perform CMFD calculation if on
if (cmfd_on) call execute_cmfd()
call print_cmfd()
! Write batch output
if (master .and. verbosity >= 7) call print_batch_keff()
end if
! Check_triggers