diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index 94071101d..402152608 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -2715,7 +2715,10 @@ class TransportXS(MGXS): super(TransportXS, self).__init__(domain, domain_type, groups, by_nuclide, name, num_polar, num_azimuthal) - self._estimator = 'analog' + + # Use tracklength estimators for the total MGXS term, and + # analog estimators for the transport correction term + self._estimator = ['tracklength', 'tracklength', 'analog', 'analog'] self._valid_estimators = ['analog'] self.nu = nu @@ -2727,40 +2730,54 @@ class TransportXS(MGXS): @property def scores(self): if not self.nu: - return ['flux', 'total', 'scatter-1'] + return ['flux', 'total', 'flux', 'scatter-1'] else: - return ['flux', 'total', 'nu-scatter-1'] + return ['flux', 'total', 'flux', 'nu-scatter-1'] @property def tally_keys(self): - if not self.nu: - return super(TransportXS, self).tally_keys - else: - return ['flux', 'total', 'scatter-1'] + return ['flux (tracklength)', 'total', 'flux (analog)', 'scatter-1'] @property def filters(self): group_edges = self.energy_groups.group_edges energy_filter = openmc.EnergyFilter(group_edges) energyout_filter = openmc.EnergyoutFilter(group_edges) - filters = [[energy_filter], [energy_filter], [energyout_filter]] + filters = [[energy_filter], [energy_filter], + [energy_filter], [energyout_filter]] return self._add_angle_filters(filters) @property def rxn_rate_tally(self): - if self._rxn_rate_tally is None: + raise NotImplementedError('The reaction rate tally is poorly defined' \ + ' for the transport cross section') + + @property + def xs_tally(self): + if self._xs_tally is None: + if self.tallies is None: + msg = 'Unable to get xs_tally since tallies have ' \ + 'not been loaded from a statepoint' + raise ValueError(msg) + # Switch EnergyoutFilter to EnergyFilter. old_filt = self.tallies['scatter-1'].filters[-1] new_filt = openmc.EnergyFilter(old_filt.bins) new_filt.stride = old_filt.stride self.tallies['scatter-1'].filters[-1] = new_filt - self._rxn_rate_tally = \ - self.tallies['total'] - self.tallies['scatter-1'] - self._rxn_rate_tally.sparse = self.sparse + # Compute total cross section + total_xs = self.tallies['total'] / self.tallies['flux (tracklength)'] - return self._rxn_rate_tally + # Compute transport correction term + trans_corr = self.tallies['scatter-1'] / self.tallies['flux (analog)'] + + # Compute the transport-corrected total cross section + self._xs_tally = total_xs - trans_corr + self._compute_xs() + + return self._xs_tally @property def nu(self): diff --git a/src/xml/fox b/src/xml/fox new file mode 160000 index 000000000..bdc852f4f --- /dev/null +++ b/src/xml/fox @@ -0,0 +1 @@ +Subproject commit bdc852f4f43d969fb1b179cba79295c1e095a455 diff --git a/tests/test_mgxs_library_condense/inputs_true.dat b/tests/test_mgxs_library_condense/inputs_true.dat index f2a7c9025..79c7ea049 100644 --- a/tests/test_mgxs_library_condense/inputs_true.dat +++ b/tests/test_mgxs_library_condense/inputs_true.dat @@ -69,56 +69,56 @@ total flux - analog + tracklength total total - analog + tracklength + + + total + flux + analog + + total scatter-1 analog - - - - total - flux - analog - total - total - analog + flux + tracklength - + total - nu-scatter-1 - analog + total + tracklength total flux - tracklength + analog - + total - absorption - tracklength + nu-scatter-1 + analog @@ -138,14 +138,14 @@ total - fission + flux tracklength total - flux + absorption tracklength @@ -166,7 +166,7 @@ total - nu-fission + fission tracklength @@ -180,7 +180,7 @@ total - kappa-fission + nu-fission tracklength @@ -194,7 +194,7 @@ total - scatter + kappa-fission tracklength @@ -202,14 +202,14 @@ total flux - analog + tracklength total - nu-scatter - analog + scatter + tracklength @@ -221,9 +221,8 @@ - total - scatter-P3 + nu-scatter analog @@ -238,15 +237,14 @@ total - nu-scatter-P3 + scatter-P3 analog - total - nu-scatter + flux analog @@ -254,14 +252,15 @@ total - scatter + nu-scatter-P3 analog + total - flux + nu-scatter analog @@ -269,54 +268,47 @@ total - nu-fission + scatter analog - total - scatter + flux analog + total - flux - tracklength + nu-fission + analog + total scatter - tracklength + analog - total - scatter-P3 - analog + flux + tracklength - - - total - flux - tracklength - - total scatter tracklength - + @@ -324,7 +316,29 @@ scatter-P3 analog + + + + total + flux + tracklength + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -332,7 +346,7 @@ nu-scatter-0 analog - + @@ -340,47 +354,33 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - total - prompt-nu-fission + nu-fission analog total - prompt-nu-fission + nu-fission analog - + total - flux - tracklength + prompt-nu-fission + analog - + total - inverse-velocity - tracklength + prompt-nu-fission + analog @@ -393,7 +393,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -401,9 +401,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -411,14 +425,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -426,7 +440,7 @@ delayed-nu-fission tracklength - + @@ -434,7 +448,7 @@ delayed-nu-fission analog - + @@ -442,45 +456,45 @@ delayed-nu-fission analog - + total nu-fission tracklength - - - - - total - delayed-nu-fission - tracklength - - - - - - total - delayed-nu-fission - tracklength - total - decay-rate + delayed-nu-fission tracklength + + + + total + delayed-nu-fission + tracklength + + + + + + total + decay-rate + tracklength + + total flux analog - + @@ -489,60 +503,46 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - total flux - analog + tracklength total total - analog + tracklength - + total - scatter-1 - analog + flux + tracklength + + + total + total + tracklength + + total flux analog - - - - total - total - analog - total - nu-scatter-1 + scatter-1 analog @@ -556,7 +556,7 @@ total - absorption + total tracklength @@ -564,48 +564,48 @@ total flux - tracklength + analog - + total - absorption - tracklength + nu-scatter-1 + analog total - fission + flux tracklength total - flux + absorption tracklength total - fission + flux tracklength total - flux + absorption tracklength total - nu-fission + fission tracklength @@ -619,7 +619,7 @@ total - kappa-fission + fission tracklength @@ -633,7 +633,7 @@ total - scatter + nu-fission tracklength @@ -641,29 +641,28 @@ total flux - analog + tracklength total - nu-scatter - analog + kappa-fission + tracklength total flux - analog + tracklength - total - scatter-P3 - analog + scatter + tracklength @@ -675,17 +674,15 @@ - total - nu-scatter-P3 + nu-scatter analog - total - nu-scatter + flux analog @@ -693,7 +690,7 @@ total - scatter + scatter-P3 analog @@ -708,7 +705,7 @@ total - nu-fission + nu-scatter-P3 analog @@ -716,46 +713,55 @@ total - scatter + nu-scatter analog + total - flux - tracklength + scatter + analog total - scatter - tracklength + flux + analog total - scatter-P3 + nu-fission analog + + + + total + scatter + analog + + total flux tracklength - + total scatter tracklength - + @@ -763,7 +769,29 @@ scatter-P3 analog - + + + + total + flux + tracklength + + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -771,7 +799,7 @@ nu-scatter-0 analog - + @@ -779,76 +807,47 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - - - - - total - prompt-nu-fission - analog - - - - - total - prompt-nu-fission - analog - - + total - flux - tracklength + nu-fission + analog - + total - inverse-velocity - tracklength + nu-fission + analog - + total - flux - tracklength + prompt-nu-fission + analog - + total prompt-nu-fission - tracklength + analog total flux - analog + tracklength - total - prompt-nu-fission - analog + inverse-velocity + tracklength @@ -859,33 +858,31 @@ - total - delayed-nu-fission + prompt-nu-fission tracklength - - + total - delayed-nu-fission + flux analog - + total - delayed-nu-fission + prompt-nu-fission analog total - nu-fission + flux tracklength @@ -897,6 +894,29 @@ tracklength + + + + total + delayed-nu-fission + analog + + + + + + total + delayed-nu-fission + analog + + + + + total + nu-fission + tracklength + + @@ -904,7 +924,15 @@ delayed-nu-fission tracklength - + + + + + total + delayed-nu-fission + tracklength + + @@ -912,14 +940,14 @@ decay-rate tracklength - + total flux analog - + @@ -928,75 +956,47 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - - - - - total - flux - analog - - - - - total - total - analog - - + total - scatter-1 - analog + flux + tracklength total - flux - analog + total + tracklength total - total - analog + flux + tracklength - + total - nu-scatter-1 - analog + total + tracklength total flux - tracklength + analog - + total - absorption - tracklength + scatter-1 + analog @@ -1009,56 +1009,56 @@ total - absorption + total tracklength total - fission - tracklength + flux + analog - + total - flux - tracklength + nu-scatter-1 + analog total - fission + flux tracklength total - flux + absorption tracklength total - nu-fission + flux tracklength total - flux + absorption tracklength total - kappa-fission + fission tracklength @@ -1072,7 +1072,7 @@ total - scatter + fission tracklength @@ -1080,59 +1080,55 @@ total flux - analog + tracklength total - nu-scatter - analog + nu-fission + tracklength total flux - analog + tracklength - total - scatter-P3 - analog + kappa-fission + tracklength total flux - analog + tracklength - total - nu-scatter-P3 - analog + scatter + tracklength - total - nu-scatter + flux analog - total - scatter + nu-scatter analog @@ -1147,37 +1143,38 @@ total - nu-fission + scatter-P3 analog - total - scatter + flux analog + total - flux - tracklength + nu-scatter-P3 + analog + total - scatter - tracklength + nu-scatter + analog total - scatter-P3 + scatter analog @@ -1185,16 +1182,39 @@ total flux - tracklength + analog + + + + total + nu-fission + analog + + + + + + total + scatter + analog + + + + + total + flux + tracklength + + total scatter tracklength - + @@ -1202,7 +1222,29 @@ scatter-P3 analog - + + + + total + flux + tracklength + + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -1210,7 +1252,7 @@ nu-scatter-0 analog - + @@ -1218,72 +1260,29 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - - - - - total - prompt-nu-fission - analog - - - - - total - prompt-nu-fission - analog - - - - - total - flux - tracklength - - - - - total - inverse-velocity - tracklength - - + total - flux - tracklength + nu-fission + analog - + total - prompt-nu-fission - tracklength + nu-fission + analog - + total - flux + prompt-nu-fission analog - total prompt-nu-fission @@ -1298,49 +1297,45 @@ - total - delayed-nu-fission + inverse-velocity tracklength - - + total - delayed-nu-fission - analog + flux + tracklength - - + total - delayed-nu-fission - analog + prompt-nu-fission + tracklength total - nu-fission - tracklength + flux + analog - + total - delayed-nu-fission - tracklength + prompt-nu-fission + analog - total - delayed-nu-fission + flux tracklength @@ -1348,17 +1343,64 @@ total - decay-rate + delayed-nu-fission tracklength + + + + total + delayed-nu-fission + analog + + + + + + total + delayed-nu-fission + analog + + + + + total + nu-fission + tracklength + + + + + + total + delayed-nu-fission + tracklength + + + + + + total + delayed-nu-fission + tracklength + + + + + + total + decay-rate + tracklength + + total flux analog - + diff --git a/tests/test_mgxs_library_condense/results_true.dat b/tests/test_mgxs_library_condense/results_true.dat index 1892a17f2..f69814444 100644 --- a/tests/test_mgxs_library_condense/results_true.dat +++ b/tests/test_mgxs_library_condense/results_true.dat @@ -1,9 +1,9 @@ material group in nuclide mean std. dev. 0 10000 1 total 0.453624 0.021053 - material group in nuclide mean std. dev. -0 10000 1 total 0.400852 0.022858 - material group in nuclide mean std. dev. -0 10000 1 total 0.400852 0.022858 + material group in nuclide mean std. dev. +0 10000 1 total 0.4074 0.021863 + material group in nuclide mean std. dev. +0 10000 1 total 0.4074 0.021863 material group in nuclide mean std. dev. 0 10000 1 total 0.064903 0.004313 material group in nuclide mean std. dev. @@ -92,9 +92,9 @@ material group in nuclide mean std. dev. 0 10001 1 total 0.311594 0.013793 material group in nuclide mean std. dev. -0 10001 1 total 0.279255 0.029189 +0 10001 1 total 0.280977 0.015683 material group in nuclide mean std. dev. -0 10001 1 total 0.279255 0.029189 +0 10001 1 total 0.280977 0.015683 material group in nuclide mean std. dev. 0 10001 1 total 0.00221 0.000286 material group in nuclide mean std. dev. @@ -183,9 +183,9 @@ material group in nuclide mean std. dev. 0 10002 1 total 0.904999 0.043964 material group in nuclide mean std. dev. -0 10002 1 total 0.499184 0.040914 +0 10002 1 total 0.494581 0.046763 material group in nuclide mean std. dev. -0 10002 1 total 0.499184 0.040914 +0 10002 1 total 0.494581 0.046763 material group in nuclide mean std. dev. 0 10002 1 total 0.00606 0.000555 material group in nuclide mean std. dev. diff --git a/tests/test_mgxs_library_distribcell/inputs_true.dat b/tests/test_mgxs_library_distribcell/inputs_true.dat index 8e68ca8f0..79862b8bc 100644 --- a/tests/test_mgxs_library_distribcell/inputs_true.dat +++ b/tests/test_mgxs_library_distribcell/inputs_true.dat @@ -96,56 +96,56 @@ total flux - analog + tracklength total total - analog + tracklength + + + total + flux + analog + + total scatter-1 analog - - - - total - flux - analog - total - total - analog + flux + tracklength - + total - nu-scatter-1 - analog + total + tracklength total flux - tracklength + analog - + total - absorption - tracklength + nu-scatter-1 + analog @@ -165,14 +165,14 @@ total - fission + flux tracklength total - flux + absorption tracklength @@ -193,7 +193,7 @@ total - nu-fission + fission tracklength @@ -207,7 +207,7 @@ total - kappa-fission + nu-fission tracklength @@ -221,7 +221,7 @@ total - scatter + kappa-fission tracklength @@ -229,14 +229,14 @@ total flux - analog + tracklength total - nu-scatter - analog + scatter + tracklength @@ -248,9 +248,8 @@ - total - scatter-P3 + nu-scatter analog @@ -265,15 +264,14 @@ total - nu-scatter-P3 + scatter-P3 analog - total - nu-scatter + flux analog @@ -281,14 +279,15 @@ total - scatter + nu-scatter-P3 analog + total - flux + nu-scatter analog @@ -296,54 +295,47 @@ total - nu-fission + scatter analog - total - scatter + flux analog + total - flux - tracklength + nu-fission + analog + total scatter - tracklength + analog - total - scatter-P3 - analog + flux + tracklength - - - total - flux - tracklength - - total scatter tracklength - + @@ -351,7 +343,29 @@ scatter-P3 analog + + + + total + flux + tracklength + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -359,7 +373,7 @@ nu-scatter-0 analog - + @@ -367,47 +381,33 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - total - prompt-nu-fission + nu-fission analog total - prompt-nu-fission + nu-fission analog total - flux - tracklength + prompt-nu-fission + analog - + total - inverse-velocity - tracklength + prompt-nu-fission + analog @@ -420,7 +420,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -428,9 +428,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -438,14 +452,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -453,7 +467,7 @@ delayed-nu-fission tracklength - + @@ -461,7 +475,7 @@ delayed-nu-fission analog - + @@ -469,45 +483,45 @@ delayed-nu-fission analog - + total nu-fission tracklength - - - - - total - delayed-nu-fission - tracklength - - - - - - total - delayed-nu-fission - tracklength - total - decay-rate + delayed-nu-fission tracklength + + + + total + delayed-nu-fission + tracklength + + + + + + total + decay-rate + tracklength + + total flux analog - + diff --git a/tests/test_mgxs_library_distribcell/results_true.dat b/tests/test_mgxs_library_distribcell/results_true.dat index e6ec539e6..e9277c975 100644 --- a/tests/test_mgxs_library_distribcell/results_true.dat +++ b/tests/test_mgxs_library_distribcell/results_true.dat @@ -1,9 +1,9 @@ sum(distribcell) group in nuclide mean std. dev. 0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 total 0.457353 0.010474 sum(distribcell) group in nuclide mean std. dev. -0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 total 0.405649 0.015784 +0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 total 0.410174 0.011573 sum(distribcell) group in nuclide mean std. dev. -0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 total 0.405641 0.015787 +0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 total 0.410166 0.011577 sum(distribcell) group in nuclide mean std. dev. 0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 total 0.066556 0.00251 sum(distribcell) group in nuclide mean std. dev. diff --git a/tests/test_mgxs_library_hdf5/inputs_true.dat b/tests/test_mgxs_library_hdf5/inputs_true.dat index f2a7c9025..79c7ea049 100644 --- a/tests/test_mgxs_library_hdf5/inputs_true.dat +++ b/tests/test_mgxs_library_hdf5/inputs_true.dat @@ -69,56 +69,56 @@ total flux - analog + tracklength total total - analog + tracklength + + + total + flux + analog + + total scatter-1 analog - - - - total - flux - analog - total - total - analog + flux + tracklength - + total - nu-scatter-1 - analog + total + tracklength total flux - tracklength + analog - + total - absorption - tracklength + nu-scatter-1 + analog @@ -138,14 +138,14 @@ total - fission + flux tracklength total - flux + absorption tracklength @@ -166,7 +166,7 @@ total - nu-fission + fission tracklength @@ -180,7 +180,7 @@ total - kappa-fission + nu-fission tracklength @@ -194,7 +194,7 @@ total - scatter + kappa-fission tracklength @@ -202,14 +202,14 @@ total flux - analog + tracklength total - nu-scatter - analog + scatter + tracklength @@ -221,9 +221,8 @@ - total - scatter-P3 + nu-scatter analog @@ -238,15 +237,14 @@ total - nu-scatter-P3 + scatter-P3 analog - total - nu-scatter + flux analog @@ -254,14 +252,15 @@ total - scatter + nu-scatter-P3 analog + total - flux + nu-scatter analog @@ -269,54 +268,47 @@ total - nu-fission + scatter analog - total - scatter + flux analog + total - flux - tracklength + nu-fission + analog + total scatter - tracklength + analog - total - scatter-P3 - analog + flux + tracklength - - - total - flux - tracklength - - total scatter tracklength - + @@ -324,7 +316,29 @@ scatter-P3 analog + + + + total + flux + tracklength + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -332,7 +346,7 @@ nu-scatter-0 analog - + @@ -340,47 +354,33 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - total - prompt-nu-fission + nu-fission analog total - prompt-nu-fission + nu-fission analog - + total - flux - tracklength + prompt-nu-fission + analog - + total - inverse-velocity - tracklength + prompt-nu-fission + analog @@ -393,7 +393,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -401,9 +401,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -411,14 +425,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -426,7 +440,7 @@ delayed-nu-fission tracklength - + @@ -434,7 +448,7 @@ delayed-nu-fission analog - + @@ -442,45 +456,45 @@ delayed-nu-fission analog - + total nu-fission tracklength - - - - - total - delayed-nu-fission - tracklength - - - - - - total - delayed-nu-fission - tracklength - total - decay-rate + delayed-nu-fission tracklength + + + + total + delayed-nu-fission + tracklength + + + + + + total + decay-rate + tracklength + + total flux analog - + @@ -489,60 +503,46 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - total flux - analog + tracklength total total - analog + tracklength - + total - scatter-1 - analog + flux + tracklength + + + total + total + tracklength + + total flux analog - - - - total - total - analog - total - nu-scatter-1 + scatter-1 analog @@ -556,7 +556,7 @@ total - absorption + total tracklength @@ -564,48 +564,48 @@ total flux - tracklength + analog - + total - absorption - tracklength + nu-scatter-1 + analog total - fission + flux tracklength total - flux + absorption tracklength total - fission + flux tracklength total - flux + absorption tracklength total - nu-fission + fission tracklength @@ -619,7 +619,7 @@ total - kappa-fission + fission tracklength @@ -633,7 +633,7 @@ total - scatter + nu-fission tracklength @@ -641,29 +641,28 @@ total flux - analog + tracklength total - nu-scatter - analog + kappa-fission + tracklength total flux - analog + tracklength - total - scatter-P3 - analog + scatter + tracklength @@ -675,17 +674,15 @@ - total - nu-scatter-P3 + nu-scatter analog - total - nu-scatter + flux analog @@ -693,7 +690,7 @@ total - scatter + scatter-P3 analog @@ -708,7 +705,7 @@ total - nu-fission + nu-scatter-P3 analog @@ -716,46 +713,55 @@ total - scatter + nu-scatter analog + total - flux - tracklength + scatter + analog total - scatter - tracklength + flux + analog total - scatter-P3 + nu-fission analog + + + + total + scatter + analog + + total flux tracklength - + total scatter tracklength - + @@ -763,7 +769,29 @@ scatter-P3 analog - + + + + total + flux + tracklength + + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -771,7 +799,7 @@ nu-scatter-0 analog - + @@ -779,76 +807,47 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - - - - - total - prompt-nu-fission - analog - - - - - total - prompt-nu-fission - analog - - + total - flux - tracklength + nu-fission + analog - + total - inverse-velocity - tracklength + nu-fission + analog - + total - flux - tracklength + prompt-nu-fission + analog - + total prompt-nu-fission - tracklength + analog total flux - analog + tracklength - total - prompt-nu-fission - analog + inverse-velocity + tracklength @@ -859,33 +858,31 @@ - total - delayed-nu-fission + prompt-nu-fission tracklength - - + total - delayed-nu-fission + flux analog - + total - delayed-nu-fission + prompt-nu-fission analog total - nu-fission + flux tracklength @@ -897,6 +894,29 @@ tracklength + + + + total + delayed-nu-fission + analog + + + + + + total + delayed-nu-fission + analog + + + + + total + nu-fission + tracklength + + @@ -904,7 +924,15 @@ delayed-nu-fission tracklength - + + + + + total + delayed-nu-fission + tracklength + + @@ -912,14 +940,14 @@ decay-rate tracklength - + total flux analog - + @@ -928,75 +956,47 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - - - - - total - flux - analog - - - - - total - total - analog - - + total - scatter-1 - analog + flux + tracklength total - flux - analog + total + tracklength total - total - analog + flux + tracklength - + total - nu-scatter-1 - analog + total + tracklength total flux - tracklength + analog - + total - absorption - tracklength + scatter-1 + analog @@ -1009,56 +1009,56 @@ total - absorption + total tracklength total - fission - tracklength + flux + analog - + total - flux - tracklength + nu-scatter-1 + analog total - fission + flux tracklength total - flux + absorption tracklength total - nu-fission + flux tracklength total - flux + absorption tracklength total - kappa-fission + fission tracklength @@ -1072,7 +1072,7 @@ total - scatter + fission tracklength @@ -1080,59 +1080,55 @@ total flux - analog + tracklength total - nu-scatter - analog + nu-fission + tracklength total flux - analog + tracklength - total - scatter-P3 - analog + kappa-fission + tracklength total flux - analog + tracklength - total - nu-scatter-P3 - analog + scatter + tracklength - total - nu-scatter + flux analog - total - scatter + nu-scatter analog @@ -1147,37 +1143,38 @@ total - nu-fission + scatter-P3 analog - total - scatter + flux analog + total - flux - tracklength + nu-scatter-P3 + analog + total - scatter - tracklength + nu-scatter + analog total - scatter-P3 + scatter analog @@ -1185,16 +1182,39 @@ total flux - tracklength + analog + + + + total + nu-fission + analog + + + + + + total + scatter + analog + + + + + total + flux + tracklength + + total scatter tracklength - + @@ -1202,7 +1222,29 @@ scatter-P3 analog - + + + + total + flux + tracklength + + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -1210,7 +1252,7 @@ nu-scatter-0 analog - + @@ -1218,72 +1260,29 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - - - - - total - prompt-nu-fission - analog - - - - - total - prompt-nu-fission - analog - - - - - total - flux - tracklength - - - - - total - inverse-velocity - tracklength - - + total - flux - tracklength + nu-fission + analog - + total - prompt-nu-fission - tracklength + nu-fission + analog - + total - flux + prompt-nu-fission analog - total prompt-nu-fission @@ -1298,49 +1297,45 @@ - total - delayed-nu-fission + inverse-velocity tracklength - - + total - delayed-nu-fission - analog + flux + tracklength - - + total - delayed-nu-fission - analog + prompt-nu-fission + tracklength total - nu-fission - tracklength + flux + analog - + total - delayed-nu-fission - tracklength + prompt-nu-fission + analog - total - delayed-nu-fission + flux tracklength @@ -1348,17 +1343,64 @@ total - decay-rate + delayed-nu-fission tracklength + + + + total + delayed-nu-fission + analog + + + + + + total + delayed-nu-fission + analog + + + + + total + nu-fission + tracklength + + + + + + total + delayed-nu-fission + tracklength + + + + + + total + delayed-nu-fission + tracklength + + + + + + total + decay-rate + tracklength + + total flux analog - + diff --git a/tests/test_mgxs_library_hdf5/results_true.dat b/tests/test_mgxs_library_hdf5/results_true.dat index 282ffeb89..f3426cd40 100644 --- a/tests/test_mgxs_library_hdf5/results_true.dat +++ b/tests/test_mgxs_library_hdf5/results_true.dat @@ -2,11 +2,11 @@ domain=10000 type=total [4.14825464e-01 6.60169863e-01] [2.27929105e-02 4.75188999e-02] domain=10000 type=transport -[3.56859612e-01 6.47647614e-01] -[2.54935937e-02 2.37037335e-02] +[3.63092031e-01 6.44850709e-01] +[2.38384843e-02 4.76746408e-02] domain=10000 type=nu-transport -[3.56859612e-01 6.47647614e-01] -[2.54935937e-02 2.37037335e-02] +[3.63092031e-01 6.44850709e-01] +[2.38384843e-02 4.76746408e-02] domain=10000 type=absorption [2.74078431e-02 2.64510714e-01] [2.69249666e-03 2.33670618e-02] @@ -195,11 +195,11 @@ domain=10001 type=total [3.13737666e-01 3.00821380e-01] [1.55819223e-02 2.80524816e-02] domain=10001 type=transport -[2.73227852e-01 3.12374814e-01] -[3.31153641e-02 4.96058281e-02] +[2.75508079e-01 3.12035015e-01] +[1.77418855e-02 3.23843473e-02] domain=10001 type=nu-transport -[2.73227852e-01 3.12374814e-01] -[3.31153641e-02 4.96058281e-02] +[2.75508079e-01 3.12035015e-01] +[1.77418855e-02 3.23843473e-02] domain=10001 type=absorption [1.57499139e-03 5.40037826e-03] [3.22547919e-04 6.18139027e-04] @@ -388,11 +388,11 @@ domain=10002 type=total [6.64572195e-01 2.05238389e+00] [3.12147473e-02 2.24342891e-01] domain=10002 type=transport -[2.90565237e-01 1.51643790e+00] -[2.38518529e-02 2.35197252e-01] +[2.83322749e-01 1.49973953e+00] +[3.52061127e-02 2.30902118e-01] domain=10002 type=nu-transport -[2.90565237e-01 1.51643790e+00] -[2.38518529e-02 2.35197252e-01] +[2.83322749e-01 1.49973953e+00] +[3.52061127e-02 2.30902118e-01] domain=10002 type=absorption [6.90399495e-04 3.16872549e-02] [4.41475663e-05 3.74655831e-03] diff --git a/tests/test_mgxs_library_mesh/inputs_true.dat b/tests/test_mgxs_library_mesh/inputs_true.dat index b806bec91..b0db8a9c4 100644 --- a/tests/test_mgxs_library_mesh/inputs_true.dat +++ b/tests/test_mgxs_library_mesh/inputs_true.dat @@ -333,56 +333,56 @@ total flux - analog + tracklength total total - analog + tracklength + + + total + flux + analog + + total scatter-1 analog - - - - total - flux - analog - total - total - analog + flux + tracklength - + total - nu-scatter-1 - analog + total + tracklength total flux - tracklength + analog - + total - absorption - tracklength + nu-scatter-1 + analog @@ -402,14 +402,14 @@ total - fission + flux tracklength total - flux + absorption tracklength @@ -430,7 +430,7 @@ total - nu-fission + fission tracklength @@ -444,7 +444,7 @@ total - kappa-fission + nu-fission tracklength @@ -458,7 +458,7 @@ total - scatter + kappa-fission tracklength @@ -466,14 +466,14 @@ total flux - analog + tracklength total - nu-scatter - analog + scatter + tracklength @@ -485,9 +485,8 @@ - total - scatter-P3 + nu-scatter analog @@ -502,15 +501,14 @@ total - nu-scatter-P3 + scatter-P3 analog - total - nu-scatter + flux analog @@ -518,14 +516,15 @@ total - scatter + nu-scatter-P3 analog + total - flux + nu-scatter analog @@ -533,54 +532,47 @@ total - nu-fission + scatter analog - total - scatter + flux analog + total - flux - tracklength + nu-fission + analog + total scatter - tracklength + analog - total - scatter-P3 - analog + flux + tracklength - - - total - flux - tracklength - - total scatter tracklength - + @@ -588,7 +580,29 @@ scatter-P3 analog + + + + total + flux + tracklength + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -596,7 +610,7 @@ nu-scatter-0 analog - + @@ -604,47 +618,33 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - total - prompt-nu-fission + nu-fission analog total - prompt-nu-fission + nu-fission analog total - flux - tracklength + prompt-nu-fission + analog - + total - inverse-velocity - tracklength + prompt-nu-fission + analog @@ -657,7 +657,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -665,9 +665,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -675,14 +689,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -690,7 +704,7 @@ delayed-nu-fission tracklength - + @@ -698,7 +712,7 @@ delayed-nu-fission analog - + @@ -706,45 +720,45 @@ delayed-nu-fission analog - + total nu-fission tracklength - - - - - total - delayed-nu-fission - tracklength - - - - - - total - delayed-nu-fission - tracklength - total - decay-rate + delayed-nu-fission tracklength + + + + total + delayed-nu-fission + tracklength + + + + + + total + decay-rate + tracklength + + total flux analog - + diff --git a/tests/test_mgxs_library_mesh/results_true.dat b/tests/test_mgxs_library_mesh/results_true.dat index fd4c972e2..527c91d66 100644 --- a/tests/test_mgxs_library_mesh/results_true.dat +++ b/tests/test_mgxs_library_mesh/results_true.dat @@ -6,16 +6,16 @@ 3 2 2 1 1 total 0.641095 0.091519 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.413423 0.087250 -1 1 2 1 1 total 0.392074 0.244272 -2 2 1 1 1 total 0.458841 0.087921 -3 2 2 1 1 total 0.403898 0.074343 +0 1 1 1 1 total 0.407867 0.104648 +1 1 2 1 1 total 0.417805 0.300173 +2 2 1 1 1 total 0.451699 0.087229 +3 2 2 1 1 total 0.396449 0.095884 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.413423 0.087250 -1 1 2 1 1 total 0.392074 0.244272 -2 2 1 1 1 total 0.458841 0.087921 -3 2 2 1 1 total 0.403898 0.074343 +0 1 1 1 1 total 0.407867 0.104648 +1 1 2 1 1 total 0.417805 0.300173 +2 2 1 1 1 total 0.451699 0.087229 +3 2 2 1 1 total 0.396449 0.095884 mesh 1 group in nuclide mean std. dev. x y z 0 1 1 1 1 total 0.021476 0.004248 diff --git a/tests/test_mgxs_library_no_nuclides/inputs_true.dat b/tests/test_mgxs_library_no_nuclides/inputs_true.dat index f2a7c9025..79c7ea049 100644 --- a/tests/test_mgxs_library_no_nuclides/inputs_true.dat +++ b/tests/test_mgxs_library_no_nuclides/inputs_true.dat @@ -69,56 +69,56 @@ total flux - analog + tracklength total total - analog + tracklength + + + total + flux + analog + + total scatter-1 analog - - - - total - flux - analog - total - total - analog + flux + tracklength - + total - nu-scatter-1 - analog + total + tracklength total flux - tracklength + analog - + total - absorption - tracklength + nu-scatter-1 + analog @@ -138,14 +138,14 @@ total - fission + flux tracklength total - flux + absorption tracklength @@ -166,7 +166,7 @@ total - nu-fission + fission tracklength @@ -180,7 +180,7 @@ total - kappa-fission + nu-fission tracklength @@ -194,7 +194,7 @@ total - scatter + kappa-fission tracklength @@ -202,14 +202,14 @@ total flux - analog + tracklength total - nu-scatter - analog + scatter + tracklength @@ -221,9 +221,8 @@ - total - scatter-P3 + nu-scatter analog @@ -238,15 +237,14 @@ total - nu-scatter-P3 + scatter-P3 analog - total - nu-scatter + flux analog @@ -254,14 +252,15 @@ total - scatter + nu-scatter-P3 analog + total - flux + nu-scatter analog @@ -269,54 +268,47 @@ total - nu-fission + scatter analog - total - scatter + flux analog + total - flux - tracklength + nu-fission + analog + total scatter - tracklength + analog - total - scatter-P3 - analog + flux + tracklength - - - total - flux - tracklength - - total scatter tracklength - + @@ -324,7 +316,29 @@ scatter-P3 analog + + + + total + flux + tracklength + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -332,7 +346,7 @@ nu-scatter-0 analog - + @@ -340,47 +354,33 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - total - prompt-nu-fission + nu-fission analog total - prompt-nu-fission + nu-fission analog - + total - flux - tracklength + prompt-nu-fission + analog - + total - inverse-velocity - tracklength + prompt-nu-fission + analog @@ -393,7 +393,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -401,9 +401,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -411,14 +425,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -426,7 +440,7 @@ delayed-nu-fission tracklength - + @@ -434,7 +448,7 @@ delayed-nu-fission analog - + @@ -442,45 +456,45 @@ delayed-nu-fission analog - + total nu-fission tracklength - - - - - total - delayed-nu-fission - tracklength - - - - - - total - delayed-nu-fission - tracklength - total - decay-rate + delayed-nu-fission tracklength + + + + total + delayed-nu-fission + tracklength + + + + + + total + decay-rate + tracklength + + total flux analog - + @@ -489,60 +503,46 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - total flux - analog + tracklength total total - analog + tracklength - + total - scatter-1 - analog + flux + tracklength + + + total + total + tracklength + + total flux analog - - - - total - total - analog - total - nu-scatter-1 + scatter-1 analog @@ -556,7 +556,7 @@ total - absorption + total tracklength @@ -564,48 +564,48 @@ total flux - tracklength + analog - + total - absorption - tracklength + nu-scatter-1 + analog total - fission + flux tracklength total - flux + absorption tracklength total - fission + flux tracklength total - flux + absorption tracklength total - nu-fission + fission tracklength @@ -619,7 +619,7 @@ total - kappa-fission + fission tracklength @@ -633,7 +633,7 @@ total - scatter + nu-fission tracklength @@ -641,29 +641,28 @@ total flux - analog + tracklength total - nu-scatter - analog + kappa-fission + tracklength total flux - analog + tracklength - total - scatter-P3 - analog + scatter + tracklength @@ -675,17 +674,15 @@ - total - nu-scatter-P3 + nu-scatter analog - total - nu-scatter + flux analog @@ -693,7 +690,7 @@ total - scatter + scatter-P3 analog @@ -708,7 +705,7 @@ total - nu-fission + nu-scatter-P3 analog @@ -716,46 +713,55 @@ total - scatter + nu-scatter analog + total - flux - tracklength + scatter + analog total - scatter - tracklength + flux + analog total - scatter-P3 + nu-fission analog + + + + total + scatter + analog + + total flux tracklength - + total scatter tracklength - + @@ -763,7 +769,29 @@ scatter-P3 analog - + + + + total + flux + tracklength + + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -771,7 +799,7 @@ nu-scatter-0 analog - + @@ -779,76 +807,47 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - - - - - total - prompt-nu-fission - analog - - - - - total - prompt-nu-fission - analog - - + total - flux - tracklength + nu-fission + analog - + total - inverse-velocity - tracklength + nu-fission + analog - + total - flux - tracklength + prompt-nu-fission + analog - + total prompt-nu-fission - tracklength + analog total flux - analog + tracklength - total - prompt-nu-fission - analog + inverse-velocity + tracklength @@ -859,33 +858,31 @@ - total - delayed-nu-fission + prompt-nu-fission tracklength - - + total - delayed-nu-fission + flux analog - + total - delayed-nu-fission + prompt-nu-fission analog total - nu-fission + flux tracklength @@ -897,6 +894,29 @@ tracklength + + + + total + delayed-nu-fission + analog + + + + + + total + delayed-nu-fission + analog + + + + + total + nu-fission + tracklength + + @@ -904,7 +924,15 @@ delayed-nu-fission tracklength - + + + + + total + delayed-nu-fission + tracklength + + @@ -912,14 +940,14 @@ decay-rate tracklength - + total flux analog - + @@ -928,75 +956,47 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - - - - - total - flux - analog - - - - - total - total - analog - - + total - scatter-1 - analog + flux + tracklength total - flux - analog + total + tracklength total - total - analog + flux + tracklength - + total - nu-scatter-1 - analog + total + tracklength total flux - tracklength + analog - + total - absorption - tracklength + scatter-1 + analog @@ -1009,56 +1009,56 @@ total - absorption + total tracklength total - fission - tracklength + flux + analog - + total - flux - tracklength + nu-scatter-1 + analog total - fission + flux tracklength total - flux + absorption tracklength total - nu-fission + flux tracklength total - flux + absorption tracklength total - kappa-fission + fission tracklength @@ -1072,7 +1072,7 @@ total - scatter + fission tracklength @@ -1080,59 +1080,55 @@ total flux - analog + tracklength total - nu-scatter - analog + nu-fission + tracklength total flux - analog + tracklength - total - scatter-P3 - analog + kappa-fission + tracklength total flux - analog + tracklength - total - nu-scatter-P3 - analog + scatter + tracklength - total - nu-scatter + flux analog - total - scatter + nu-scatter analog @@ -1147,37 +1143,38 @@ total - nu-fission + scatter-P3 analog - total - scatter + flux analog + total - flux - tracklength + nu-scatter-P3 + analog + total - scatter - tracklength + nu-scatter + analog total - scatter-P3 + scatter analog @@ -1185,16 +1182,39 @@ total flux - tracklength + analog + + + + total + nu-fission + analog + + + + + + total + scatter + analog + + + + + total + flux + tracklength + + total scatter tracklength - + @@ -1202,7 +1222,29 @@ scatter-P3 analog - + + + + total + flux + tracklength + + + + + total + scatter + tracklength + + + + + + total + scatter-P3 + analog + + @@ -1210,7 +1252,7 @@ nu-scatter-0 analog - + @@ -1218,72 +1260,29 @@ scatter-0 analog - - - - total - nu-fission - analog - - - - - total - nu-fission - analog - - - - - total - prompt-nu-fission - analog - - - - - total - prompt-nu-fission - analog - - - - - total - flux - tracklength - - - - - total - inverse-velocity - tracklength - - + total - flux - tracklength + nu-fission + analog - + total - prompt-nu-fission - tracklength + nu-fission + analog - + total - flux + prompt-nu-fission analog - total prompt-nu-fission @@ -1298,49 +1297,45 @@ - total - delayed-nu-fission + inverse-velocity tracklength - - + total - delayed-nu-fission - analog + flux + tracklength - - + total - delayed-nu-fission - analog + prompt-nu-fission + tracklength total - nu-fission - tracklength + flux + analog - + total - delayed-nu-fission - tracklength + prompt-nu-fission + analog - total - delayed-nu-fission + flux tracklength @@ -1348,17 +1343,64 @@ total - decay-rate + delayed-nu-fission tracklength + + + + total + delayed-nu-fission + analog + + + + + + total + delayed-nu-fission + analog + + + + + total + nu-fission + tracklength + + + + + + total + delayed-nu-fission + tracklength + + + + + + total + delayed-nu-fission + tracklength + + + + + + total + decay-rate + tracklength + + total flux analog - + diff --git a/tests/test_mgxs_library_no_nuclides/results_true.dat b/tests/test_mgxs_library_no_nuclides/results_true.dat index 85dc93377..e3481ce4e 100644 --- a/tests/test_mgxs_library_no_nuclides/results_true.dat +++ b/tests/test_mgxs_library_no_nuclides/results_true.dat @@ -2,11 +2,11 @@ 1 10000 1 total 0.414825 0.022793 0 10000 2 total 0.660170 0.047519 material group in nuclide mean std. dev. -1 10000 1 total 0.356860 0.025494 -0 10000 2 total 0.647648 0.023704 +1 10000 1 total 0.363092 0.023838 +0 10000 2 total 0.644851 0.047675 material group in nuclide mean std. dev. -1 10000 1 total 0.356860 0.025494 -0 10000 2 total 0.647648 0.023704 +1 10000 1 total 0.363092 0.023838 +0 10000 2 total 0.644851 0.047675 material group in nuclide mean std. dev. 1 10000 1 total 0.027408 0.002692 0 10000 2 total 0.264511 0.023367 @@ -209,11 +209,11 @@ 1 10001 1 total 0.313738 0.015582 0 10001 2 total 0.300821 0.028052 material group in nuclide mean std. dev. -1 10001 1 total 0.273228 0.033115 -0 10001 2 total 0.312375 0.049606 +1 10001 1 total 0.275508 0.017742 +0 10001 2 total 0.312035 0.032384 material group in nuclide mean std. dev. -1 10001 1 total 0.273228 0.033115 -0 10001 2 total 0.312375 0.049606 +1 10001 1 total 0.275508 0.017742 +0 10001 2 total 0.312035 0.032384 material group in nuclide mean std. dev. 1 10001 1 total 0.001575 0.000323 0 10001 2 total 0.005400 0.000618 @@ -416,11 +416,11 @@ 1 10002 1 total 0.664572 0.031215 0 10002 2 total 2.052384 0.224343 material group in nuclide mean std. dev. -1 10002 1 total 0.290565 0.023852 -0 10002 2 total 1.516438 0.235197 +1 10002 1 total 0.283323 0.035206 +0 10002 2 total 1.499740 0.230902 material group in nuclide mean std. dev. -1 10002 1 total 0.290565 0.023852 -0 10002 2 total 1.516438 0.235197 +1 10002 1 total 0.283323 0.035206 +0 10002 2 total 1.499740 0.230902 material group in nuclide mean std. dev. 1 10002 1 total 0.000690 0.000044 0 10002 2 total 0.031687 0.003747 diff --git a/tests/test_mgxs_library_nuclides/inputs_true.dat b/tests/test_mgxs_library_nuclides/inputs_true.dat index 8d7cf5fb8..89541b4d5 100644 --- a/tests/test_mgxs_library_nuclides/inputs_true.dat +++ b/tests/test_mgxs_library_nuclides/inputs_true.dat @@ -69,56 +69,56 @@ total flux - analog + tracklength U234 U235 U238 O16 total - analog + tracklength + + + total + flux + analog + + U234 U235 U238 O16 scatter-1 analog - + total flux - analog + tracklength - + U234 U235 U238 O16 total - analog - - - - - U234 U235 U238 O16 - nu-scatter-1 - analog + tracklength total flux - tracklength + analog - + U234 U235 U238 O16 - absorption - tracklength + nu-scatter-1 + analog @@ -137,15 +137,15 @@ - U234 U235 U238 O16 - fission + total + flux tracklength - total - flux + U234 U235 U238 O16 + absorption tracklength @@ -166,7 +166,7 @@ U234 U235 U238 O16 - nu-fission + fission tracklength @@ -180,7 +180,7 @@ U234 U235 U238 O16 - kappa-fission + nu-fission tracklength @@ -194,7 +194,7 @@ U234 U235 U238 O16 - scatter + kappa-fission tracklength @@ -202,14 +202,14 @@ total flux - analog + tracklength U234 U235 U238 O16 - nu-scatter - analog + scatter + tracklength @@ -221,9 +221,8 @@ - U234 U235 U238 O16 - scatter-P3 + nu-scatter analog @@ -238,15 +237,14 @@ U234 U235 U238 O16 - nu-scatter-P3 + scatter-P3 analog - - U234 U235 U238 O16 - nu-scatter + total + flux analog @@ -254,14 +252,15 @@ U234 U235 U238 O16 - scatter + nu-scatter-P3 analog - total - flux + + U234 U235 U238 O16 + nu-scatter analog @@ -269,54 +268,69 @@ U234 U235 U238 O16 - nu-fission + scatter analog - - U234 U235 U238 O16 - scatter + total + flux analog - total - flux - tracklength + + U234 U235 U238 O16 + nu-fission + analog + U234 U235 U238 O16 scatter - tracklength + analog - - U234 U235 U238 O16 - scatter-P3 - analog + total + flux + tracklength - total - flux + U234 U235 U238 O16 + scatter tracklength + + + + U234 U235 U238 O16 + scatter-P3 + analog + + + + + total + flux + tracklength + + U234 U235 U238 O16 scatter tracklength - + @@ -324,7 +338,7 @@ scatter-P3 analog - + @@ -332,7 +346,7 @@ nu-scatter-0 analog - + @@ -340,47 +354,33 @@ scatter-0 analog - - - - U234 U235 U238 O16 - nu-fission - analog - - - - - U234 U235 U238 O16 - nu-fission - analog - U234 U235 U238 O16 - prompt-nu-fission + nu-fission analog U234 U235 U238 O16 - prompt-nu-fission + nu-fission analog - - total - flux - tracklength + + U234 U235 U238 O16 + prompt-nu-fission + analog - + U234 U235 U238 O16 - inverse-velocity - tracklength + prompt-nu-fission + analog @@ -393,7 +393,7 @@ U234 U235 U238 O16 - prompt-nu-fission + inverse-velocity tracklength @@ -401,9 +401,23 @@ total flux - analog + tracklength + + + U234 U235 U238 O16 + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -411,60 +425,46 @@ prompt-nu-fission analog - - - - total - flux - tracklength - - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - total - tracklength - total flux - analog + tracklength Zr90 Zr91 Zr92 Zr94 Zr96 total - analog + tracklength - - Zr90 Zr91 Zr92 Zr94 Zr96 - scatter-1 - analog + + total + flux + tracklength + + + Zr90 Zr91 Zr92 Zr94 Zr96 + total + tracklength + + total flux analog - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - total - analog - Zr90 Zr91 Zr92 Zr94 Zr96 - nu-scatter-1 + scatter-1 analog @@ -478,7 +478,7 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - absorption + total tracklength @@ -486,48 +486,48 @@ total flux - tracklength + analog + + + Zr90 Zr91 Zr92 Zr94 Zr96 + nu-scatter-1 + analog + + + + + total + flux + tracklength + + Zr90 Zr91 Zr92 Zr94 Zr96 absorption tracklength - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - fission - tracklength - - + total flux tracklength - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - fission - tracklength - - total - flux + Zr90 Zr91 Zr92 Zr94 Zr96 + absorption tracklength Zr90 Zr91 Zr92 Zr94 Zr96 - nu-fission + fission tracklength @@ -541,7 +541,7 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - kappa-fission + fission tracklength @@ -555,7 +555,7 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - scatter + nu-fission tracklength @@ -563,29 +563,28 @@ total flux - analog + tracklength Zr90 Zr91 Zr92 Zr94 Zr96 - nu-scatter - analog + kappa-fission + tracklength total flux - analog + tracklength - Zr90 Zr91 Zr92 Zr94 Zr96 - scatter-P3 - analog + scatter + tracklength @@ -597,17 +596,15 @@ - Zr90 Zr91 Zr92 Zr94 Zr96 - nu-scatter-P3 + nu-scatter analog - - Zr90 Zr91 Zr92 Zr94 Zr96 - nu-scatter + total + flux analog @@ -615,7 +612,7 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - scatter + scatter-P3 analog @@ -630,7 +627,7 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - nu-fission + nu-scatter-P3 analog @@ -638,46 +635,55 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - scatter + nu-scatter analog - total - flux - tracklength + + Zr90 Zr91 Zr92 Zr94 Zr96 + scatter + analog - Zr90 Zr91 Zr92 Zr94 Zr96 - scatter - tracklength + total + flux + analog Zr90 Zr91 Zr92 Zr94 Zr96 - scatter-P3 + nu-fission analog + + + + Zr90 Zr91 Zr92 Zr94 Zr96 + scatter + analog + + total flux tracklength - + Zr90 Zr91 Zr92 Zr94 Zr96 scatter tracklength - + @@ -685,7 +691,29 @@ scatter-P3 analog - + + + + total + flux + tracklength + + + + + Zr90 Zr91 Zr92 Zr94 Zr96 + scatter + tracklength + + + + + + Zr90 Zr91 Zr92 Zr94 Zr96 + scatter-P3 + analog + + @@ -693,7 +721,7 @@ nu-scatter-0 analog - + @@ -701,70 +729,70 @@ scatter-0 analog - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - nu-fission - analog - - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - nu-fission - analog - - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - prompt-nu-fission - analog - - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - prompt-nu-fission - analog - - - total - flux - tracklength + + Zr90 Zr91 Zr92 Zr94 Zr96 + nu-fission + analog - + Zr90 Zr91 Zr92 Zr94 Zr96 - inverse-velocity - tracklength + nu-fission + analog - - total - flux - tracklength + + Zr90 Zr91 Zr92 Zr94 Zr96 + prompt-nu-fission + analog - + Zr90 Zr91 Zr92 Zr94 Zr96 prompt-nu-fission - tracklength + analog total flux - analog + tracklength + + + Zr90 Zr91 Zr92 Zr94 Zr96 + inverse-velocity + tracklength + + + + + total + flux + tracklength + + + + + Zr90 Zr91 Zr92 Zr94 Zr96 + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -772,75 +800,47 @@ prompt-nu-fission analog - - - - total - flux - tracklength - - - - - H1 O16 B10 B11 - total - tracklength - - - - - total - flux - analog - - - - - H1 O16 B10 B11 - total - analog - - - H1 O16 B10 B11 - scatter-1 - analog + + total + flux + tracklength - total - flux - analog + H1 O16 B10 B11 + total + tracklength - H1 O16 B10 B11 - total - analog + total + flux + tracklength - + H1 O16 B10 B11 - nu-scatter-1 - analog + total + tracklength total flux - tracklength + analog - + H1 O16 B10 B11 - absorption - tracklength + scatter-1 + analog @@ -853,56 +853,56 @@ H1 O16 B10 B11 - absorption + total tracklength - H1 O16 B10 B11 - fission - tracklength + total + flux + analog - - total - flux - tracklength + + H1 O16 B10 B11 + nu-scatter-1 + analog - H1 O16 B10 B11 - fission + total + flux tracklength - total - flux + H1 O16 B10 B11 + absorption tracklength - H1 O16 B10 B11 - nu-fission + total + flux tracklength - total - flux + H1 O16 B10 B11 + absorption tracklength H1 O16 B10 B11 - kappa-fission + fission tracklength @@ -916,7 +916,7 @@ H1 O16 B10 B11 - scatter + fission tracklength @@ -924,59 +924,55 @@ total flux - analog + tracklength H1 O16 B10 B11 - nu-scatter - analog + nu-fission + tracklength total flux - analog + tracklength - H1 O16 B10 B11 - scatter-P3 - analog + kappa-fission + tracklength total flux - analog + tracklength - H1 O16 B10 B11 - nu-scatter-P3 - analog + scatter + tracklength - - H1 O16 B10 B11 - nu-scatter + total + flux analog - H1 O16 B10 B11 - scatter + nu-scatter analog @@ -991,37 +987,38 @@ H1 O16 B10 B11 - nu-fission + scatter-P3 analog - - H1 O16 B10 B11 - scatter + total + flux analog - total - flux - tracklength + + H1 O16 B10 B11 + nu-scatter-P3 + analog + H1 O16 B10 B11 - scatter - tracklength + nu-scatter + analog H1 O16 B10 B11 - scatter-P3 + scatter analog @@ -1029,16 +1026,39 @@ total flux - tracklength + analog + + + + H1 O16 B10 B11 + nu-fission + analog + + + + + + H1 O16 B10 B11 + scatter + analog + + + + + total + flux + tracklength + + H1 O16 B10 B11 scatter tracklength - + @@ -1046,7 +1066,29 @@ scatter-P3 analog - + + + + total + flux + tracklength + + + + + H1 O16 B10 B11 + scatter + tracklength + + + + + + H1 O16 B10 B11 + scatter-P3 + analog + + @@ -1054,7 +1096,7 @@ nu-scatter-0 analog - + @@ -1062,70 +1104,70 @@ scatter-0 analog - + H1 O16 B10 B11 nu-fission analog - + H1 O16 B10 B11 nu-fission analog - + H1 O16 B10 B11 prompt-nu-fission analog - + H1 O16 B10 B11 prompt-nu-fission analog - + total flux tracklength - + H1 O16 B10 B11 inverse-velocity tracklength - + total flux tracklength - + H1 O16 B10 B11 prompt-nu-fission tracklength - + total flux analog - + diff --git a/tests/test_mgxs_library_nuclides/results_true.dat b/tests/test_mgxs_library_nuclides/results_true.dat index 243adc368..c521a1a55 100644 --- a/tests/test_mgxs_library_nuclides/results_true.dat +++ b/tests/test_mgxs_library_nuclides/results_true.dat @@ -1 +1 @@ -5df54054ab37cd69b7096b9f785be57a83a8c3872d3e065ff605aa6de5688640a5551f99313a3e60a9ab8f902c1d4927630e1838db26a2a09d41e29338634b43 \ No newline at end of file +107576b21fa8ed72f71ac65866e4ad1100cc62df527f6f4e6bb8a6318f3694614b6ba1c72634b2e97474a75ea1b3112dcb9b4b36e58f0417e5b04aee5d3c7570 \ No newline at end of file