Changed names of a few subroutines in tally module to be more consistent.

This commit is contained in:
Paul Romano 2012-04-01 12:30:37 -04:00
parent cdb2bbbfd1
commit 1262759289
2 changed files with 11 additions and 11 deletions

View file

@ -10,7 +10,7 @@ module intercycle
use random_lcg, only: prn, set_particle_seed, prn_skip
use search, only: binary_search
use string, only: to_str
use tally, only: accumulate_batch_estimate
use tally, only: accumulate_score
use tally_header, only: TallyObject
use timing, only: timer_start, timer_stop
@ -392,7 +392,7 @@ contains
n = current_batch - n_inactive
! Accumulate single batch realizations of k
call accumulate_batch_estimate(global_tallies)
call accumulate_score(global_tallies)
! Determine sample mean of keff
keff = global_tallies(K_ANALOG) % sum/n

View file

@ -1312,11 +1312,11 @@ contains
end subroutine add_to_score
!===============================================================================
! ACCUMULATE_BATCH_ESTIMATE accumulates scores from many histories (or many
! generations) into a single realization of a random variable.
! ACCUMULATE_SCORE accumulates scores from many histories (or many generations)
! into a single realization of a random variable.
!===============================================================================
elemental subroutine accumulate_batch_estimate(score)
elemental subroutine accumulate_score(score)
type(TallyScore), intent(inout) :: score
@ -1333,7 +1333,7 @@ contains
! Reset the single batch estimate
score % value = ZERO
end subroutine accumulate_batch_estimate
end subroutine accumulate_score
!===============================================================================
! SYNCHRONIZE_TALLIES accumulates the sum of the contributions from each history
@ -1354,7 +1354,7 @@ contains
t => tallies(i)
! Loop over all filter and scoring bins
call accumulate_batch_estimate(t % scores)
call accumulate_score(t % scores)
end do
end subroutine synchronize_tallies
@ -1795,7 +1795,7 @@ contains
! the mean for a TallyScore.
!===============================================================================
elemental subroutine calculate_statistics(score)
elemental subroutine statistics_score(score)
type(TallyScore), intent(inout) :: score
@ -1807,7 +1807,7 @@ contains
score % sum_sq = sqrt((score % sum_sq/n_active - score % sum**2) / &
(n_active - 1))
end subroutine calculate_statistics
end subroutine statistics_score
!===============================================================================
! TALLY_STATISTICS computes the mean and standard deviation of the mean of each
@ -1824,11 +1824,11 @@ contains
do i = 1, n_tallies
t => tallies(i)
call calculate_statistics(t % scores)
call statistics_score(t % scores)
end do
! Calculate statistics for global tallies
call calculate_statistics(global_tallies)
call statistics_score(global_tallies)
end subroutine tally_statistics