Changed arguments for add_tallies. Closes #141.

This commit is contained in:
Paul Romano 2013-01-31 10:19:45 -05:00
parent 139d10097e
commit dbf492200d
3 changed files with 11 additions and 6 deletions

View file

@ -318,7 +318,7 @@ contains
call mesh_dict % add_key(m % id, n_user_meshes + 1)
! allocate tallies
call add_tallies(n_cmfd_tallies, i_cmfd_tallies)
call add_tallies("cmfd", n_cmfd_tallies)
! begin loop around tallies
do i = 1, n_cmfd_tallies

View file

@ -1292,7 +1292,7 @@ contains
! Allocate tally array
if (n_user_tallies > 0) then
call add_tallies(n_user_tallies, i_user_tallies)
call add_tallies("user", n_user_tallies)
end if
! Check for <assume_separate> setting

View file

@ -162,10 +162,10 @@ contains
! tallies, etc.
!===============================================================================
subroutine add_tallies(n, i_tally)
subroutine add_tallies(tally_group, n)
integer, intent(in) :: n ! number of tallies to add
integer, intent(out) :: i_tally ! index of tally group
character(*), intent(in) :: tally_group ! name of tally group
integer, intent(in) :: n ! number of tallies to add
type(TallyObject), allocatable :: temp(:) ! temporary tallies array
@ -185,7 +185,12 @@ contains
end if
! Set index for ths tally group
i_tally = n_tallies
select case(tally_group)
case ("user")
i_user_tallies = n_tallies
case ("cmfd")
i_cmfd_tallies = n_tallies
end select
! Set n_tallies
n_tallies = size(tallies)