From 5131eb3e0998e87798333a8775d59256087b5efb Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 4 Jan 2013 19:08:10 -0500 Subject: [PATCH] Remove special (n,xn) tallies. Need to fix statepoint.py. --- src/constants.F90 | 15 ++++++--------- src/input_xml.F90 | 6 +++--- src/output.F90 | 9 --------- src/tally.F90 | 15 --------------- src/utils/statepoint.py | 5 ++--- 5 files changed, 11 insertions(+), 39 deletions(-) diff --git a/src/constants.F90 b/src/constants.F90 index 83edf571c1..fc51c8bc81 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -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 diff --git a/src/input_xml.F90 b/src/input_xml.F90 index ddcf4fcc79..2db157d01d 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -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 diff --git a/src/output.F90 b/src/output.F90 index b6904e3bfe..14fed48433 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -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" diff --git a/src/tally.F90 b/src/tally.F90 index 45f886bf9d..32784149e3 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -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 -- diff --git a/src/utils/statepoint.py b/src/utils/statepoint.py index 584e837721..1e0acbd742 100644 --- a/src/utils/statepoint.py +++ b/src/utils/statepoint.py @@ -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):