Remove special (n,xn) tallies. Need to fix statepoint.py.

This commit is contained in:
Paul Romano 2013-01-04 19:08:10 -05:00
parent 1e639f54d4
commit 5131eb3e09
5 changed files with 11 additions and 39 deletions

View file

@ -252,7 +252,7 @@ module constants
EVENT_FISSION = 3
! Tally score type
integer, parameter :: N_SCORE_TYPES = 17
integer, parameter :: N_SCORE_TYPES = 14
integer, parameter :: &
SCORE_FLUX = -1, & ! flux
SCORE_TOTAL = -2, & ! total reaction rate
@ -263,14 +263,11 @@ module constants
SCORE_TRANSPORT = -7, & ! transport reaction rate
SCORE_DIFFUSION = -8, & ! diffusion coefficient
SCORE_N_1N = -9, & ! (n,1n) rate
SCORE_N_2N = -10, & ! (n,2n) rate
SCORE_N_3N = -11, & ! (n,3n) rate
SCORE_N_4N = -12, & ! (n,4n) rate
SCORE_ABSORPTION = -13, & ! absorption rate
SCORE_FISSION = -14, & ! fission rate
SCORE_NU_FISSION = -15, & ! neutron production rate
SCORE_CURRENT = -16, & ! partial current
SCORE_EVENTS = -17 ! number of events
SCORE_ABSORPTION = -10, & ! absorption rate
SCORE_FISSION = -11, & ! fission rate
SCORE_NU_FISSION = -12, & ! neutron production rate
SCORE_CURRENT = -13, & ! partial current
SCORE_EVENTS = -14 ! number of events
! Maximum scattering order supported
integer, parameter :: SCATT_ORDER_MAX = 10

View file

@ -1824,17 +1824,17 @@ contains
! Set tally estimator to analog
t % estimator = ESTIMATOR_ANALOG
case ('n2n')
t % score_bins(j) = SCORE_N_2N
t % score_bins(j) = N_2N
! Set tally estimator to analog
t % estimator = ESTIMATOR_ANALOG
case ('n3n')
t % score_bins(j) = SCORE_N_3N
t % score_bins(j) = N_3N
! Set tally estimator to analog
t % estimator = ESTIMATOR_ANALOG
case ('n4n')
t % score_bins(j) = SCORE_N_4N
t % score_bins(j) = N_4N
! Set tally estimator to analog
t % estimator = ESTIMATOR_ANALOG

View file

@ -809,12 +809,6 @@ contains
string = trim(string) // ' diffusion'
case (SCORE_N_1N)
string = trim(string) // ' n1n'
case (SCORE_N_2N)
string = trim(string) // ' n2n'
case (SCORE_N_3N)
string = trim(string) // ' n3n'
case (SCORE_N_4N)
string = trim(string) // ' n4n'
case (SCORE_ABSORPTION)
string = trim(string) // ' absorption'
case (SCORE_FISSION)
@ -1455,9 +1449,6 @@ contains
score_names(abs(SCORE_TRANSPORT)) = "Transport Rate"
score_names(abs(SCORE_DIFFUSION)) = "Diffusion Coefficient"
score_names(abs(SCORE_N_1N)) = "(n,1n) Rate"
score_names(abs(SCORE_N_2N)) = "(n,2n) Rate"
score_names(abs(SCORE_N_3N)) = "(n,3n) Rate"
score_names(abs(SCORE_N_4N)) = "(n,4n) Rate"
score_names(abs(SCORE_ABSORPTION)) = "Absorption Rate"
score_names(abs(SCORE_FISSION)) = "Fission Rate"
score_names(abs(SCORE_NU_FISSION)) = "Nu-Fission Rate"

View file

@ -245,21 +245,6 @@ contains
! All events that reach this point are (n,1n) reactions
score = last_wgt
case (SCORE_N_2N)
! Skip any event that is not (n,2n)
if (p % event_MT /= N_2N) cycle SCORE_LOOP
score = last_wgt
case (SCORE_N_3N)
! Skip any event that is not (n,3n)
if (p % event_MT /= N_3N) cycle SCORE_LOOP
score = last_wgt
case (SCORE_N_4N)
! Skip any event that is not (n,4n)
if (p % event /= N_4N) cycle SCORE_LOOP
score = last_wgt
case (SCORE_ABSORPTION)
if (survival_biasing) then
! No absorption events actually occur if survival biasing is on --

View file

@ -12,9 +12,8 @@ filter_types = {1: 'universe', 2: 'material', 3: 'cell', 4: 'cellborn',
score_types = {-1: 'flux', -2: 'total', -3: 'scatter', -4: 'nu-scatter',
-5: 'scatter-n', -6: 'scatter-pn', -7: 'transport',
-8: 'diffusion', -9: 'n1n', -10: 'n2n', -11: 'n3n',
-12: 'n4n', -13: 'absorption', -14: 'fission',
-15: 'nu-fission', -16: 'current', -17: 'events'}
-8: 'diffusion', -9: 'n1n', -10: 'absorption', -11: 'fission',
-12: 'nu-fission', -13: 'current', -14: 'events'}
class BinaryFile(object):
def __init__(self, filename):