diff --git a/openmc/mgxs/library.py b/openmc/mgxs/library.py index 671b0b8f0..e2ba0bc6a 100644 --- a/openmc/mgxs/library.py +++ b/openmc/mgxs/library.py @@ -1096,7 +1096,7 @@ class Library: if 'decay-rate' in self.mgxs_types: mymgxs = self.get_mgxs(domain, 'decay-rate') - xsdata.set_decay_rate_mgxs(mymgxs, xs_types=xs_type, nuclide=[nuclide], + xsdata.set_decay_rate_mgxs(mymgxs, xs_type=xs_type, nuclide=[nuclide], subdomain=subdomain) # If multiplicity matrix is available, prefer that diff --git a/openmc/mgxs/mdgxs.py b/openmc/mgxs/mdgxs.py index 79f65982c..8f35d5879 100644 --- a/openmc/mgxs/mdgxs.py +++ b/openmc/mgxs/mdgxs.py @@ -326,7 +326,7 @@ class MDGXS(MGXS): ------- numpy.ndarray A NumPy array of the multi-group cross section indexed in the order - each group, subdomain and nuclide is listed in the parameters. + each group, subdomain and nuclide as listed in the parameters. Raises ------ @@ -1872,14 +1872,12 @@ class DecayRate(MDGXS): # Create the non-domain specific Filters for the Tallies group_edges = self.energy_groups.group_edges - energy_filter = openmc.EnergyFilter(group_edges) if self.delayed_groups is not None: delayed_filter = openmc.DelayedGroupFilter(self.delayed_groups) - filters = [[delayed_filter, energy_filter], [delayed_filter, - energy_filter]] + filters = [[delayed_filter], [delayed_filter]] else: - filters = [[energy_filter], [energy_filter]] + filters = None return self._add_angle_filters(filters) @@ -1922,6 +1920,144 @@ class DecayRate(MDGXS): return self._get_homogenized_mgxs(other_mgxs, 'delayed-nu-fission') + def get_xs(self, subdomains='all', nuclides='all', + xs_type='macro', order_groups='increasing', + value='mean', delayed_groups='all', squeeze=True, **kwargs): + """Returns an array of multi-delayed-group cross sections. + + This method constructs a 4D NumPy array for the requested + multi-delayed-group cross section data for one or more + subdomains (1st dimension), delayed groups (2nd demension), + energy groups (3rd dimension), and nuclides (4th dimension). + + Parameters + ---------- + subdomains : Iterable of Integral or 'all' + Subdomain IDs of interest. Defaults to 'all'. + nuclides : Iterable of str or 'all' or 'sum' + A list of nuclide name strings (e.g., ['U-235', 'U-238']). The + special string 'all' will return the cross sections for all nuclides + in the spatial domain. The special string 'sum' will return the + cross section summed over all nuclides. Defaults to 'all'. + xs_type: {'macro', 'micro'} + Return the macro or micro cross section in units of cm^-1 or barns. + Defaults to 'macro'. + order_groups: {'increasing', 'decreasing'} + Return the cross section indexed according to increasing or + decreasing energy groups (decreasing or increasing energies). + Defaults to 'increasing'. + value : {'mean', 'std_dev', 'rel_err'} + A string for the type of value to return. Defaults to 'mean'. + delayed_groups : list of int or 'all' + Delayed groups of interest. Defaults to 'all'. + squeeze : bool + A boolean representing whether to eliminate the extra dimensions + of the multi-dimensional array to be returned. Defaults to True. + + Returns + ------- + numpy.ndarray + A NumPy array of the multi-group cross section indexed in the order + each group, subdomain and nuclide as listed in the parameters. + + Raises + ------ + ValueError + When this method is called before the multi-delayed-group cross + section is computed from tally data. + + """ + + cv.check_value('value', value, ['mean', 'std_dev', 'rel_err']) + cv.check_value('xs_type', xs_type, ['macro', 'micro']) + + # FIXME: Unable to get microscopic xs for mesh domain because the mesh + # cells do not know the nuclide densities in each mesh cell. + if self.domain_type == 'mesh' and xs_type == 'micro': + msg = 'Unable to get micro xs for mesh domain since the mesh ' \ + 'cells do not know the nuclide densities in each mesh cell.' + raise ValueError(msg) + + filters = [] + filter_bins = [] + + # Construct a collection of the domain filter bins + if not isinstance(subdomains, str): + cv.check_iterable_type('subdomains', subdomains, Integral, + max_depth=3) + for subdomain in subdomains: + filters.append(_DOMAIN_TO_FILTER[self.domain_type]) + filter_bins.append((subdomain,)) + + # Construct list of delayed group tuples for all requested groups + if not isinstance(delayed_groups, str): + cv.check_type('delayed groups', delayed_groups, list, int) + for delayed_group in delayed_groups: + filters.append(openmc.DelayedGroupFilter) + filter_bins.append((delayed_group,)) + + # Construct a collection of the nuclides to retrieve from the xs tally + if self.by_nuclide: + if nuclides == 'all' or nuclides == 'sum' or nuclides == ['sum']: + query_nuclides = self.get_nuclides() + else: + query_nuclides = nuclides + else: + query_nuclides = ['total'] + + # If user requested the sum for all nuclides, use tally summation + if nuclides == 'sum' or nuclides == ['sum']: + xs_tally = self.xs_tally.summation(nuclides=query_nuclides) + xs = xs_tally.get_values(filters=filters, + filter_bins=filter_bins, value=value) + else: + xs = self.xs_tally.get_values(filters=filters, + filter_bins=filter_bins, + nuclides=query_nuclides, value=value) + + # Divide by atom number densities for microscopic cross sections + if xs_type == 'micro' and self._divide_by_density: + if self.by_nuclide: + densities = self.get_nuclide_densities(nuclides) + else: + densities = self.get_nuclide_densities('sum') + if value == 'mean' or value == 'std_dev': + xs /= densities[np.newaxis, :, np.newaxis] + + # Eliminate the trivial score dimension + xs = np.squeeze(xs, axis=len(xs.shape) - 1) + xs = np.nan_to_num(xs) + + if delayed_groups == 'all': + num_delayed_groups = self.num_delayed_groups + else: + num_delayed_groups = len(delayed_groups) + + # Reshape tally data array with separate axes for domain, + # energy groups, delayed groups, and nuclides + # Accommodate the polar and azimuthal bins if needed + num_subdomains = \ + int(xs.shape[0] / (num_delayed_groups * + self.num_polar * self.num_azimuthal)) + if self.num_polar > 1 or self.num_azimuthal > 1: + new_shape = (self.num_polar, self.num_azimuthal, num_subdomains, + num_delayed_groups) + else: + new_shape = (num_subdomains, num_delayed_groups) + xs = np.reshape(xs, new_shape) + + # Reverse data if user requested increasing energy groups since + # tally data is stored in order of increasing energies + if order_groups == 'increasing': + xs = xs[..., ::-1, :] + + if squeeze: + # We want to squeeze out everything but the polar, azimuthal, + # delayed group, and energy group data. + xs = self._squeeze_xs(xs) + + return xs + class MatrixMDGXS(MDGXS): """An abstract multi-delayed-group cross section for some energy group and diff --git a/tests/regression_tests/mgxs_library_condense/inputs_true.dat b/tests/regression_tests/mgxs_library_condense/inputs_true.dat index 8e649ea82..b5b017562 100644 --- a/tests/regression_tests/mgxs_library_condense/inputs_true.dat +++ b/tests/regression_tests/mgxs_library_condense/inputs_true.dat @@ -428,13 +428,13 @@ tracklength - 1 69 2 + 1 69 total delayed-nu-fission tracklength - 1 69 2 + 1 69 total decay-rate tracklength diff --git a/tests/regression_tests/mgxs_library_condense/results_true.dat b/tests/regression_tests/mgxs_library_condense/results_true.dat index 55c8c834a..960d8d106 100644 --- a/tests/regression_tests/mgxs_library_condense/results_true.dat +++ b/tests/regression_tests/mgxs_library_condense/results_true.dat @@ -290,32 +290,32 @@ 21 2 2 1 4 1 total 0.002732 0.000330 22 2 2 1 5 1 total 0.001214 0.000143 23 2 2 1 6 1 total 0.000505 0.000059 - mesh 1 delayedgroup group in nuclide mean std. dev. - x y z -0 1 1 1 1 1 total 0.013357 0.000929 -1 1 1 1 2 1 total 0.032589 0.002199 -2 1 1 1 3 1 total 0.121106 0.008007 -3 1 1 1 4 1 total 0.306140 0.019650 -4 1 1 1 5 1 total 0.862764 0.052685 -5 1 1 1 6 1 total 2.897892 0.177498 -12 1 2 1 1 1 total 0.013356 0.001330 -13 1 2 1 2 1 total 0.032598 0.003165 -14 1 2 1 3 1 total 0.121086 0.011554 -15 1 2 1 4 1 total 0.305948 0.028460 -16 1 2 1 5 1 total 0.862070 0.076649 -17 1 2 1 6 1 total 2.895530 0.258195 -6 2 1 1 1 1 total 0.013355 0.001389 -7 2 1 1 2 1 total 0.032601 0.003293 -8 2 1 1 3 1 total 0.121079 0.011980 -9 2 1 1 4 1 total 0.305874 0.029310 -10 2 1 1 5 1 total 0.861802 0.077464 -11 2 1 1 6 1 total 2.894617 0.261360 -18 2 2 1 1 1 total 0.013354 0.001670 -19 2 2 1 2 1 total 0.032610 0.003972 -20 2 2 1 3 1 total 0.121059 0.014468 -21 2 2 1 4 1 total 0.305680 0.035462 -22 2 2 1 5 1 total 0.861087 0.093863 -23 2 2 1 6 1 total 2.892185 0.316700 + mesh 1 delayedgroup nuclide mean std. dev. + x y z +0 1 1 1 1 total 0.013357 0.000957 +1 1 1 1 2 total 0.032589 0.002282 +2 1 1 1 3 total 0.121106 0.008354 +3 1 1 1 4 total 0.306140 0.020673 +4 1 1 1 5 total 0.862764 0.056302 +5 1 1 1 6 total 2.897892 0.189487 +12 1 2 1 1 total 0.013356 0.001529 +13 1 2 1 2 total 0.032598 0.003723 +14 1 2 1 3 total 0.121086 0.013808 +15 1 2 1 4 total 0.305948 0.034825 +16 1 2 1 5 total 0.862070 0.097922 +17 1 2 1 6 total 2.895530 0.328926 +6 2 1 1 1 total 0.013355 0.001381 +7 2 1 1 2 total 0.032601 0.003301 +8 2 1 1 3 total 0.121079 0.012082 +9 2 1 1 4 total 0.305874 0.029845 +10 2 1 1 5 total 0.861802 0.080523 +11 2 1 1 6 total 2.894617 0.271269 +18 2 2 1 1 total 0.013354 0.001732 +19 2 2 1 2 total 0.032610 0.004117 +20 2 2 1 3 total 0.121059 0.014991 +21 2 2 1 4 total 0.305680 0.036716 +22 2 2 1 5 total 0.861087 0.097002 +23 2 2 1 6 total 2.892185 0.327342 mesh 1 delayedgroup group in group out nuclide mean std. dev. x y z 0 1 1 1 1 1 1 total 0.000000 0.000000 diff --git a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat index f6748d150..be745eaa6 100644 --- a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat +++ b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat @@ -438,13 +438,13 @@ tracklength - 1 65 2 + 1 65 total delayed-nu-fission tracklength - 1 65 2 + 1 65 total decay-rate tracklength diff --git a/tests/regression_tests/mgxs_library_distribcell/results_true.dat b/tests/regression_tests/mgxs_library_distribcell/results_true.dat index a24cfb7ce..511133559 100644 --- a/tests/regression_tests/mgxs_library_distribcell/results_true.dat +++ b/tests/regression_tests/mgxs_library_distribcell/results_true.dat @@ -75,13 +75,13 @@ 3 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 4 1 total 0.002727 0.000135 4 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 5 1 total 0.001210 0.000058 5 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 6 1 total 0.000504 0.000024 - sum(distribcell) delayedgroup group in nuclide mean std. dev. -0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 1 1 total 0.013353 0.000686 -1 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 2 1 total 0.032613 0.001627 -2 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 3 1 total 0.121054 0.005911 -3 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 4 1 total 0.305627 0.014428 -4 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 5 1 total 0.860892 0.037879 -5 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 6 1 total 2.891521 0.127879 + sum(distribcell) delayedgroup nuclide mean std. dev. +0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 1 total 0.013353 0.000686 +1 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 2 total 0.032613 0.001627 +2 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 3 total 0.121054 0.005911 +3 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 4 total 0.305627 0.014428 +4 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 5 total 0.860892 0.037879 +5 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 6 total 2.891521 0.127879 sum(distribcell) delayedgroup group in group out nuclide mean std. dev. 0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 1 1 1 total 0.000000 0.000000 1 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),) 2 1 1 total 0.000175 0.000175 diff --git a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat index 8e649ea82..b5b017562 100644 --- a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat +++ b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat @@ -428,13 +428,13 @@ tracklength - 1 69 2 + 1 69 total delayed-nu-fission tracklength - 1 69 2 + 1 69 total decay-rate tracklength diff --git a/tests/regression_tests/mgxs_library_hdf5/results_true.dat b/tests/regression_tests/mgxs_library_hdf5/results_true.dat index b479c139a..e005236c5 100644 --- a/tests/regression_tests/mgxs_library_hdf5/results_true.dat +++ b/tests/regression_tests/mgxs_library_hdf5/results_true.dat @@ -183,18 +183,10 @@ domain=1 type=beta [1.21876271e-04 8.77101834e-05] [4.95946084e-05 3.67414816e-05]] domain=1 type=decay-rate -[[1.34479215e-02 1.33360001e-02] - [3.20491028e-02 3.27389978e-02] - [1.22162808e-01 1.20780007e-01] - [3.15480592e-01 3.02780066e-01] - [8.89723658e-01 8.49490289e-01] - [2.99112795e+00 2.85300089e+00]] -[[5.47700122e-04 1.13399549e-03] - [1.53954980e-03 2.78388383e-03] - [6.44048392e-03 1.02702443e-02] - [1.86178714e-02 2.57461915e-02] - [6.12200714e-02 7.22344077e-02] - [2.04036637e-01 2.42598218e-01]] +[1.33568413e-02 3.25887984e-02 1.21105565e-01 3.06139633e-01 + 8.62763808e-01 2.89789222e+00] +[9.57055016e-04 2.28222032e-03 8.35436401e-03 2.06734948e-02 + 5.63019289e-02 1.89486538e-01] domain=1 type=delayed-nu-fission matrix [[[0.00000000e+00 0.00000000e+00] [0.00000000e+00 0.00000000e+00]] diff --git a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat index 1f3c1ff6e..25ef3b0d0 100644 --- a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat +++ b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat @@ -408,13 +408,13 @@ tracklength - 1 69 2 + 1 69 total delayed-nu-fission tracklength - 1 69 2 + 1 69 total decay-rate tracklength diff --git a/tests/regression_tests/mgxs_library_mesh/results_true.dat b/tests/regression_tests/mgxs_library_mesh/results_true.dat index cbcbcb239..2c06cecda 100644 --- a/tests/regression_tests/mgxs_library_mesh/results_true.dat +++ b/tests/regression_tests/mgxs_library_mesh/results_true.dat @@ -290,32 +290,32 @@ 21 2 2 1 4 1 total 0.002431 0.000100 22 2 2 1 5 1 total 0.000997 0.000041 23 2 2 1 6 1 total 0.000417 0.000017 - mesh 1 delayedgroup group in nuclide mean std. dev. - x y z -0 1 1 1 1 1 total 0.013336 0.001120 -1 1 1 1 2 1 total 0.032739 0.002751 -2 1 1 1 3 1 total 0.120780 0.010147 -3 1 1 1 4 1 total 0.302780 0.025438 -4 1 1 1 5 1 total 0.849490 0.071370 -5 1 1 1 6 1 total 2.853000 0.239696 -12 1 2 1 1 1 total 0.013336 0.000695 -13 1 2 1 2 1 total 0.032739 0.001707 -14 1 2 1 3 1 total 0.120780 0.006296 -15 1 2 1 4 1 total 0.302780 0.015784 -16 1 2 1 5 1 total 0.849490 0.044285 -17 1 2 1 6 1 total 2.853000 0.148730 -6 2 1 1 1 1 total 0.013336 0.000906 -7 2 1 1 2 1 total 0.032739 0.002224 -8 2 1 1 3 1 total 0.120780 0.008205 -9 2 1 1 4 1 total 0.302780 0.020570 -10 2 1 1 5 1 total 0.849490 0.057711 -11 2 1 1 6 1 total 2.853000 0.193821 -18 2 2 1 1 1 total 0.013336 0.000528 -19 2 2 1 2 1 total 0.032739 0.001296 -20 2 2 1 3 1 total 0.120780 0.004781 -21 2 2 1 4 1 total 0.302780 0.011986 -22 2 2 1 5 1 total 0.849490 0.033628 -23 2 2 1 6 1 total 2.853000 0.112940 + mesh 1 delayedgroup nuclide mean std. dev. + x y z +0 1 1 1 1 total 0.013336 0.001120 +1 1 1 1 2 total 0.032739 0.002751 +2 1 1 1 3 total 0.120780 0.010147 +3 1 1 1 4 total 0.302780 0.025438 +4 1 1 1 5 total 0.849490 0.071370 +5 1 1 1 6 total 2.853000 0.239696 +12 1 2 1 1 total 0.013336 0.000695 +13 1 2 1 2 total 0.032739 0.001707 +14 1 2 1 3 total 0.120780 0.006296 +15 1 2 1 4 total 0.302780 0.015784 +16 1 2 1 5 total 0.849490 0.044285 +17 1 2 1 6 total 2.853000 0.148730 +6 2 1 1 1 total 0.013336 0.000906 +7 2 1 1 2 total 0.032739 0.002224 +8 2 1 1 3 total 0.120780 0.008205 +9 2 1 1 4 total 0.302780 0.020570 +10 2 1 1 5 total 0.849490 0.057711 +11 2 1 1 6 total 2.853000 0.193821 +18 2 2 1 1 total 0.013336 0.000528 +19 2 2 1 2 total 0.032739 0.001296 +20 2 2 1 3 total 0.120780 0.004781 +21 2 2 1 4 total 0.302780 0.011986 +22 2 2 1 5 total 0.849490 0.033628 +23 2 2 1 6 total 2.853000 0.112940 mesh 1 delayedgroup group in group out nuclide mean std. dev. x y z 0 1 1 1 1 1 1 total 0.000000 0.000000 diff --git a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat index 5aedd383d..40f31d563 100644 --- a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat +++ b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat @@ -71,10 +71,10 @@ 1 2 3 4 5 6 - + 2 - + 3 @@ -420,13 +420,13 @@ tracklength - 1 65 2 + 1 65 total delayed-nu-fission tracklength - 1 65 2 + 1 65 total decay-rate tracklength @@ -444,733 +444,733 @@ analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total total tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total total tracklength - 80 2 + 79 2 total flux analog - 80 5 6 + 79 5 6 total scatter analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total total tracklength - 80 2 + 79 2 total flux analog - 80 5 6 + 79 5 6 total nu-scatter analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total absorption tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total absorption tracklength - 80 2 + 79 2 total fission tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total fission tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total nu-fission tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total kappa-fission tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total scatter tracklength - 80 2 + 79 2 total flux analog - 80 2 + 79 2 total nu-scatter analog - 80 2 + 79 2 total flux analog - 80 2 5 28 + 79 2 5 28 total scatter analog - 80 2 + 79 2 total flux analog - 80 2 5 28 + 79 2 5 28 total nu-scatter analog - 80 2 5 + 79 2 5 total nu-scatter analog - 80 2 5 + 79 2 5 total scatter analog - 80 2 + 79 2 total flux analog - 80 2 5 + 79 2 5 total nu-fission analog - 80 2 5 + 79 2 5 total scatter analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total scatter tracklength - 80 2 5 28 + 79 2 5 28 total scatter analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total scatter tracklength - 80 2 5 28 + 79 2 5 28 total scatter analog - 80 2 5 + 79 2 5 total nu-scatter analog - 80 52 + 79 52 total nu-fission analog - 80 5 + 79 5 total nu-fission analog - 80 52 + 79 52 total prompt-nu-fission analog - 80 5 + 79 5 total prompt-nu-fission analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total inverse-velocity tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total prompt-nu-fission tracklength - 80 2 + 79 2 total flux analog - 80 2 5 + 79 2 5 total prompt-nu-fission analog - 80 2 + 79 2 total flux tracklength - 80 65 2 + 79 65 2 total delayed-nu-fission tracklength - 80 65 52 + 79 65 52 total delayed-nu-fission analog - 80 65 5 + 79 65 5 total delayed-nu-fission analog - 80 2 + 79 2 total nu-fission tracklength - 80 65 2 + 79 65 2 total delayed-nu-fission tracklength - 80 65 2 + 79 65 total delayed-nu-fission tracklength - 80 65 2 + 79 65 total decay-rate tracklength - 80 2 + 79 2 total flux analog - 80 65 2 5 + 79 65 2 5 total delayed-nu-fission analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total total tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total total tracklength - 159 2 + 157 2 total flux analog - 159 5 6 + 157 5 6 total scatter analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total total tracklength - 159 2 + 157 2 total flux analog - 159 5 6 + 157 5 6 total nu-scatter analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total absorption tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total absorption tracklength - 159 2 + 157 2 total fission tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total fission tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total nu-fission tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total kappa-fission tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total scatter tracklength - 159 2 + 157 2 total flux analog - 159 2 + 157 2 total nu-scatter analog - 159 2 + 157 2 total flux analog - 159 2 5 28 + 157 2 5 28 total scatter analog - 159 2 + 157 2 total flux analog - 159 2 5 28 + 157 2 5 28 total nu-scatter analog - 159 2 5 + 157 2 5 total nu-scatter analog - 159 2 5 + 157 2 5 total scatter analog - 159 2 + 157 2 total flux analog - 159 2 5 + 157 2 5 total nu-fission analog - 159 2 5 + 157 2 5 total scatter analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total scatter tracklength - 159 2 5 28 + 157 2 5 28 total scatter analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total scatter tracklength - 159 2 5 28 + 157 2 5 28 total scatter analog - 159 2 5 + 157 2 5 total nu-scatter analog - 159 52 + 157 52 total nu-fission analog - 159 5 + 157 5 total nu-fission analog - 159 52 + 157 52 total prompt-nu-fission analog - 159 5 + 157 5 total prompt-nu-fission analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total inverse-velocity tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total prompt-nu-fission tracklength - 159 2 + 157 2 total flux analog - 159 2 5 + 157 2 5 total prompt-nu-fission analog - 159 2 + 157 2 total flux tracklength - 159 65 2 + 157 65 2 total delayed-nu-fission tracklength - 159 65 52 + 157 65 52 total delayed-nu-fission analog - 159 65 5 + 157 65 5 total delayed-nu-fission analog - 159 2 + 157 2 total nu-fission tracklength - 159 65 2 + 157 65 2 total delayed-nu-fission tracklength - 159 65 2 + 157 65 total delayed-nu-fission tracklength - 159 65 2 + 157 65 total decay-rate tracklength - 159 2 + 157 2 total flux analog - 159 65 2 5 + 157 65 2 5 total delayed-nu-fission analog diff --git a/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat b/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat index dc98a2263..279a66990 100644 --- a/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat +++ b/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat @@ -167,19 +167,13 @@ 6 1 4 2 total 0.002516 0.000273 8 1 5 2 total 0.001031 0.000112 10 1 6 2 total 0.000432 0.000047 - material delayedgroup group in nuclide mean std. dev. -1 1 1 1 total 0.013445 0.001084 -3 1 2 1 total 0.032064 0.002658 -5 1 3 1 total 0.122136 0.010296 -7 1 4 1 total 0.315269 0.027175 -9 1 5 1 total 0.889233 0.079368 -11 1 6 1 total 2.989404 0.266253 -0 1 1 2 total 0.013336 0.001446 -2 1 2 2 total 0.032739 0.003550 -4 1 3 2 total 0.120780 0.013098 -6 1 4 2 total 0.302780 0.032835 -8 1 5 2 total 0.849490 0.092124 -10 1 6 2 total 2.853001 0.309397 + material delayedgroup nuclide mean std. dev. +0 1 1 total 0.013355 0.001272 +1 1 2 total 0.032600 0.003048 +2 1 3 total 0.121083 0.011182 +3 1 4 total 0.305910 0.027728 +4 1 5 total 0.861934 0.075425 +5 1 6 total 2.895065 0.253942 material delayedgroup group in group out nuclide mean std. dev. 3 1 1 1 1 total 0.000000 0.000000 7 1 2 1 1 total 0.000000 0.000000 @@ -374,19 +368,13 @@ 6 2 4 2 total 0.0 0.0 8 2 5 2 total 0.0 0.0 10 2 6 2 total 0.0 0.0 - material delayedgroup group in nuclide mean std. dev. -1 2 1 1 total 0.0 0.0 -3 2 2 1 total 0.0 0.0 -5 2 3 1 total 0.0 0.0 -7 2 4 1 total 0.0 0.0 -9 2 5 1 total 0.0 0.0 -11 2 6 1 total 0.0 0.0 -0 2 1 2 total 0.0 0.0 -2 2 2 2 total 0.0 0.0 -4 2 3 2 total 0.0 0.0 -6 2 4 2 total 0.0 0.0 -8 2 5 2 total 0.0 0.0 -10 2 6 2 total 0.0 0.0 + material delayedgroup nuclide mean std. dev. +0 2 1 total 0.0 0.0 +1 2 2 total 0.0 0.0 +2 2 3 total 0.0 0.0 +3 2 4 total 0.0 0.0 +4 2 5 total 0.0 0.0 +5 2 6 total 0.0 0.0 material delayedgroup group in group out nuclide mean std. dev. 3 2 1 1 1 total 0.0 0.0 7 2 2 1 1 total 0.0 0.0 @@ -581,19 +569,13 @@ 6 3 4 2 total 0.0 0.0 8 3 5 2 total 0.0 0.0 10 3 6 2 total 0.0 0.0 - material delayedgroup group in nuclide mean std. dev. -1 3 1 1 total 0.0 0.0 -3 3 2 1 total 0.0 0.0 -5 3 3 1 total 0.0 0.0 -7 3 4 1 total 0.0 0.0 -9 3 5 1 total 0.0 0.0 -11 3 6 1 total 0.0 0.0 -0 3 1 2 total 0.0 0.0 -2 3 2 2 total 0.0 0.0 -4 3 3 2 total 0.0 0.0 -6 3 4 2 total 0.0 0.0 -8 3 5 2 total 0.0 0.0 -10 3 6 2 total 0.0 0.0 + material delayedgroup nuclide mean std. dev. +0 3 1 total 0.0 0.0 +1 3 2 total 0.0 0.0 +2 3 3 total 0.0 0.0 +3 3 4 total 0.0 0.0 +4 3 5 total 0.0 0.0 +5 3 6 total 0.0 0.0 material delayedgroup group in group out nuclide mean std. dev. 3 3 1 1 1 total 0.0 0.0 7 3 2 1 1 total 0.0 0.0