diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index b0e383bc07..2e7b7afdab 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -733,12 +733,12 @@ class MGXS(object): mgxs = ScatterProbabilityMatrix(domain, domain_type, energy_groups) elif mgxs_type == 'nu-scatter probability matrix': mgxs = ScatterProbabilityMatrix( - domain, domain_type, energy_groups, nu=False) + domain, domain_type, energy_groups, nu=True) elif mgxs_type == 'consistent scatter matrix': mgxs = ConsistentScatterMatrixXS(domain, domain_type, energy_groups) elif mgxs_type == 'consistent nu-scatter matrix': mgxs = ConsistentScatterMatrixXS( - domain, domain_type, energy_groups, nu=False) + domain, domain_type, energy_groups, nu=True) elif mgxs_type == 'nu-fission matrix': mgxs = NuFissionMatrixXS(domain, domain_type, energy_groups) elif mgxs_type == 'chi': @@ -4694,7 +4694,7 @@ class ScatterProbabilityMatrix(MatrixMGXS): self.nu = nu def __deepcopy__(self, memo): - clone = super(ScatterProbabilityMatrixXS, self).__deepcopy__(memo) + clone = super(ScatterProbabilityMatrix, self).__deepcopy__(memo) clone._nu = self.nu return clone @@ -5057,15 +5057,13 @@ class ConvolvedMGXS(MGXS): # Override the domain object that loaded from an OpenMC summary file # NOTE: This is necessary for micro cross-sections which require # the isotopic number densities as computed by OpenMC - if self.domain_type == 'cell' or self.domain_type == 'distribcell': - all_cells = statepoint.summary.geometry.get_all_cells() - self.domain = all_cells[self.domain.id] + geom = statepoint.summary.geometry + if self.domain_type in ('cell', 'distribcell'): + self.domain = geom.get_all_cells()[self.domain.id] elif self.domain_type == 'universe': - all_univs = statepoint.summary.get_all_universes() - self.domain = all_univs[self.domain.id] + self.domain = geom.get_all_universes()[self.domain.id] elif self.domain_type == 'material': - all_mats = statepoint.summary.get_all_materials() - self.domain = all_mats[self.domain.id] + self.domain = geom.get_all_materials()[self.domain.id] elif self.domain_type == 'mesh': self.domain = statepoint.meshes[self.domain.id] else: @@ -5408,6 +5406,26 @@ class ConsistentScatterMatrixXS(ConvolvedMGXS, ScatterMatrixXS): return self._xs_tally + @ScatterMatrixXS.correction.setter + def correction(self, correction): + ScatterMatrixXS.correction = correction + self.mgxs[2].correction = correction + + @ScatterMatrixXS.scatter_format.setter + def scatter_format(self, scatter_format): + ScatterMatrixXS.scatter_format = scatter_format + self.mgxs[1].scatter_format = scatter_format + + @ScatterMatrixXS.legendre_order.setter + def legendre_order(self, legendre_order): + ScatterMatrixXS.legendre_order = legendre_order + self.mgxs[1].legendre_order = legendre_order + + @ScatterMatrixXS.histogram_bins.setter + def histogram_bins(self, histogram_bins): + ScatterMatrixXS.histogram_bins = histogram_bins + self.mgxs[1].histogram_bins = histogram_bins + @ScatterMatrixXS.nu.setter def nu(self, nu): cv.check_type('nu', nu, bool) @@ -5805,10 +5823,10 @@ class Chi(MGXS): self._prompt = prompt if not self.prompt: self._rxn_type = 'nu-fission' - self._hdf5_key = 'nu-fission matrix' + self._hdf5_key = 'chi' else: self._rxn_type = 'prompt-nu-fission' - self._hdf5_key = 'prompt-nu-fission matrix' + self._hdf5_key = 'chi-prompt' def get_homogenized_mgxs(self, other_mgxs): """Construct a homogenized mgxs with other MGXS objects. diff --git a/tests/test_mgxs_library_condense/inputs_true.dat b/tests/test_mgxs_library_condense/inputs_true.dat index e56317dad2..518663028a 100644 --- a/tests/test_mgxs_library_condense/inputs_true.dat +++ b/tests/test_mgxs_library_condense/inputs_true.dat @@ -285,7 +285,7 @@ total - scatter + nu-scatter analog @@ -312,26 +312,13 @@ + total - scatter-1 + nu-scatter analog - - - total - flux - tracklength - - - - - total - scatter - tracklength - - @@ -339,10 +326,23 @@ scatter analog + + + + total + scatter-1 + analog + + + + + total + flux + analog + - total nu-scatter analog @@ -352,57 +352,59 @@ total - scatter + nu-scatter analog + total - nu-scatter-1 + nu-scatter analog - + + total - nu-fission + scatter analog total - nu-fission + nu-scatter-1 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 @@ -415,7 +417,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -423,9 +425,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -433,14 +449,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -448,7 +464,7 @@ delayed-nu-fission tracklength - + @@ -456,7 +472,7 @@ delayed-nu-fission analog - + @@ -464,45 +480,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 - + @@ -511,75 +527,61 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - total flux - analog + tracklength total total - analog + tracklength - + total - scatter-1 + flux analog total - flux + total analog - + total - total + scatter-1 analog - + total - nu-scatter-1 + flux analog total - flux - tracklength + total + analog - + total - absorption - tracklength + nu-scatter-1 + analog @@ -599,14 +601,14 @@ total - fission + flux tracklength total - flux + absorption tracklength @@ -627,7 +629,7 @@ total - nu-fission + fission tracklength @@ -641,7 +643,7 @@ total - kappa-fission + nu-fission tracklength @@ -655,7 +657,7 @@ total - scatter + kappa-fission tracklength @@ -663,14 +665,14 @@ total flux - analog + tracklength total - nu-scatter - analog + scatter + tracklength @@ -682,9 +684,8 @@ - total - scatter-P3 + nu-scatter analog @@ -699,15 +700,14 @@ total - nu-scatter-P3 + scatter-P3 analog - total - nu-scatter + flux analog @@ -715,14 +715,15 @@ total - scatter + nu-scatter-P3 analog + total - flux + nu-scatter analog @@ -730,15 +731,14 @@ total - nu-fission + scatter analog - total - scatter + flux analog @@ -746,52 +746,55 @@ total - scatter + nu-fission analog + total - flux - tracklength + scatter + analog + total - scatter - tracklength + nu-scatter + analog - - - - total - scatter - analog - - - - - total - scatter-1 - analog - - total flux tracklength - + total scatter tracklength + + + + + total + scatter + analog + + + + + + total + nu-scatter + analog + @@ -801,6 +804,27 @@ analog + + + total + scatter-1 + analog + + + + + total + flux + analog + + + + + total + nu-scatter + analog + + @@ -808,7 +832,15 @@ nu-scatter analog - + + + + + total + nu-scatter + analog + + @@ -816,83 +848,54 @@ scatter analog - + total nu-scatter-1 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 @@ -903,33 +906,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 @@ -941,6 +942,29 @@ tracklength + + + + total + delayed-nu-fission + analog + + + + + + total + delayed-nu-fission + analog + + + + + total + nu-fission + tracklength + + @@ -948,7 +972,15 @@ delayed-nu-fission tracklength - + + + + + total + delayed-nu-fission + tracklength + + @@ -956,14 +988,14 @@ decay-rate tracklength - + total flux analog - + @@ -972,123 +1004,95 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - - - - - total - flux - analog - - - - - total - total - analog - + + + total + flux + tracklength + + + + + total + total + tracklength + + + + + total + flux + analog + + + + + total + total + analog + + total scatter-1 analog - + total flux analog - + total total analog - + total nu-scatter-1 analog - - - - total - flux - tracklength - - - - - total - absorption - tracklength - - - - - total - flux - tracklength - - - - - total - absorption - tracklength - total - fission + flux tracklength total - flux + absorption tracklength total - fission + flux tracklength total - flux + absorption tracklength total - nu-fission + fission tracklength @@ -1102,7 +1106,7 @@ total - kappa-fission + fission tracklength @@ -1116,7 +1120,7 @@ total - scatter + nu-fission tracklength @@ -1124,29 +1128,28 @@ total flux - analog + tracklength total - nu-scatter - analog + kappa-fission + tracklength total flux - analog + tracklength - total - scatter-P3 - analog + scatter + tracklength @@ -1158,17 +1161,15 @@ - total - nu-scatter-P3 + nu-scatter analog - total - nu-scatter + flux analog @@ -1176,7 +1177,7 @@ total - scatter + scatter-P3 analog @@ -1191,7 +1192,7 @@ total - nu-fission + nu-scatter-P3 analog @@ -1199,7 +1200,7 @@ total - scatter + nu-scatter analog @@ -1215,14 +1216,15 @@ total flux - tracklength + analog + total - scatter - tracklength + nu-fission + analog @@ -1234,9 +1236,10 @@ + total - scatter-1 + nu-scatter analog @@ -1281,75 +1284,77 @@ total - nu-scatter-1 + scatter-1 analog - + total - nu-fission + flux analog - + total - nu-fission + nu-scatter analog - + + total - prompt-nu-fission + nu-scatter analog + total - prompt-nu-fission + nu-scatter analog + total - flux - tracklength + scatter + analog - + total - inverse-velocity - tracklength + nu-scatter-1 + analog - + total - flux - tracklength + nu-fission + analog - + total - prompt-nu-fission - tracklength + nu-fission + analog - + total - flux + prompt-nu-fission analog - total prompt-nu-fission @@ -1364,49 +1369,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 @@ -1414,17 +1415,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 429caef14e..06edc733c4 100644 --- a/tests/test_mgxs_library_condense/results_true.dat +++ b/tests/test_mgxs_library_condense/results_true.dat @@ -39,7 +39,7 @@ material group in group out nuclide mean std. dev. 0 10000 1 1 total 0.341361 0.031842 material group in group out nuclide mean std. dev. -0 10000 1 1 total 0.341361 0.040919 +0 10000 1 1 total 0.343079 0.043498 material group out nuclide mean std. dev. 0 10000 1 total 1.0 0.046071 material group out nuclide mean std. dev. @@ -125,8 +125,8 @@ 0 10001 1 1 total 1.0 0.095039 material group in group out nuclide mean std. dev. 0 10001 1 1 total 0.276654 0.033287 - material group in group out nuclide mean std. dev. -0 10001 1 1 total 0.276654 0.044414 + material group in group out nuclide mean std. dev. +0 10001 1 1 total 0.27737 0.051266 material group out nuclide mean std. dev. 0 10001 1 total 0.0 0.0 material group out nuclide mean std. dev. @@ -213,7 +213,7 @@ material group in group out nuclide mean std. dev. 0 10002 1 1 total 0.489924 0.069059 material group in group out nuclide mean std. dev. -0 10002 1 1 total 0.489924 0.08592 +0 10002 1 1 total 0.492997 0.086399 material group out nuclide mean std. dev. 0 10002 1 total 0.0 0.0 material group out 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 e8f9174995..5a64f7af12 100644 --- a/tests/test_mgxs_library_distribcell/inputs_true.dat +++ b/tests/test_mgxs_library_distribcell/inputs_true.dat @@ -312,7 +312,7 @@ total - scatter + nu-scatter analog @@ -339,26 +339,13 @@ + total - scatter-1 + nu-scatter analog - - - total - flux - tracklength - - - - - total - scatter - tracklength - - @@ -366,10 +353,23 @@ scatter analog + + + + total + scatter-1 + analog + + + + + total + flux + analog + - total nu-scatter analog @@ -379,57 +379,59 @@ total - scatter + nu-scatter analog + total - nu-scatter-1 + nu-scatter analog + total - nu-fission + scatter analog total - nu-fission + nu-scatter-1 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 @@ -442,7 +444,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -450,9 +452,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -460,14 +476,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -475,7 +491,7 @@ delayed-nu-fission tracklength - + @@ -483,7 +499,7 @@ delayed-nu-fission analog - + @@ -491,45 +507,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 8dfab8d3aa..14893f0833 100644 --- a/tests/test_mgxs_library_distribcell/results_true.dat +++ b/tests/test_mgxs_library_distribcell/results_true.dat @@ -35,11 +35,11 @@ sum(distribcell) group in group out nuclide mean std. dev. 0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 1 total 1.0 0.037213 sum(distribcell) group in group out nuclide mean std. dev. -0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 1 total 1.0 0.037213 +0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 1 total 1.0 0.037208 sum(distribcell) group in group out nuclide mean std. dev. 0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 1 total 0.342636 0.017656 sum(distribcell) group in group out nuclide mean std. dev. -0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 1 total 0.342954 0.022894 +0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 1 total 0.340468 0.025369 sum(distribcell) group out nuclide mean std. dev. 0 ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13... 1 total 1.0 0.080455 sum(distribcell) group out 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 e56317dad2..518663028a 100644 --- a/tests/test_mgxs_library_hdf5/inputs_true.dat +++ b/tests/test_mgxs_library_hdf5/inputs_true.dat @@ -285,7 +285,7 @@ total - scatter + nu-scatter analog @@ -312,26 +312,13 @@ + total - scatter-1 + nu-scatter analog - - - total - flux - tracklength - - - - - total - scatter - tracklength - - @@ -339,10 +326,23 @@ scatter analog + + + + total + scatter-1 + analog + + + + + total + flux + analog + - total nu-scatter analog @@ -352,57 +352,59 @@ total - scatter + nu-scatter analog + total - nu-scatter-1 + nu-scatter analog - + + total - nu-fission + scatter analog total - nu-fission + nu-scatter-1 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 @@ -415,7 +417,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -423,9 +425,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -433,14 +449,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -448,7 +464,7 @@ delayed-nu-fission tracklength - + @@ -456,7 +472,7 @@ delayed-nu-fission analog - + @@ -464,45 +480,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 - + @@ -511,75 +527,61 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - total flux - analog + tracklength total total - analog + tracklength - + total - scatter-1 + flux analog total - flux + total analog - + total - total + scatter-1 analog - + total - nu-scatter-1 + flux analog total - flux - tracklength + total + analog - + total - absorption - tracklength + nu-scatter-1 + analog @@ -599,14 +601,14 @@ total - fission + flux tracklength total - flux + absorption tracklength @@ -627,7 +629,7 @@ total - nu-fission + fission tracklength @@ -641,7 +643,7 @@ total - kappa-fission + nu-fission tracklength @@ -655,7 +657,7 @@ total - scatter + kappa-fission tracklength @@ -663,14 +665,14 @@ total flux - analog + tracklength total - nu-scatter - analog + scatter + tracklength @@ -682,9 +684,8 @@ - total - scatter-P3 + nu-scatter analog @@ -699,15 +700,14 @@ total - nu-scatter-P3 + scatter-P3 analog - total - nu-scatter + flux analog @@ -715,14 +715,15 @@ total - scatter + nu-scatter-P3 analog + total - flux + nu-scatter analog @@ -730,15 +731,14 @@ total - nu-fission + scatter analog - total - scatter + flux analog @@ -746,52 +746,55 @@ total - scatter + nu-fission analog + total - flux - tracklength + scatter + analog + total - scatter - tracklength + nu-scatter + analog - - - - total - scatter - analog - - - - - total - scatter-1 - analog - - total flux tracklength - + total scatter tracklength + + + + + total + scatter + analog + + + + + + total + nu-scatter + analog + @@ -801,6 +804,27 @@ analog + + + total + scatter-1 + analog + + + + + total + flux + analog + + + + + total + nu-scatter + analog + + @@ -808,7 +832,15 @@ nu-scatter analog - + + + + + total + nu-scatter + analog + + @@ -816,83 +848,54 @@ scatter analog - + total nu-scatter-1 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 @@ -903,33 +906,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 @@ -941,6 +942,29 @@ tracklength + + + + total + delayed-nu-fission + analog + + + + + + total + delayed-nu-fission + analog + + + + + total + nu-fission + tracklength + + @@ -948,7 +972,15 @@ delayed-nu-fission tracklength - + + + + + total + delayed-nu-fission + tracklength + + @@ -956,14 +988,14 @@ decay-rate tracklength - + total flux analog - + @@ -972,123 +1004,95 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - - - - - total - flux - analog - - - - - total - total - analog - + + + total + flux + tracklength + + + + + total + total + tracklength + + + + + total + flux + analog + + + + + total + total + analog + + total scatter-1 analog - + total flux analog - + total total analog - + total nu-scatter-1 analog - - - - total - flux - tracklength - - - - - total - absorption - tracklength - - - - - total - flux - tracklength - - - - - total - absorption - tracklength - total - fission + flux tracklength total - flux + absorption tracklength total - fission + flux tracklength total - flux + absorption tracklength total - nu-fission + fission tracklength @@ -1102,7 +1106,7 @@ total - kappa-fission + fission tracklength @@ -1116,7 +1120,7 @@ total - scatter + nu-fission tracklength @@ -1124,29 +1128,28 @@ total flux - analog + tracklength total - nu-scatter - analog + kappa-fission + tracklength total flux - analog + tracklength - total - scatter-P3 - analog + scatter + tracklength @@ -1158,17 +1161,15 @@ - total - nu-scatter-P3 + nu-scatter analog - total - nu-scatter + flux analog @@ -1176,7 +1177,7 @@ total - scatter + scatter-P3 analog @@ -1191,7 +1192,7 @@ total - nu-fission + nu-scatter-P3 analog @@ -1199,7 +1200,7 @@ total - scatter + nu-scatter analog @@ -1215,14 +1216,15 @@ total flux - tracklength + analog + total - scatter - tracklength + nu-fission + analog @@ -1234,9 +1236,10 @@ + total - scatter-1 + nu-scatter analog @@ -1281,75 +1284,77 @@ total - nu-scatter-1 + scatter-1 analog - + total - nu-fission + flux analog - + total - nu-fission + nu-scatter analog - + + total - prompt-nu-fission + nu-scatter analog + total - prompt-nu-fission + nu-scatter analog + total - flux - tracklength + scatter + analog - + total - inverse-velocity - tracklength + nu-scatter-1 + analog - + total - flux - tracklength + nu-fission + analog - + total - prompt-nu-fission - tracklength + nu-fission + analog - + total - flux + prompt-nu-fission analog - total prompt-nu-fission @@ -1364,49 +1369,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 @@ -1414,17 +1415,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 f5eb2b92eb..4a8578b6d5 100644 --- a/tests/test_mgxs_library_hdf5/results_true.dat +++ b/tests/test_mgxs_library_hdf5/results_true.dat @@ -76,10 +76,10 @@ domain=10000 type=consistent scatter matrix [[3.73090623e-02 4.89318749e-04] [8.89289900e-04 3.01139605e-02]] domain=10000 type=consistent nu-scatter matrix -[[3.32987194e-01 9.94653712e-04] - [8.87128136e-04 3.79756741e-01]] -[[4.80886244e-02 8.40606499e-04] - [1.53780011e-03 3.42124888e-02]] +[[3.32465997e-01 9.88930322e-04] + [9.24639842e-04 3.96145576e-01]] +[[5.08819059e-02 8.36973463e-04] + [1.60212263e-03 2.87181296e-02]] domain=10000 type=chi [1.00000000e+00 0.00000000e+00] [4.60705493e-02 0.00000000e+00] @@ -262,10 +262,10 @@ domain=10001 type=consistent scatter matrix [[3.82655052e-02 0.00000000e+00] [0.00000000e+00 5.27278829e-02]] domain=10001 type=consistent nu-scatter matrix -[[2.70706971e-01 0.00000000e+00] - [0.00000000e+00 3.06542088e-01]] -[[5.11595827e-02 0.00000000e+00] - [0.00000000e+00 6.74582654e-02]] +[[2.71891125e-01 0.00000000e+00] + [0.00000000e+00 3.07477884e-01]] +[[5.90732661e-02 0.00000000e+00] + [0.00000000e+00 7.57666234e-02]] domain=10001 type=chi [0.00000000e+00 0.00000000e+00] [0.00000000e+00 0.00000000e+00] @@ -448,10 +448,10 @@ domain=10002 type=consistent scatter matrix [[4.18067487e-02 2.23201039e-03] [4.44773843e-04 3.55391574e-01]] domain=10002 type=consistent nu-scatter matrix -[[2.51505773e-01 3.10225138e-02] - [4.40143026e-04 1.47923453e+00]] -[[4.84234821e-02 3.06407542e-03] - [7.65033031e-04 4.49126759e-01]] +[[2.58651993e-01 3.13677176e-02] + [4.43343102e-04 1.48230049e+00]] +[[4.56422796e-02 2.98774961e-03] + [7.71125112e-04 4.71762821e-01]] domain=10002 type=chi [0.00000000e+00 0.00000000e+00] [0.00000000e+00 0.00000000e+00] diff --git a/tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py b/tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py index 9197f549c1..3c657981b0 100644 --- a/tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py +++ b/tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py @@ -59,7 +59,7 @@ class MGXSTestHarness(PyAPITestHarness): # Export the MGXS Library to an HDF5 file self.mgxs_lib.build_hdf5_store(directory='.') - + # Open the MGXS HDF5 file f = h5py.File('mgxs.h5', 'r') diff --git a/tests/test_mgxs_library_mesh/inputs_true.dat b/tests/test_mgxs_library_mesh/inputs_true.dat index 6f6ecb7ac8..3f719e7b07 100644 --- a/tests/test_mgxs_library_mesh/inputs_true.dat +++ b/tests/test_mgxs_library_mesh/inputs_true.dat @@ -549,7 +549,7 @@ total - scatter + nu-scatter analog @@ -576,26 +576,13 @@ + total - scatter-1 + nu-scatter analog - - - total - flux - tracklength - - - - - total - scatter - tracklength - - @@ -603,10 +590,23 @@ scatter analog + + + + total + scatter-1 + analog + + + + + total + flux + analog + - total nu-scatter analog @@ -616,57 +616,59 @@ total - scatter + nu-scatter analog + total - nu-scatter-1 + nu-scatter analog + total - nu-fission + scatter analog total - nu-fission + nu-scatter-1 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 @@ -679,7 +681,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -687,9 +689,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -697,14 +713,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -712,7 +728,7 @@ delayed-nu-fission tracklength - + @@ -720,7 +736,7 @@ delayed-nu-fission analog - + @@ -728,45 +744,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 d04ab3d35a..23a1fce0fc 100644 --- a/tests/test_mgxs_library_mesh/results_true.dat +++ b/tests/test_mgxs_library_mesh/results_true.dat @@ -126,10 +126,10 @@ 3 2 2 1 1 1 total 0.373069 0.127649 mesh 1 group in group out nuclide mean std. dev. x y z -0 1 1 1 1 1 total 0.385281 0.170507 -1 1 2 1 1 1 total 0.381031 0.495567 -2 2 1 1 1 1 total 0.429729 0.164992 -3 2 2 1 1 1 total 0.373069 0.154944 +0 1 1 1 1 1 total 0.391249 0.172830 +1 1 2 1 1 1 total 0.366825 0.473935 +2 2 1 1 1 1 total 0.436538 0.175458 +3 2 2 1 1 1 total 0.380998 0.149007 mesh 1 group out nuclide mean std. dev. x y z 0 1 1 1 1 total 1.0 0.135958 diff --git a/tests/test_mgxs_library_no_nuclides/inputs_true.dat b/tests/test_mgxs_library_no_nuclides/inputs_true.dat index e56317dad2..518663028a 100644 --- a/tests/test_mgxs_library_no_nuclides/inputs_true.dat +++ b/tests/test_mgxs_library_no_nuclides/inputs_true.dat @@ -285,7 +285,7 @@ total - scatter + nu-scatter analog @@ -312,26 +312,13 @@ + total - scatter-1 + nu-scatter analog - - - total - flux - tracklength - - - - - total - scatter - tracklength - - @@ -339,10 +326,23 @@ scatter analog + + + + total + scatter-1 + analog + + + + + total + flux + analog + - total nu-scatter analog @@ -352,57 +352,59 @@ total - scatter + nu-scatter analog + total - nu-scatter-1 + nu-scatter analog - + + total - nu-fission + scatter analog total - nu-fission + nu-scatter-1 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 @@ -415,7 +417,7 @@ total - prompt-nu-fission + inverse-velocity tracklength @@ -423,9 +425,23 @@ total flux - analog + tracklength + + + total + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -433,14 +449,14 @@ prompt-nu-fission analog - + total flux tracklength - + @@ -448,7 +464,7 @@ delayed-nu-fission tracklength - + @@ -456,7 +472,7 @@ delayed-nu-fission analog - + @@ -464,45 +480,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 - + @@ -511,75 +527,61 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - total flux - analog + tracklength total total - analog + tracklength - + total - scatter-1 + flux analog total - flux + total analog - + total - total + scatter-1 analog - + total - nu-scatter-1 + flux analog total - flux - tracklength + total + analog - + total - absorption - tracklength + nu-scatter-1 + analog @@ -599,14 +601,14 @@ total - fission + flux tracklength total - flux + absorption tracklength @@ -627,7 +629,7 @@ total - nu-fission + fission tracklength @@ -641,7 +643,7 @@ total - kappa-fission + nu-fission tracklength @@ -655,7 +657,7 @@ total - scatter + kappa-fission tracklength @@ -663,14 +665,14 @@ total flux - analog + tracklength total - nu-scatter - analog + scatter + tracklength @@ -682,9 +684,8 @@ - total - scatter-P3 + nu-scatter analog @@ -699,15 +700,14 @@ total - nu-scatter-P3 + scatter-P3 analog - total - nu-scatter + flux analog @@ -715,14 +715,15 @@ total - scatter + nu-scatter-P3 analog + total - flux + nu-scatter analog @@ -730,15 +731,14 @@ total - nu-fission + scatter analog - total - scatter + flux analog @@ -746,52 +746,55 @@ total - scatter + nu-fission analog + total - flux - tracklength + scatter + analog + total - scatter - tracklength + nu-scatter + analog - - - - total - scatter - analog - - - - - total - scatter-1 - analog - - total flux tracklength - + total scatter tracklength + + + + + total + scatter + analog + + + + + + total + nu-scatter + analog + @@ -801,6 +804,27 @@ analog + + + total + scatter-1 + analog + + + + + total + flux + analog + + + + + total + nu-scatter + analog + + @@ -808,7 +832,15 @@ nu-scatter analog - + + + + + total + nu-scatter + analog + + @@ -816,83 +848,54 @@ scatter analog - + total nu-scatter-1 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 @@ -903,33 +906,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 @@ -941,6 +942,29 @@ tracklength + + + + total + delayed-nu-fission + analog + + + + + + total + delayed-nu-fission + analog + + + + + total + nu-fission + tracklength + + @@ -948,7 +972,15 @@ delayed-nu-fission tracklength - + + + + + total + delayed-nu-fission + tracklength + + @@ -956,14 +988,14 @@ decay-rate tracklength - + total flux analog - + @@ -972,123 +1004,95 @@ delayed-nu-fission analog - - - - total - flux - tracklength - - - - - total - total - tracklength - - - - - total - flux - analog - - - - - total - total - analog - + + + total + flux + tracklength + + + + + total + total + tracklength + + + + + total + flux + analog + + + + + total + total + analog + + total scatter-1 analog - + total flux analog - + total total analog - + total nu-scatter-1 analog - - - - total - flux - tracklength - - - - - total - absorption - tracklength - - - - - total - flux - tracklength - - - - - total - absorption - tracklength - total - fission + flux tracklength total - flux + absorption tracklength total - fission + flux tracklength total - flux + absorption tracklength total - nu-fission + fission tracklength @@ -1102,7 +1106,7 @@ total - kappa-fission + fission tracklength @@ -1116,7 +1120,7 @@ total - scatter + nu-fission tracklength @@ -1124,29 +1128,28 @@ total flux - analog + tracklength total - nu-scatter - analog + kappa-fission + tracklength total flux - analog + tracklength - total - scatter-P3 - analog + scatter + tracklength @@ -1158,17 +1161,15 @@ - total - nu-scatter-P3 + nu-scatter analog - total - nu-scatter + flux analog @@ -1176,7 +1177,7 @@ total - scatter + scatter-P3 analog @@ -1191,7 +1192,7 @@ total - nu-fission + nu-scatter-P3 analog @@ -1199,7 +1200,7 @@ total - scatter + nu-scatter analog @@ -1215,14 +1216,15 @@ total flux - tracklength + analog + total - scatter - tracklength + nu-fission + analog @@ -1234,9 +1236,10 @@ + total - scatter-1 + nu-scatter analog @@ -1281,75 +1284,77 @@ total - nu-scatter-1 + scatter-1 analog - + total - nu-fission + flux analog - + total - nu-fission + nu-scatter analog - + + total - prompt-nu-fission + nu-scatter analog + total - prompt-nu-fission + nu-scatter analog + total - flux - tracklength + scatter + analog - + total - inverse-velocity - tracklength + nu-scatter-1 + analog - + total - flux - tracklength + nu-fission + analog - + total - prompt-nu-fission - tracklength + nu-fission + analog - + total - flux + prompt-nu-fission analog - total prompt-nu-fission @@ -1364,49 +1369,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 @@ -1414,17 +1415,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 6158447d1d..430fb6a338 100644 --- a/tests/test_mgxs_library_no_nuclides/results_true.dat +++ b/tests/test_mgxs_library_no_nuclides/results_true.dat @@ -88,10 +88,10 @@ 1 10000 2 1 total 0.000887 0.000889 0 10000 2 2 total 0.379757 0.030114 material group in group out nuclide mean std. dev. -3 10000 1 1 total 0.332987 0.048089 -2 10000 1 2 total 0.000995 0.000841 -1 10000 2 1 total 0.000887 0.001538 -0 10000 2 2 total 0.379757 0.034212 +3 10000 1 1 total 0.332466 0.050882 +2 10000 1 2 total 0.000989 0.000837 +1 10000 2 1 total 0.000925 0.001602 +0 10000 2 2 total 0.396146 0.028718 material group out nuclide mean std. dev. 1 10000 1 total 1.0 0.046071 0 10000 2 total 0.0 0.000000 @@ -276,10 +276,10 @@ 1 10001 2 1 total 0.000000 0.000000 0 10001 2 2 total 0.306542 0.052728 material group in group out nuclide mean std. dev. -3 10001 1 1 total 0.270707 0.051160 +3 10001 1 1 total 0.271891 0.059073 2 10001 1 2 total 0.000000 0.000000 1 10001 2 1 total 0.000000 0.000000 -0 10001 2 2 total 0.306542 0.067458 +0 10001 2 2 total 0.307478 0.075767 material group out nuclide mean std. dev. 1 10001 1 total 0.0 0.0 0 10001 2 total 0.0 0.0 @@ -464,10 +464,10 @@ 1 10002 2 1 total 0.000440 0.000445 0 10002 2 2 total 1.479235 0.355392 material group in group out nuclide mean std. dev. -3 10002 1 1 total 0.251506 0.048423 -2 10002 1 2 total 0.031023 0.003064 -1 10002 2 1 total 0.000440 0.000765 -0 10002 2 2 total 1.479235 0.449127 +3 10002 1 1 total 0.258652 0.045642 +2 10002 1 2 total 0.031368 0.002988 +1 10002 2 1 total 0.000443 0.000771 +0 10002 2 2 total 1.482300 0.471763 material group out nuclide mean std. dev. 1 10002 1 total 0.0 0.0 0 10002 2 total 0.0 0.0 diff --git a/tests/test_mgxs_library_nuclides/inputs_true.dat b/tests/test_mgxs_library_nuclides/inputs_true.dat index bc08b91151..2fa360ede8 100644 --- a/tests/test_mgxs_library_nuclides/inputs_true.dat +++ b/tests/test_mgxs_library_nuclides/inputs_true.dat @@ -285,7 +285,7 @@ U234 U235 U238 O16 - scatter + nu-scatter analog @@ -312,26 +312,13 @@ + U234 U235 U238 O16 - scatter-1 + nu-scatter analog - - - total - flux - tracklength - - - - - U234 U235 U238 O16 - scatter - tracklength - - @@ -339,10 +326,23 @@ scatter analog + + + + U234 U235 U238 O16 + scatter-1 + analog + + + + + total + flux + analog + - U234 U235 U238 O16 nu-scatter analog @@ -352,57 +352,59 @@ U234 U235 U238 O16 - scatter + nu-scatter analog + U234 U235 U238 O16 - nu-scatter-1 + nu-scatter analog - + + U234 U235 U238 O16 - nu-fission + scatter analog U234 U235 U238 O16 - nu-fission + nu-scatter-1 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 @@ -415,7 +417,7 @@ U234 U235 U238 O16 - prompt-nu-fission + inverse-velocity tracklength @@ -423,9 +425,23 @@ total flux - analog + tracklength + + + U234 U235 U238 O16 + prompt-nu-fission + tracklength + + + + + total + flux + analog + + @@ -433,75 +449,61 @@ 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 analog - + Zr90 Zr91 Zr92 Zr94 Zr96 total analog - + Zr90 Zr91 Zr92 Zr94 Zr96 - nu-scatter-1 + scatter-1 + analog + + + + + total + flux analog - total - flux - tracklength + Zr90 Zr91 Zr92 Zr94 Zr96 + total + analog - + Zr90 Zr91 Zr92 Zr94 Zr96 - absorption - tracklength + nu-scatter-1 + analog @@ -520,15 +522,15 @@ - Zr90 Zr91 Zr92 Zr94 Zr96 - fission + total + flux tracklength - total - flux + Zr90 Zr91 Zr92 Zr94 Zr96 + absorption tracklength @@ -549,7 +551,7 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - nu-fission + fission tracklength @@ -563,7 +565,7 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - kappa-fission + nu-fission tracklength @@ -577,7 +579,7 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - scatter + kappa-fission tracklength @@ -585,14 +587,14 @@ total flux - analog + tracklength Zr90 Zr91 Zr92 Zr94 Zr96 - nu-scatter - analog + scatter + tracklength @@ -604,9 +606,8 @@ - Zr90 Zr91 Zr92 Zr94 Zr96 - scatter-P3 + nu-scatter analog @@ -621,15 +622,14 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - nu-scatter-P3 + scatter-P3 analog - - Zr90 Zr91 Zr92 Zr94 Zr96 - nu-scatter + total + flux analog @@ -637,14 +637,15 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - scatter + nu-scatter-P3 analog - total - flux + + Zr90 Zr91 Zr92 Zr94 Zr96 + nu-scatter analog @@ -652,15 +653,14 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - nu-fission + scatter analog - - Zr90 Zr91 Zr92 Zr94 Zr96 - scatter + total + flux analog @@ -668,52 +668,55 @@ Zr90 Zr91 Zr92 Zr94 Zr96 - scatter + nu-fission analog - total - flux - tracklength + + Zr90 Zr91 Zr92 Zr94 Zr96 + scatter + analog + Zr90 Zr91 Zr92 Zr94 Zr96 - scatter - tracklength + nu-scatter + analog - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - scatter - analog - - - - - Zr90 Zr91 Zr92 Zr94 Zr96 - scatter-1 - analog - - total flux tracklength - + Zr90 Zr91 Zr92 Zr94 Zr96 scatter tracklength + + + + + Zr90 Zr91 Zr92 Zr94 Zr96 + scatter + analog + + + + + + Zr90 Zr91 Zr92 Zr94 Zr96 + nu-scatter + analog + @@ -723,6 +726,27 @@ analog + + + Zr90 Zr91 Zr92 Zr94 Zr96 + scatter-1 + analog + + + + + total + flux + analog + + + + + Zr90 Zr91 Zr92 Zr94 Zr96 + nu-scatter + analog + + @@ -730,7 +754,15 @@ nu-scatter analog - + + + + + Zr90 Zr91 Zr92 Zr94 Zr96 + nu-scatter + analog + + @@ -738,77 +770,77 @@ scatter analog - + Zr90 Zr91 Zr92 Zr94 Zr96 nu-scatter-1 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 + + @@ -816,123 +848,95 @@ prompt-nu-fission analog - - - - total - flux - tracklength - - - - - H1 O16 B10 B11 - total - tracklength - - - - - total - flux - analog - - - - - H1 O16 B10 B11 - total - 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 analog - + H1 O16 B10 B11 total analog - + H1 O16 B10 B11 nu-scatter-1 analog - - - - total - flux - tracklength - - - - - H1 O16 B10 B11 - absorption - tracklength - - - - - total - flux - tracklength - - - - - H1 O16 B10 B11 - absorption - tracklength - - H1 O16 B10 B11 - fission + total + flux tracklength - total - flux + H1 O16 B10 B11 + absorption tracklength - H1 O16 B10 B11 - fission + total + flux tracklength - total - flux + H1 O16 B10 B11 + absorption tracklength H1 O16 B10 B11 - nu-fission + fission tracklength @@ -946,7 +950,7 @@ H1 O16 B10 B11 - kappa-fission + fission tracklength @@ -960,7 +964,7 @@ H1 O16 B10 B11 - scatter + nu-fission tracklength @@ -968,29 +972,28 @@ total flux - analog + tracklength H1 O16 B10 B11 - nu-scatter - analog + kappa-fission + tracklength total flux - analog + tracklength - H1 O16 B10 B11 - scatter-P3 - analog + scatter + tracklength @@ -1002,17 +1005,15 @@ - H1 O16 B10 B11 - nu-scatter-P3 + nu-scatter analog - - H1 O16 B10 B11 - nu-scatter + total + flux analog @@ -1020,7 +1021,7 @@ H1 O16 B10 B11 - scatter + scatter-P3 analog @@ -1035,7 +1036,7 @@ H1 O16 B10 B11 - nu-fission + nu-scatter-P3 analog @@ -1043,7 +1044,7 @@ H1 O16 B10 B11 - scatter + nu-scatter analog @@ -1059,14 +1060,15 @@ total flux - tracklength + analog + H1 O16 B10 B11 - scatter - tracklength + nu-fission + analog @@ -1078,9 +1080,10 @@ + H1 O16 B10 B11 - scatter-1 + nu-scatter analog @@ -1125,73 +1128,118 @@ H1 O16 B10 B11 - nu-scatter-1 + scatter-1 analog - - H1 O16 B10 B11 - nu-fission + + total + flux analog + + + H1 O16 B10 B11 + nu-scatter + analog + + + + + + H1 O16 B10 B11 + nu-scatter + analog + + + + + + H1 O16 B10 B11 + nu-scatter + analog + + + + + + H1 O16 B10 B11 + scatter + analog + + + + + H1 O16 B10 B11 + nu-scatter-1 + 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 3fa814577f..73f40d67d1 100644 --- a/tests/test_mgxs_library_nuclides/results_true.dat +++ b/tests/test_mgxs_library_nuclides/results_true.dat @@ -1 +1 @@ -830113ee8be5f5a9941a2e1b97d8fc0049dbde0a7860c2ebf3aadfa4811ca58663fefbfea5f01e8793b1bfe52ac060b3631cafd959203d158d20af94ed318743 \ No newline at end of file +5c57e011264efb348fa333166e42da34f564feb2c2507f89c72fadb1056ed871e251911800fe3976cac9c66fa456edb63ee3bc0c4a40d8d82abe2c58c6cc3128 \ No newline at end of file