From 4f56453a168e0f2709ff929cea711130dd55ebe3 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Thu, 26 May 2016 18:43:49 -0400 Subject: [PATCH] Removed (n,1n) score from code, replaced with deprecation message --- src/constants.F90 | 27 +++++++++++++-------------- src/endf.F90 | 2 -- src/input_xml.F90 | 10 ++-------- src/output.F90 | 1 - tests/test_tallies/inputs_true.dat | 2 +- tests/test_tallies/results_true.dat | 2 +- tests/test_tallies/test_tallies.py | 4 ---- 7 files changed, 17 insertions(+), 31 deletions(-) diff --git a/src/constants.F90 b/src/constants.F90 index be13f47f2f..4354cc4234 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -279,7 +279,7 @@ module constants EVENT_ABSORB = 2 ! Tally score type - integer, parameter :: N_SCORE_TYPES = 21 + integer, parameter :: N_SCORE_TYPES = 20 integer, parameter :: & SCORE_FLUX = -1, & ! flux SCORE_TOTAL = -2, & ! total reaction rate @@ -289,19 +289,18 @@ module constants SCORE_SCATTER_PN = -6, & ! system for scoring 0th through nth moment SCORE_NU_SCATTER_N = -7, & ! arbitrary nu-scattering moment SCORE_NU_SCATTER_PN = -8, & ! system for scoring 0th through nth nu-scatter moment - SCORE_N_1N = -9, & ! (n,1n) rate - SCORE_ABSORPTION = -10, & ! absorption rate - SCORE_FISSION = -11, & ! fission rate - SCORE_NU_FISSION = -12, & ! neutron production rate - SCORE_KAPPA_FISSION = -13, & ! fission energy production rate - SCORE_CURRENT = -14, & ! partial current - SCORE_FLUX_YN = -15, & ! angular moment of flux - SCORE_TOTAL_YN = -16, & ! angular moment of total reaction rate - SCORE_SCATTER_YN = -17, & ! angular flux-weighted scattering moment (0:N) - SCORE_NU_SCATTER_YN = -18, & ! angular flux-weighted nu-scattering moment (0:N) - SCORE_EVENTS = -19, & ! number of events - SCORE_DELAYED_NU_FISSION = -20, & ! delayed neutron production rate - SCORE_INVERSE_VELOCITY = -21 ! flux-weighted inverse velocity + SCORE_ABSORPTION = -9, & ! absorption rate + SCORE_FISSION = -10, & ! fission rate + SCORE_NU_FISSION = -11, & ! neutron production rate + SCORE_KAPPA_FISSION = -12, & ! fission energy production rate + SCORE_CURRENT = -13, & ! partial current + SCORE_FLUX_YN = -14, & ! angular moment of flux + SCORE_TOTAL_YN = -15, & ! angular moment of total reaction rate + SCORE_SCATTER_YN = -16, & ! angular flux-weighted scattering moment (0:N) + SCORE_NU_SCATTER_YN = -17, & ! angular flux-weighted nu-scattering moment (0:N) + SCORE_EVENTS = -18, & ! number of events + SCORE_DELAYED_NU_FISSION = -19, & ! delayed neutron production rate + SCORE_INVERSE_VELOCITY = -20 ! flux-weighted inverse velocity ! Maximum scattering order supported integer, parameter :: MAX_ANG_ORDER = 10 diff --git a/src/endf.F90 b/src/endf.F90 index 9f14ea6b72..ad5e97a033 100644 --- a/src/endf.F90 +++ b/src/endf.F90 @@ -34,8 +34,6 @@ contains string = "nu-scatter-n" case (SCORE_NU_SCATTER_PN) string = "nu-scatter-pn" - case (SCORE_N_1N) - string = "n1n" case (SCORE_ABSORPTION) string = "absorption" case (SCORE_FISSION) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index eb8859bec5..e2add2027b 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -3497,14 +3497,8 @@ contains &please remove") case ('n1n') - if (run_CE) then - t % score_bins(j) = SCORE_N_1N - - ! Set tally estimator to analog - t % estimator = ESTIMATOR_ANALOG - else - call fatal_error("Cannot tally n1n rate in multi-group mode!") - end if + call fatal_error("n1n score no longer supported for tallies, & + &please remove") case ('n2n', '(n,2n)') t % score_bins(j) = N_2N diff --git a/src/output.F90 b/src/output.F90 index 76e3cfc024..768019f8da 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -777,7 +777,6 @@ contains score_names(abs(SCORE_TOTAL)) = "Total Reaction Rate" score_names(abs(SCORE_SCATTER)) = "Scattering Rate" score_names(abs(SCORE_NU_SCATTER)) = "Scattering Production Rate" - score_names(abs(SCORE_N_1N)) = "(n,1n) 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/tests/test_tallies/inputs_true.dat b/tests/test_tallies/inputs_true.dat index 61d09f8ea6..e3d37be300 100644 --- a/tests/test_tallies/inputs_true.dat +++ b/tests/test_tallies/inputs_true.dat @@ -1 +1 @@ -35e3e1a2c2ef7c707ea585e6cd697ea5e4ae8ec0ec070985dcfd1917a6a569cb7354bee7bbdd259ecdad7198823b4dad98b17452f9cba1122f22635e0aa0a046 \ No newline at end of file +ea09926d8f5c6c96529bf5529f4deb3be78eda2da80adbbf3440147c337587358c2b1823bc72df9463676135573eb481dcd361b735f18365216645ee81092f1e \ No newline at end of file diff --git a/tests/test_tallies/results_true.dat b/tests/test_tallies/results_true.dat index 904f62a770..ff3a828454 100644 --- a/tests/test_tallies/results_true.dat +++ b/tests/test_tallies/results_true.dat @@ -1 +1 @@ -264bc2cb19f7d81dfb1c326ee044f89cd09549b3b6836f334bb06f63bf586058e9825788a90ca7b84c77fd53ee23871727fd0d2b0139cb008192c533be4b84e3 \ No newline at end of file +a0c7d6ca246ecd7dd5fed06373af142390971401c4e97744f29e55810ab9c231c97c4d8947cdf0b3d2df0ae829a9ddf768e5b2d889bbea34f2b6db0e567db884 \ No newline at end of file diff --git a/tests/test_tallies/test_tallies.py b/tests/test_tallies/test_tallies.py index 0b7fabef28..9e40d4185d 100644 --- a/tests/test_tallies/test_tallies.py +++ b/tests/test_tallies/test_tallies.py @@ -160,9 +160,6 @@ class TalliesTestHarness(PyAPITestHarness): total_tallies[2].estimator = 'analog' total_tallies[3].estimator = 'collision' - questionable_tally = Tally() - questionable_tally.scores = ['n1n'] - all_nuclide_tallies = [Tally(), Tally()] for t in all_nuclide_tallies: t.filters = [cell_filter] @@ -182,7 +179,6 @@ class TalliesTestHarness(PyAPITestHarness): self._input_set.tallies += flux_tallies self._input_set.tallies += (scatter_tally1, scatter_tally2) self._input_set.tallies += total_tallies - self._input_set.tallies.append(questionable_tally) self._input_set.tallies += all_nuclide_tallies self._input_set.export()