Use OrderedDict for material nuclides in PyAPI

2026-07-29 06:35:48 -04:00 · 2015-10-03 00:16:15 -04:00 · 2015-10-03 00:16:15 -04:00 · 8030112938
commit 8030112938
parent d14750149a
52 changed files with 2394 additions and 2394 deletions
--- a/openmc/clean_xml.py
+++ b/openmc/clean_xml.py
@ -29,7 +29,7 @@ def sort_xml_elements(tree):
            comment_elements.append((element, next_element))

    # Now iterate over all tags and order the elements within each tag
-    for tag in tags:
+    for tag in sorted(list(tags)):

        # Retrieve all of the elements for this tag
        try:
--- a/openmc/material.py
+++ b/openmc/material.py
@ -1,4 +1,4 @@
-from collections import Iterable
+from collections import Iterable, OrderedDict
 from copy import deepcopy
 from numbers import Real, Integral
 import warnings
@ -64,15 +64,15 @@ class Material(object):
        self._density = None
        self._density_units = ''

-        # A dictionary of Nuclides
+        # An ordered dictionary of Nuclides (order affects OpenMC results)
        # Keys         - Nuclide names
        # Values     - tuple (nuclide, percent, percent type)
-        self._nuclides = {}
+        self._nuclides = OrderedDict()

-        # A dictionary of Elements
+        # An ordered dictionary of Elements (order affects OpenMC results)
        # Keys         - Element names
        # Values     - tuple (element, percent, percent type)
-        self._elements = {}
+        self._elements = OrderedDict()

        # If specified, a list of tuples of (table name, xs identifier)
        self._sab = []
--- a/tests/test_filter_cell/inputs_true.dat
+++ b/tests/test_filter_cell/inputs_true.dat
@ -1 +1 @@
-55f5e81110db78873ebe2d1411e6f3feb1df98ee14a6489a6b2d9c1164448e48a158b2c0f4efc8ea71d6aabe2e64d029b997d656e5975d2ab549ea365480933b
+3b06e27fa039762b59076bb9431ef003e69ef32f8d01bcf908fe85f59bf7127bd8b94bf2f895b1b63e9fcdbd97aeaf4b02bc02e7bd029bfd85263c68498ce562
--- a/tests/test_filter_cell/results_true.dat
+++ b/tests/test_filter_cell/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-2.240915E+01
-1.009032E+02
-4.711189E+00
-4.469059E+00
-6.533718E+01
-8.552989E+02
+1.767552E+01
+6.295417E+01
+3.863588E+00
+3.013300E+00
+5.356594E+01
+5.839391E+02
--- a/tests/test_filter_cellborn/inputs_true.dat
+++ b/tests/test_filter_cellborn/inputs_true.dat
@ -1 +1 @@
-b9e90c6f594460d23ab84d56ff31897da3f47fdb558356468bb74119df0081f1600953045e4ec68e6048e334cb14abe1566cd72c414d3133c7f4a29d1140bb9e
+6dd7d019587330bbf9c19bae7ad1d888331858b68bd77218315d5fa7b85df7fb97cb208daed584a780592cf9840e67ea3777ccbde502f3861798aac95722be9c
--- a/tests/test_filter_cellborn/results_true.dat
+++ b/tests/test_filter_cellborn/results_true.dat
@ -1,10 +1,10 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.073903E+02
-2.311705E+03
+8.921179E+01
+1.601939E+03
 0.000000E+00
 0.000000E+00
 0.000000E+00
--- a/tests/test_filter_energy/inputs_true.dat
+++ b/tests/test_filter_energy/inputs_true.dat
@ -1 +1 @@
-f41cd0988306e97da0e720c37ca123b2fab894f0cd60a69b6d47a0d6097d993efbf20c61345c71f3e0561af7968684f8fcd39eb908c9c34fbbe2e835eccc659b
+bc9f43ff6368da544942b93ecfb2561911071c44524e35608fcb92c1262fe5543e09525414a87cd647fbc50113d64ff867730e5f4391f31b096abd7a0543b474
--- a/tests/test_filter_energy/results_true.dat
+++ b/tests/test_filter_energy/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-2.777972E+01
-1.636507E+02
-4.274382E+01
-3.658341E+02
-5.403589E+01
-5.860017E+02
-1.137001E+01
-2.594280E+01
+2.844008E+01
+1.619630E+02
+4.425619E+01
+3.938244E+02
+5.527425E+01
+6.120383E+02
+9.799897E+00
+1.957877E+01
--- a/tests/test_filter_energyout/inputs_true.dat
+++ b/tests/test_filter_energyout/inputs_true.dat
@ -1 +1 @@
-52c9c541a82b4f395889450ab4696dffb13ee01427e65e79556080bab88388e91c932b862686a4e449948016e03240bc0692d1fc4386b61f5d0a05310158d232
+74c55768b2b0f5696d5bff9d36a3639c6d858bf2984d799c8b46908b897af11e691b1f9f05646d52fcee046de3bfee11e35b9b379b2967abb0922f60168017b7
--- a/tests/test_filter_energyout/results_true.dat
+++ b/tests/test_filter_energyout/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-2.742000E+01
-1.574582E+02
-4.267000E+01
-3.646435E+02
-5.278000E+01
-5.578420E+02
-7.900000E+00
-1.253260E+01
+2.842000E+01
+1.620214E+02
+4.361000E+01
+3.810139E+02
+5.297000E+01
+5.616595E+02
+6.530000E+00
+8.828900E+00
--- a/tests/test_filter_group_transfer/inputs_true.dat
+++ b/tests/test_filter_group_transfer/inputs_true.dat
@ -1 +1 @@
-25c0be6220072084bed91a172e0e55545b968b60da14f6b36a58493e0fb6b0e96a4b3eb576df1c503b0e18629149d3ee0754de2ffed5ffd82d6e6b7e0f261993
+dd69e0768aa7a4e28efd20adc6a607337c9a15682fa307b1aa2459595f90a523f1fa6e4e4f6db1d74e52a2287ef4efa85d77b1751cd1a2d2e6618385cf7f4607
--- a/tests/test_filter_group_transfer/results_true.dat
+++ b/tests/test_filter_group_transfer/results_true.dat
@ -1,54 +1,54 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-2.486000E+01
-1.303342E+02
+2.576000E+01
+1.331666E+02
 0.000000E+00
 0.000000E+00
-5.000000E-02
-1.700000E-03
+7.000000E-02
+1.300000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.967969E-01
-1.846735E-01
+1.050675E+00
+2.274991E-01
 0.000000E+00
 0.000000E+00
-2.379073E+00
-1.190296E+00
-2.560000E+00
-1.318200E+00
+2.070821E+00
+8.886068E-01
+2.660000E+00
+1.422000E+00
 0.000000E+00
 0.000000E+00
-3.800000E+01
-2.893420E+02
+3.897000E+01
+3.042635E+02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.734177E-01
-3.189810E-02
+4.352932E-01
+4.705717E-02
 0.000000E+00
 0.000000E+00
-9.891140E-01
-2.024582E-01
+1.018668E+00
+2.090017E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.620000E+00
-4.269800E+00
+4.570000E+00
+4.182700E+00
 0.000000E+00
 0.000000E+00
-4.933000E+01
-4.873911E+02
-1.011778E-02
-1.023695E-04
+4.968000E+01
+4.940534E+02
+6.537406E-02
+1.230788E-03
 0.000000E+00
 0.000000E+00
-5.982886E-02
-1.821968E-03
+8.678070E-02
+2.482037E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -57,11 +57,11 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.450000E+00
-2.383100E+00
-1.413190E-01
-4.286264E-03
-7.900000E+00
-1.253260E+01
-2.891151E-01
-1.897512E-02
+3.290000E+00
+2.178900E+00
+1.610879E-01
+5.883677E-03
+6.530000E+00
+8.828900E+00
+3.151783E-01
+2.052521E-02
--- a/tests/test_filter_material/inputs_true.dat
+++ b/tests/test_filter_material/inputs_true.dat
@ -1 +1 @@
-d9822da9c74042812df6046cc810a7b13b90c7f4e6487c8f904b8e6b6a3655938b7f5bec0866a51fc3bc8b9612368f6f79b4f34283abd73663c58172b25d073e
+91dd096441a7f01689ed605b7b3322c63a90c4802d73450acd825b715a8163fc892b4971e4b8b0d5a179eb51ad22bcc886f3935e7ab734d0fedebaf679415816
--- a/tests/test_filter_material/results_true.dat
+++ b/tests/test_filter_material/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-2.840222E+01
-1.617027E+02
-6.793657E+00
-9.256930E+00
-7.648212E+01
-1.171747E+03
-2.158747E+01
-9.962972E+01
+2.868239E+01
+1.648549E+02
+6.779424E+00
+9.202676E+00
+6.446222E+01
+8.387204E+02
+3.367496E+01
+2.349072E+02
--- a/tests/test_filter_universe/inputs_true.dat
+++ b/tests/test_filter_universe/inputs_true.dat
@ -1 +1 @@
-a65cbed55e510edcb54362e9bd38a639b36d2bf4ff312f9355c5552e9407bab27730437f3298a90deb6abbdf36810e8e23c87d11d09a55ce5227fa2bfba1f4aa
+f3dc4c28827ca9035d2d1a39f4adef794f0e27b8c95776485e419b9610aefc6c268e6a1d5889d8170ec9400fc3a4a52bc69cd94e5056078aee7405e0bc62bad5
--- a/tests/test_filter_universe/results_true.dat
+++ b/tests/test_filter_universe/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-9.245752E+01
-1.713583E+03
-1.150558E+01
-2.689915E+01
-2.299276E+01
-1.068299E+02
-3.009831E+00
-1.837623E+00
+7.510505E+01
+1.143811E+03
+8.792943E+00
+1.575416E+01
+4.214462E+01
+3.642975E+02
+4.335157E+00
+3.864423E+00
--- a/tests/test_score_MT/inputs_true.dat
+++ b/tests/test_score_MT/inputs_true.dat
@ -1 +1 @@
-5bf02c7821f3a428d780a95fcffc5873d3ff025f77e511a8bc4d35551bfa8ff1bf95b3d177971fe55f6b58133f303fe7003054125f396bd56c1924a852ff4681
+6ba3ebe9d50584343b012b7a935a0f75b8366659600d4de050a8e4e48405f8da36682e8ab5f495f69b646fc72e176755c0a3540f235806c73d5ebc4fc67db107
--- a/tests/test_score_MT/results_true.dat
+++ b/tests/test_score_MT/results_true.dat
@ -1,5 +1,5 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
@ -9,30 +9,30 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.549173E-03
-1.042847E-05
-4.549173E-03
-1.042847E-05
-5.349258E-01
-5.819756E-02
-1.771520E+00
-6.368768E-01
-2.840231E-04
-7.989175E-08
-2.840231E-04
-7.989175E-08
-4.456152E-02
-4.011605E-04
-3.237732E-02
-2.535641E-04
+1.538090E-03
+1.381456E-06
+1.538090E-03
+1.381456E-06
+3.974412E-01
+3.209809E-02
+1.373550E+00
+3.796357E-01
+5.252455E-06
+2.290531E-11
+5.252455E-06
+2.290531E-11
+3.359792E-02
+2.267331E-04
+2.459115E-02
+1.233078E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.260440E-05
-2.080213E-09
-9.514028E-02
-1.832676E-03
+7.004005E-05
+1.748739E-09
+8.104946E-02
+1.395618E-03
 tally 2:
 0.000000E+00
 0.000000E+00
@ -46,16 +46,16 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.700000E-01
-6.530000E-02
+2.000000E-01
+9.000000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.000000E-02
-1.100000E-03
+2.000000E-02
+2.000000E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -75,27 +75,27 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.477762E-03
-3.606695E-05
-7.477762E-03
-3.606695E-05
-5.749995E-01
-6.679702E-02
-1.748150E+00
-6.191138E-01
+1.408027E-03
+1.849607E-06
+1.408027E-03
+1.849607E-06
+3.946436E-01
+3.166261E-02
+1.288136E+00
+3.382059E-01
+2.179241E-05
+4.749090E-10
+2.179241E-05
+4.749090E-10
+3.146594E-02
+2.159308E-04
+4.278352E-02
+4.094478E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.201948E-02
-3.812116E-04
-2.128743E-02
-1.104373E-04
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.503792E-04
-7.112750E-09
-9.209675E-02
-1.724470E-03
+1.736514E-04
+1.245171E-08
+7.989710E-02
+1.377742E-03
--- a/tests/test_score_absorption/inputs_true.dat
+++ b/tests/test_score_absorption/inputs_true.dat
@ -1 +1 @@
-55faff4d2b9eb95d51b31ec618a03a25b1bc82338fe5a043ffcf4ced388265c75cf7d97db94dc50622edc592f093f366de490c94c01ee20a1df1de635f659533
+a2be808e033014c9d748a0ec503ab6ad498f6b70250c8136bfcb9dc8f5580e69fc0bc1c6acab428c139edf64f51237ba07495b0275a19f509bf3bd20fa298e4e
--- a/tests/test_score_absorption/results_true.dat
+++ b/tests/test_score_absorption/results_true.dat
@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-3.336094E+00
-2.246259E+00
-3.247758E-02
-2.553866E-04
-4.583764E-01
-4.253734E-02
+2.533174E+00
+1.298118E+00
+2.453769E-02
+1.227715E-04
+3.869051E-01
+3.180828E-02
 tally 2:
 0.000000E+00
 0.000000E+00
-3.380000E+00
-2.293800E+00
-1.000000E-02
-1.000000E-04
-4.400000E-01
-4.360000E-02
+2.540000E+00
+1.293400E+00
+4.000000E-02
+6.000000E-04
+4.000000E-01
+3.600000E-02
 tally 3:
 0.000000E+00
 0.000000E+00
-3.251414E+00
-2.129893E+00
-2.185530E-02
-1.156492E-04
-4.456283E-01
-4.031784E-02
+2.422314E+00
+1.193460E+00
+4.285618E-02
+4.109734E-04
+3.832282E-01
+3.169516E-02
--- a/tests/test_score_events/inputs_true.dat
+++ b/tests/test_score_events/inputs_true.dat
@ -1 +1 @@
-6ad38e2ba1108cbc2a1cb6bfcb5131fd5f7d31c7699c7659daeb42733d75df6cb1ef058277e300d35374d54f0b85a210c0ab0a37dc80a1b234e455d4293af94f
+493830fe4598d5a2e31d4b79aceb79390bfa0bd7e08681ef36d5978a72de3cd7bcdbc06147061664614ed8e069be82d01e880e8e8cb629d3bd7aa1223850c8e6
--- a/tests/test_score_events/results_true.dat
+++ b/tests/test_score_events/results_true.dat
@ -1,12 +1,12 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-8.539000E+01
-1.463307E+03
-2.312000E+01
-1.070560E+02
+6.520000E+01
+8.551888E+02
+4.035000E+01
+3.351119E+02
 tally 2:
-2.278000E+01
-1.042404E+02
-6.260000E+00
-7.850600E+00
+1.739000E+01
+6.083290E+01
+1.104000E+01
+2.498260E+01
--- a/tests/test_score_fission/inputs_true.dat
+++ b/tests/test_score_fission/inputs_true.dat
@ -1 +1 @@
-43d51743c601d4e347e7a1735398b76213fdf22488749d9496093bd8ccc2ead36c1fadfe7dc27b74d21832b270a0b88d03c6e0ce5fcae066f7a7a32789abb8fd
+e94e6338c6aadaebd6f3cdad768b53908e470dc6d650a170703b21bf0140313559ce2af78f6b8bd13498dc5019ce02603ec6ba7c68731dfa05ca4a540f159625
--- a/tests/test_score_fission/results_true.dat
+++ b/tests/test_score_fission/results_true.dat
@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.559747E+00
-4.911504E-01
+1.156315E+00
+2.733527E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.579938E-01
-2.731974E-02
+6.971594E-01
+1.004973E-01
 tally 2:
-1.526951E+00
-4.824326E-01
+1.225263E+00
+3.054971E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.966177E-01
-3.291468E-02
+6.475958E-01
+8.567154E-02
 tally 3:
-1.496616E+00
-4.530639E-01
+1.131528E+00
+2.612886E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.919885E-01
-3.104206E-02
+7.021712E-01
+1.008605E-01
--- a/tests/test_score_flux/inputs_true.dat
+++ b/tests/test_score_flux/inputs_true.dat
@ -1 +1 @@
-6f1f560fb5830abea765a6ee6a2d5762f6107398e7ec6adf136d718846ca9b73b00f3e1b73a3433cf812532def4cd614e251d7c40b0d4e0e38f47c4a44d08b8b
+23454cbb568dd5f8569f228b3d0e6d180144279005521ad009d6a99384db79330b274edc431133f5e304a6750bef2b85bfc5af46258a75ce3f0673dd0ec0c54c
--- a/tests/test_score_flux/results_true.dat
+++ b/tests/test_score_flux/results_true.dat
@ -1,41 +1,41 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-5.010477E+01
-5.039958E+02
-1.732466E+01
-6.033456E+01
-8.428445E+01
-1.425022E+03
-1.357577E+01
-3.704803E+01
-4.758922E+00
-4.591527E+00
-2.297418E+01
-1.067445E+02
+3.890713E+01
+3.046363E+02
+1.366220E+01
+3.758161E+01
+6.561669E+01
+8.680729E+02
+2.382728E+01
+1.170590E+02
+8.047875E+00
+1.334796E+01
+4.056568E+01
+3.389623E+02
 tally 2:
-5.188799E+01
-5.402176E+02
-1.593914E+01
-5.169154E+01
-8.557014E+01
-1.465192E+03
-1.427596E+01
-4.078276E+01
-4.943558E+00
-5.054633E+00
-2.194332E+01
-9.737940E+01
+3.862543E+01
+2.993190E+02
+1.438678E+01
+4.193571E+01
+6.400634E+01
+8.298077E+02
+2.426423E+01
+1.215124E+02
+7.600812E+00
+1.199814E+01
+4.104875E+01
+3.455300E+02
 tally 3:
-5.188799E+01
-5.402176E+02
-1.593914E+01
-5.169154E+01
-8.557014E+01
-1.465192E+03
-1.427596E+01
-4.078276E+01
-4.943558E+00
-5.054633E+00
-2.194332E+01
-9.737940E+01
+3.862543E+01
+2.993190E+02
+1.438678E+01
+4.193571E+01
+6.400634E+01
+8.298077E+02
+2.426423E+01
+1.215124E+02
+7.600812E+00
+1.199814E+01
+4.104875E+01
+3.455300E+02
--- a/tests/test_score_flux_yn/inputs_true.dat
+++ b/tests/test_score_flux_yn/inputs_true.dat
@ -1 +1 @@
-7436214ee6931cdc4e8cf00a35f67c60280187fd6989a2ba3e8d51215e585cfc5cae41d5bab63176e306bcaf16e425f0b36bb8241a063f35ef36df2410bdf86a
+56b5f317d465ab32d9bc2cf85f1a22b7df773edcc642981707febd2e988e4174a3f0234744f192182edb51af23b541325496c2ca4530303afc0d2baefc0ce60e
--- a/tests/test_score_flux_yn/results_true.dat
+++ b/tests/test_score_flux_yn/results_true.dat
--- a/tests/test_score_kappafission/inputs_true.dat
+++ b/tests/test_score_kappafission/inputs_true.dat
@ -1 +1 @@
-46d1dbf99a14e08eddf34721d2380bf7969b8d299c48a64cfae22dfde29e3b8eab227d663f3ecb234dac2712b5971af2735fd69301b7614c7adae6c3da795e51
+8dd415b571ad51a62f2394d149f6c417d63babd4e85a1ff6f1cac267c4f4bcd0642ba0b24da39ff926bee4aea7dbbe0371face03d2009d8d74e7ac31c7c45000
--- a/tests/test_score_kappafission/results_true.dat
+++ b/tests/test_score_kappafission/results_true.dat
@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-3.057169E+02
-1.886844E+04
+2.266048E+02
+1.049833E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.017044E+01
-1.049216E+03
+1.366139E+02
+3.859561E+03
 tally 2:
-2.992056E+02
-1.852593E+04
+2.402814E+02
+1.174003E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.782271E+01
-1.267469E+03
+1.270420E+02
+3.297537E+03
 tally 3:
-2.933944E+02
-1.740955E+04
+2.217075E+02
+1.003168E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.679811E+01
-1.191597E+03
+1.375693E+02
+3.872389E+03
--- a/tests/test_score_nufission/inputs_true.dat
+++ b/tests/test_score_nufission/inputs_true.dat
@ -1 +1 @@
-8500d149868598a30fc818a34fe0465cf926b79632a8a7a1f96799cc955f30544b2cec131878bbded295179a2fc103657c2ecdb8c28ea10b84b7f6f0091fac7a
+0e60125f41bbc362703886097b2bc7297ff0aae6365d4653771b86b1aab2de43a924d81b3d73afb781733b2919f30089373f74da4a96f94f988eb04ddf482e85
--- a/tests/test_score_nufission/results_true.dat
+++ b/tests/test_score_nufission/results_true.dat
@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-4.110726E+00
-3.411205E+00
+3.041781E+00
+1.891714E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.429333E-01
-1.889683E-01
+1.835166E+00
+6.963265E-01
 tally 2:
-4.104411E+00
-3.453290E+00
+3.341227E+00
+2.322075E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.034371E+00
-2.220105E-01
+1.862652E+00
+7.112121E-01
 tally 3:
-3.947006E+00
-3.149452E+00
+2.975121E+00
+1.806644E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.031768E+00
-2.152452E-01
+1.846861E+00
+6.985413E-01
--- a/tests/test_score_nuscatter/inputs_true.dat
+++ b/tests/test_score_nuscatter/inputs_true.dat
@ -1 +1 @@
-41644968ea3a500af029e799ceef40c270d26944e0e7426afe1b8b2e15743b79c8b2989ecaaa0dac958046a89a49dab9d592cc7a4e059cd1f917b62219a8ed31
+5d0e915af1f424b8ca9d3723fecc2e0e0c558bcbe70b5ad45bcc8e03caf9b4caae9ed593010ce31c6dfe09be06a6dc3929b839999132917569f2ed93c3b70455
--- a/tests/test_score_nuscatter/results_true.dat
+++ b/tests/test_score_nuscatter/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.940000E+01
-7.561780E+01
-4.340000E+00
-3.813000E+00
-6.440000E+01
-8.302674E+02
+1.485000E+01
+4.439790E+01
+4.120000E+00
+3.438000E+00
+5.173000E+01
+5.467243E+02
--- a/tests/test_score_nuscatter_n/inputs_true.dat
+++ b/tests/test_score_nuscatter_n/inputs_true.dat
@ -1 +1 @@
-c8072b4ce735db4cc196a688f2d253e5683d5ef7b7a254ceab4d689d3902bb4fd7223ad824d002f3abf7e0fe7fbd80ab6c0273c8972df1ec26ff69cbd26c13ee
+3db6a6067fb07ed0e213c1e293f32a23ab64fbfb45a7a69320e8326ae76e5a3020c2f73986e7a93eeee1dde1422d84081ff18f0a9770aaba94423586bd134721
--- a/tests/test_score_nuscatter_n/results_true.dat
+++ b/tests/test_score_nuscatter_n/results_true.dat
@ -1,33 +1,33 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
-4.340000E+00
-3.813000E+00
-6.633546E-01
-9.836364E-02
-3.707954E-01
-3.694050E-02
-4.267991E-02
-1.870638E-03
-5.239484E-02
-1.032955E-02
-6.440000E+01
-8.302674E+02
-3.312945E+01
-2.197504E+02
-1.239256E+01
-3.104303E+01
-7.813162E-01
-2.790254E-01
-1.320978E+00
-4.696586E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
+4.120000E+00
+3.438000E+00
+6.222571E-01
+8.335984E-02
+1.670136E-01
+1.374768E-02
+-5.819374E-02
+1.091808E-02
+-6.389550E-02
+5.688533E-03
+5.173000E+01
+5.467243E+02
+2.669403E+01
+1.451361E+02
+9.691140E+00
+1.933574E+01
+5.860769E-01
+2.122377E-01
+-1.190340E+00
+3.145785E-01
--- a/tests/test_score_nuscatter_pn/inputs_true.dat
+++ b/tests/test_score_nuscatter_pn/inputs_true.dat
@ -1 +1 @@
-dbe91c112a02bf9c1098c2ba93c737bfd048f356d00dab280a245c572821d345a9d4c2cfa766f8b83c42362d9b8dbbb3d5ce240b6e749541aac3cae567b715c4
+5cd39eacee3efe8d7a8db38edb741d8f773a0b42276dab8635d36e7fc9809617d9ad47510be06bc019472e1b792bc678d88fcbb26ca4ed07504a222388ee230c
--- a/tests/test_score_nuscatter_pn/results_true.dat
+++ b/tests/test_score_nuscatter_pn/results_true.dat
@ -1,24 +1,24 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
 tally 2:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
--- a/tests/test_score_nuscatter_yn/inputs_true.dat
+++ b/tests/test_score_nuscatter_yn/inputs_true.dat
@ -1 +1 @@
-31e4d35c4845eaa7d3ec4b021f820a4526b0d8a43fdd69288c1c94551a895c05bbd10cfe72b54dafc9abe31ed56ef06a6fb3de77088e4c2da25b547fc06ac74d
+4bce40c1119ba7ac23c12b0fcf79fbf9b6dfb89ce2921f5f3906cb8683b79355bd9ba208c80f736f03ea18dccf3449a4ddaedb72ebb10b27301e843c31822f58
--- a/tests/test_score_nuscatter_yn/results_true.dat
+++ b/tests/test_score_nuscatter_yn/results_true.dat
@ -1,38 +1,38 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
+1.485000E+01
+4.439790E+01
 tally 2:
-1.940000E+01
-7.561780E+01
-8.464573E-02
-1.823218E-02
-1.116469E-01
-3.380141E-02
-2.130479E-03
-1.022241E-02
-4.896859E-02
-1.074348E-02
-1.482536E-01
-1.114316E-02
-6.827566E-02
-4.248457E-03
-1.494503E-01
-2.605186E-02
-2.010847E-01
-1.699034E-02
-4.535125E-02
-2.658493E-03
-4.135950E-02
-4.170544E-03
-1.277006E-01
-6.276355E-03
-4.192667E-02
-4.955945E-03
-9.607170E-02
-3.280003E-03
-1.533637E-01
-7.107300E-03
-3.570929E-02
-4.795032E-03
+1.485000E+01
+4.439790E+01
+8.440076E-02
+1.135203E-02
+8.198663E-02
+3.887429E-02
+1.358080E-01
+2.890416E-02
+-3.544823E-02
+9.843339E-04
+1.542072E-01
+8.228126E-03
+1.057111E-01
+3.758100E-03
+1.647870E-02
+4.827841E-03
+1.378297E-01
+1.566876E-02
+-4.676778E-02
+4.809366E-03
+1.966204E-02
+7.447981E-04
+-1.889258E-02
+6.841953E-04
+1.337703E-02
+1.250077E-03
+1.044684E-01
+6.969498E-03
+-1.177995E-02
+8.208715E-03
+1.940058E-04
+5.128759E-03
--- a/tests/test_score_scatter/inputs_true.dat
+++ b/tests/test_score_scatter/inputs_true.dat
@ -1 +1 @@
-c07fa98f19d66732be7bd394b30b6e2d18d54a9fec2ae729e9d00adb55d9c00533bacb2d3fe4eee7f41e6e0b6841e82ff313bc593bf3b7932bd8d026dc81a58d
+8b5e7c3825ef033d12c0574595b16559981ed3dd0ced8609c461cd0e81f1f2ef28195e0a6f6886fcbae64185dfe96001fa12d3d472f6446a3135d3bd6ef83394
--- a/tests/test_score_scatter/results_true.dat
+++ b/tests/test_score_scatter/results_true.dat
@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.907306E+01
-7.310892E+01
-4.678711E+00
-4.406892E+00
-6.487881E+01
-8.433246E+02
+1.514235E+01
+4.620490E+01
+3.839050E+00
+2.975620E+00
+5.317903E+01
+5.754103E+02
 tally 2:
 0.000000E+00
 0.000000E+00
-1.940000E+01
-7.561780E+01
-4.340000E+00
-3.813000E+00
-6.440000E+01
-8.302674E+02
+1.485000E+01
+4.439790E+01
+4.120000E+00
+3.438000E+00
+5.173000E+01
+5.467243E+02
 tally 3:
 0.000000E+00
 0.000000E+00
-1.952859E+01
-7.659866E+01
-4.328145E+00
-3.794232E+00
-6.439437E+01
-8.300759E+02
+1.496769E+01
+4.502714E+01
+4.117144E+00
+3.431861E+00
+5.174677E+01
+5.469474E+02
--- a/tests/test_score_scatter_n/inputs_true.dat
+++ b/tests/test_score_scatter_n/inputs_true.dat
@ -1 +1 @@
-5a6ec0557a68deb5334e0689575531328bad6964f48409ef70343266e88a5c691099486813c69c3c4c0e6154e23342d228f924606b664ae7c4cdd24818626797
+414d0faeba75d27e4785faa9812f5eac6aa108e7fd3c1388d51ae8e0d7fddd25e9f61e51afdaa70874a32e1c3d2815d82b5c79636b1ccb0d6767144fcf6f813a
--- a/tests/test_score_scatter_n/results_true.dat
+++ b/tests/test_score_scatter_n/results_true.dat
@ -1,33 +1,33 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
-4.340000E+00
-3.813000E+00
-6.633546E-01
-9.836364E-02
-3.707954E-01
-3.694050E-02
-4.267991E-02
-1.870638E-03
-5.239484E-02
-1.032955E-02
-6.440000E+01
-8.302674E+02
-3.312945E+01
-2.197504E+02
-1.239256E+01
-3.104303E+01
-7.813162E-01
-2.790254E-01
-1.320978E+00
-4.696586E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
+4.120000E+00
+3.438000E+00
+6.222571E-01
+8.335984E-02
+1.670136E-01
+1.374768E-02
+-5.819374E-02
+1.091808E-02
+-6.389550E-02
+5.688533E-03
+5.173000E+01
+5.467243E+02
+2.669403E+01
+1.451361E+02
+9.691140E+00
+1.933574E+01
+5.860769E-01
+2.122377E-01
+-1.190340E+00
+3.145785E-01
--- a/tests/test_score_scatter_pn/inputs_true.dat
+++ b/tests/test_score_scatter_pn/inputs_true.dat
@ -1 +1 @@
-112ae1a84c81f58885583b463f576bf1d9b5f5cbb0f5dfb36147ab30be2ef0d7506cfee053b54c26baad1b233d5d97cd1698c2af909682275e0b8fd79dd8f43c
+f83e5a272e78dba7a4b3412aa264300efbeae641de0bbcae3febe7ba5fa6668dbf9364fdc7f1c431ab9c58aaf019ae41d98ee69d4dd035d6b5e0188e7d181b20
--- a/tests/test_score_scatter_pn/results_true.dat
+++ b/tests/test_score_scatter_pn/results_true.dat
@ -1,24 +1,24 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
 tally 2:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
--- a/tests/test_score_scatter_yn/inputs_true.dat
+++ b/tests/test_score_scatter_yn/inputs_true.dat
@ -1 +1 @@
-ad59269de656ab6ea87cf55f1ecb8cd60f4bb652b881bc9f3f705fd17714fee4cdbb105b99d9b50e5d39375f89d37437888d432f53457cd5d61e1956b81e2097
+c90d836355fcbe14112c16f8743b9180371400c022b19f693881d91924788555ed1507a1936b4d241a63564a7661f380c5d0568d398fa8a20a25f41c5b7c4fb8
--- a/tests/test_score_scatter_yn/results_true.dat
+++ b/tests/test_score_scatter_yn/results_true.dat
@ -1,56 +1,56 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
+1.485000E+01
+4.439790E+01
 tally 2:
-1.940000E+01
-7.561780E+01
-8.464573E-02
-1.823218E-02
-1.116469E-01
-3.380141E-02
-2.130479E-03
-1.022241E-02
-4.896859E-02
-1.074348E-02
-1.482536E-01
-1.114316E-02
-6.827566E-02
-4.248457E-03
-1.494503E-01
-2.605186E-02
-2.010847E-01
-1.699034E-02
-4.535125E-02
-2.658493E-03
-4.135950E-02
-4.170544E-03
-1.277006E-01
-6.276355E-03
-4.192667E-02
-4.955945E-03
-9.607170E-02
-3.280003E-03
-1.533637E-01
-7.107300E-03
-3.570929E-02
-4.795032E-03
-1.183812E-01
-3.369458E-03
-1.555883E-02
-9.917545E-04
-9.288972E-02
-2.083169E-03
-1.698033E-02
-1.027209E-03
-7.433184E-03
-5.046022E-04
-9.078711E-02
-2.020877E-03
-7.502769E-02
-2.431965E-03
-3.565718E-02
-5.978599E-03
-7.076433E-02
-2.138810E-03
+1.485000E+01
+4.439790E+01
+8.440076E-02
+1.135203E-02
+8.198663E-02
+3.887429E-02
+1.358080E-01
+2.890416E-02
+-3.544823E-02
+9.843339E-04
+1.542072E-01
+8.228126E-03
+1.057111E-01
+3.758100E-03
+1.647870E-02
+4.827841E-03
+1.378297E-01
+1.566876E-02
+-4.676778E-02
+4.809366E-03
+1.966204E-02
+7.447981E-04
+-1.889258E-02
+6.841953E-04
+1.337703E-02
+1.250077E-03
+1.044684E-01
+6.969498E-03
+-1.177995E-02
+8.208715E-03
+1.940058E-04
+5.128759E-03
+-2.165868E-02
+1.335569E-03
+3.080886E-02
+4.544434E-04
+1.039856E-03
+1.209631E-03
+1.317068E-02
+1.469722E-03
+-6.432758E-02
+2.106736E-03
+-3.323023E-02
+4.513838E-03
+2.683700E-02
+1.146747E-03
+3.494912E-02
+1.006153E-03
+6.289525E-02
+3.700145E-03
--- a/tests/test_score_total/inputs_true.dat
+++ b/tests/test_score_total/inputs_true.dat
@ -1 +1 @@
-1ba17d4cef859221f314a0e7576a762260effe8f1977c9c6c74a80007d80b92d8d0fffadf39dde5e054809f3bf63529930428f79c6c4008d53e8be7644cd538a
+90633c6010148c10c363ed3b2e9de3213468c51dea6153dff4bb18eadc579041d967e4835023d10b6d8c42fe81017238d119f24cae754d0621698547464b16f3
--- a/tests/test_score_total/results_true.dat
+++ b/tests/test_score_total/results_true.dat
@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-2.240915E+01
-1.009032E+02
-4.711189E+00
-4.469059E+00
-6.533718E+01
-8.552989E+02
+1.767552E+01
+6.295417E+01
+3.863588E+00
+3.013300E+00
+5.356594E+01
+5.839391E+02
 tally 2:
 0.000000E+00
 0.000000E+00
-2.278000E+01
-1.042404E+02
-4.350000E+00
-3.833900E+00
-6.484000E+01
-8.416314E+02
+1.739000E+01
+6.083290E+01
+4.160000E+00
+3.501000E+00
+5.213000E+01
+5.552351E+02
 tally 3:
 0.000000E+00
 0.000000E+00
-2.278000E+01
-1.042404E+02
-4.350000E+00
-3.833900E+00
-6.484000E+01
-8.416314E+02
+1.739000E+01
+6.083290E+01
+4.160000E+00
+3.501000E+00
+5.213000E+01
+5.552351E+02
--- a/tests/test_score_total_yn/inputs_true.dat
+++ b/tests/test_score_total_yn/inputs_true.dat
@ -1 +1 @@
-8967621db0c045e1c12b181eb825b0528bf1f8ef03d5d5e036e14f5151d4bcec36c56b1ec2faba66254d09a29795f9ed44599762e7dfd506fff8bf4d27de8328
+1bbb4a3aa9e60b4117ae6cdac13ad20e037846be37100516cbca70ad48947837f157ba441d839b773a260026284fb0f45c80b49db4c1522e64e46d905c77899a
--- a/tests/test_score_total_yn/results_true.dat
+++ b/tests/test_score_total_yn/results_true.dat