From 44a5a03744c5ad1ff8abe248612e5645d03f6dfc Mon Sep 17 00:00:00 2001 From: Miriam Date: Thu, 17 Sep 2020 19:01:33 +0000 Subject: [PATCH] Updated testing --- .../mgxs_library_condense/inputs_true.dat | 4 +- .../mgxs_library_condense/results_true.dat | 52 ++-- .../mgxs_library_hdf5/inputs_true.dat | 4 +- .../mgxs_library_hdf5/results_true.dat | 16 +- .../mgxs_library_mesh/inputs_true.dat | 4 +- .../mgxs_library_mesh/results_true.dat | 52 ++-- .../mgxs_library_no_nuclides/inputs_true.dat | 252 +++++++++--------- .../mgxs_library_no_nuclides/results_true.dat | 60 ++--- 8 files changed, 209 insertions(+), 235 deletions(-) diff --git a/tests/regression_tests/mgxs_library_condense/inputs_true.dat b/tests/regression_tests/mgxs_library_condense/inputs_true.dat index 8e649ea827..b5b0175623 100644 --- a/tests/regression_tests/mgxs_library_condense/inputs_true.dat +++ b/tests/regression_tests/mgxs_library_condense/inputs_true.dat @@ -428,13 +428,13 @@ tracklength - 1 69 2 + 1 69 total delayed-nu-fission tracklength - 1 69 2 + 1 69 total decay-rate tracklength diff --git a/tests/regression_tests/mgxs_library_condense/results_true.dat b/tests/regression_tests/mgxs_library_condense/results_true.dat index 55c8c834a8..960d8d106f 100644 --- a/tests/regression_tests/mgxs_library_condense/results_true.dat +++ b/tests/regression_tests/mgxs_library_condense/results_true.dat @@ -290,32 +290,32 @@ 21 2 2 1 4 1 total 0.002732 0.000330 22 2 2 1 5 1 total 0.001214 0.000143 23 2 2 1 6 1 total 0.000505 0.000059 - mesh 1 delayedgroup group in nuclide mean std. dev. - x y z -0 1 1 1 1 1 total 0.013357 0.000929 -1 1 1 1 2 1 total 0.032589 0.002199 -2 1 1 1 3 1 total 0.121106 0.008007 -3 1 1 1 4 1 total 0.306140 0.019650 -4 1 1 1 5 1 total 0.862764 0.052685 -5 1 1 1 6 1 total 2.897892 0.177498 -12 1 2 1 1 1 total 0.013356 0.001330 -13 1 2 1 2 1 total 0.032598 0.003165 -14 1 2 1 3 1 total 0.121086 0.011554 -15 1 2 1 4 1 total 0.305948 0.028460 -16 1 2 1 5 1 total 0.862070 0.076649 -17 1 2 1 6 1 total 2.895530 0.258195 -6 2 1 1 1 1 total 0.013355 0.001389 -7 2 1 1 2 1 total 0.032601 0.003293 -8 2 1 1 3 1 total 0.121079 0.011980 -9 2 1 1 4 1 total 0.305874 0.029310 -10 2 1 1 5 1 total 0.861802 0.077464 -11 2 1 1 6 1 total 2.894617 0.261360 -18 2 2 1 1 1 total 0.013354 0.001670 -19 2 2 1 2 1 total 0.032610 0.003972 -20 2 2 1 3 1 total 0.121059 0.014468 -21 2 2 1 4 1 total 0.305680 0.035462 -22 2 2 1 5 1 total 0.861087 0.093863 -23 2 2 1 6 1 total 2.892185 0.316700 + mesh 1 delayedgroup nuclide mean std. dev. + x y z +0 1 1 1 1 total 0.013357 0.000957 +1 1 1 1 2 total 0.032589 0.002282 +2 1 1 1 3 total 0.121106 0.008354 +3 1 1 1 4 total 0.306140 0.020673 +4 1 1 1 5 total 0.862764 0.056302 +5 1 1 1 6 total 2.897892 0.189487 +12 1 2 1 1 total 0.013356 0.001529 +13 1 2 1 2 total 0.032598 0.003723 +14 1 2 1 3 total 0.121086 0.013808 +15 1 2 1 4 total 0.305948 0.034825 +16 1 2 1 5 total 0.862070 0.097922 +17 1 2 1 6 total 2.895530 0.328926 +6 2 1 1 1 total 0.013355 0.001381 +7 2 1 1 2 total 0.032601 0.003301 +8 2 1 1 3 total 0.121079 0.012082 +9 2 1 1 4 total 0.305874 0.029845 +10 2 1 1 5 total 0.861802 0.080523 +11 2 1 1 6 total 2.894617 0.271269 +18 2 2 1 1 total 0.013354 0.001732 +19 2 2 1 2 total 0.032610 0.004117 +20 2 2 1 3 total 0.121059 0.014991 +21 2 2 1 4 total 0.305680 0.036716 +22 2 2 1 5 total 0.861087 0.097002 +23 2 2 1 6 total 2.892185 0.327342 mesh 1 delayedgroup group in group out nuclide mean std. dev. x y z 0 1 1 1 1 1 1 total 0.000000 0.000000 diff --git a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat index 8e649ea827..b5b0175623 100644 --- a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat +++ b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat @@ -428,13 +428,13 @@ tracklength - 1 69 2 + 1 69 total delayed-nu-fission tracklength - 1 69 2 + 1 69 total decay-rate tracklength diff --git a/tests/regression_tests/mgxs_library_hdf5/results_true.dat b/tests/regression_tests/mgxs_library_hdf5/results_true.dat index b479c139a8..e005236c5a 100644 --- a/tests/regression_tests/mgxs_library_hdf5/results_true.dat +++ b/tests/regression_tests/mgxs_library_hdf5/results_true.dat @@ -183,18 +183,10 @@ domain=1 type=beta [1.21876271e-04 8.77101834e-05] [4.95946084e-05 3.67414816e-05]] domain=1 type=decay-rate -[[1.34479215e-02 1.33360001e-02] - [3.20491028e-02 3.27389978e-02] - [1.22162808e-01 1.20780007e-01] - [3.15480592e-01 3.02780066e-01] - [8.89723658e-01 8.49490289e-01] - [2.99112795e+00 2.85300089e+00]] -[[5.47700122e-04 1.13399549e-03] - [1.53954980e-03 2.78388383e-03] - [6.44048392e-03 1.02702443e-02] - [1.86178714e-02 2.57461915e-02] - [6.12200714e-02 7.22344077e-02] - [2.04036637e-01 2.42598218e-01]] +[1.33568413e-02 3.25887984e-02 1.21105565e-01 3.06139633e-01 + 8.62763808e-01 2.89789222e+00] +[9.57055016e-04 2.28222032e-03 8.35436401e-03 2.06734948e-02 + 5.63019289e-02 1.89486538e-01] domain=1 type=delayed-nu-fission matrix [[[0.00000000e+00 0.00000000e+00] [0.00000000e+00 0.00000000e+00]] diff --git a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat index 1f3c1ff6e6..25ef3b0d0c 100644 --- a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat +++ b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat @@ -408,13 +408,13 @@ tracklength - 1 69 2 + 1 69 total delayed-nu-fission tracklength - 1 69 2 + 1 69 total decay-rate tracklength diff --git a/tests/regression_tests/mgxs_library_mesh/results_true.dat b/tests/regression_tests/mgxs_library_mesh/results_true.dat index cbcbcb239b..2c06cecda5 100644 --- a/tests/regression_tests/mgxs_library_mesh/results_true.dat +++ b/tests/regression_tests/mgxs_library_mesh/results_true.dat @@ -290,32 +290,32 @@ 21 2 2 1 4 1 total 0.002431 0.000100 22 2 2 1 5 1 total 0.000997 0.000041 23 2 2 1 6 1 total 0.000417 0.000017 - mesh 1 delayedgroup group in nuclide mean std. dev. - x y z -0 1 1 1 1 1 total 0.013336 0.001120 -1 1 1 1 2 1 total 0.032739 0.002751 -2 1 1 1 3 1 total 0.120780 0.010147 -3 1 1 1 4 1 total 0.302780 0.025438 -4 1 1 1 5 1 total 0.849490 0.071370 -5 1 1 1 6 1 total 2.853000 0.239696 -12 1 2 1 1 1 total 0.013336 0.000695 -13 1 2 1 2 1 total 0.032739 0.001707 -14 1 2 1 3 1 total 0.120780 0.006296 -15 1 2 1 4 1 total 0.302780 0.015784 -16 1 2 1 5 1 total 0.849490 0.044285 -17 1 2 1 6 1 total 2.853000 0.148730 -6 2 1 1 1 1 total 0.013336 0.000906 -7 2 1 1 2 1 total 0.032739 0.002224 -8 2 1 1 3 1 total 0.120780 0.008205 -9 2 1 1 4 1 total 0.302780 0.020570 -10 2 1 1 5 1 total 0.849490 0.057711 -11 2 1 1 6 1 total 2.853000 0.193821 -18 2 2 1 1 1 total 0.013336 0.000528 -19 2 2 1 2 1 total 0.032739 0.001296 -20 2 2 1 3 1 total 0.120780 0.004781 -21 2 2 1 4 1 total 0.302780 0.011986 -22 2 2 1 5 1 total 0.849490 0.033628 -23 2 2 1 6 1 total 2.853000 0.112940 + mesh 1 delayedgroup nuclide mean std. dev. + x y z +0 1 1 1 1 total 0.013336 0.001120 +1 1 1 1 2 total 0.032739 0.002751 +2 1 1 1 3 total 0.120780 0.010147 +3 1 1 1 4 total 0.302780 0.025438 +4 1 1 1 5 total 0.849490 0.071370 +5 1 1 1 6 total 2.853000 0.239696 +12 1 2 1 1 total 0.013336 0.000695 +13 1 2 1 2 total 0.032739 0.001707 +14 1 2 1 3 total 0.120780 0.006296 +15 1 2 1 4 total 0.302780 0.015784 +16 1 2 1 5 total 0.849490 0.044285 +17 1 2 1 6 total 2.853000 0.148730 +6 2 1 1 1 total 0.013336 0.000906 +7 2 1 1 2 total 0.032739 0.002224 +8 2 1 1 3 total 0.120780 0.008205 +9 2 1 1 4 total 0.302780 0.020570 +10 2 1 1 5 total 0.849490 0.057711 +11 2 1 1 6 total 2.853000 0.193821 +18 2 2 1 1 total 0.013336 0.000528 +19 2 2 1 2 total 0.032739 0.001296 +20 2 2 1 3 total 0.120780 0.004781 +21 2 2 1 4 total 0.302780 0.011986 +22 2 2 1 5 total 0.849490 0.033628 +23 2 2 1 6 total 2.853000 0.112940 mesh 1 delayedgroup group in group out nuclide mean std. dev. x y z 0 1 1 1 1 1 1 total 0.000000 0.000000 diff --git a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat index 5aedd383d0..40f31d5630 100644 --- a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat +++ b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat @@ -71,10 +71,10 @@ 1 2 3 4 5 6 - + 2 - + 3 @@ -420,13 +420,13 @@ tracklength - 1 65 2 + 1 65 total delayed-nu-fission tracklength - 1 65 2 + 1 65 total decay-rate tracklength @@ -444,733 +444,733 @@ analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total total tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total total tracklength - 80 2 + 79 2 total flux analog - 80 5 6 + 79 5 6 total scatter analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total total tracklength - 80 2 + 79 2 total flux analog - 80 5 6 + 79 5 6 total nu-scatter analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total absorption tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total absorption tracklength - 80 2 + 79 2 total fission tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total fission tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total nu-fission tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total kappa-fission tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total scatter tracklength - 80 2 + 79 2 total flux analog - 80 2 + 79 2 total nu-scatter analog - 80 2 + 79 2 total flux analog - 80 2 5 28 + 79 2 5 28 total scatter analog - 80 2 + 79 2 total flux analog - 80 2 5 28 + 79 2 5 28 total nu-scatter analog - 80 2 5 + 79 2 5 total nu-scatter analog - 80 2 5 + 79 2 5 total scatter analog - 80 2 + 79 2 total flux analog - 80 2 5 + 79 2 5 total nu-fission analog - 80 2 5 + 79 2 5 total scatter analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total scatter tracklength - 80 2 5 28 + 79 2 5 28 total scatter analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total scatter tracklength - 80 2 5 28 + 79 2 5 28 total scatter analog - 80 2 5 + 79 2 5 total nu-scatter analog - 80 52 + 79 52 total nu-fission analog - 80 5 + 79 5 total nu-fission analog - 80 52 + 79 52 total prompt-nu-fission analog - 80 5 + 79 5 total prompt-nu-fission analog - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total inverse-velocity tracklength - 80 2 + 79 2 total flux tracklength - 80 2 + 79 2 total prompt-nu-fission tracklength - 80 2 + 79 2 total flux analog - 80 2 5 + 79 2 5 total prompt-nu-fission analog - 80 2 + 79 2 total flux tracklength - 80 65 2 + 79 65 2 total delayed-nu-fission tracklength - 80 65 52 + 79 65 52 total delayed-nu-fission analog - 80 65 5 + 79 65 5 total delayed-nu-fission analog - 80 2 + 79 2 total nu-fission tracklength - 80 65 2 + 79 65 2 total delayed-nu-fission tracklength - 80 65 2 + 79 65 total delayed-nu-fission tracklength - 80 65 2 + 79 65 total decay-rate tracklength - 80 2 + 79 2 total flux analog - 80 65 2 5 + 79 65 2 5 total delayed-nu-fission analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total total tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total total tracklength - 159 2 + 157 2 total flux analog - 159 5 6 + 157 5 6 total scatter analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total total tracklength - 159 2 + 157 2 total flux analog - 159 5 6 + 157 5 6 total nu-scatter analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total absorption tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total absorption tracklength - 159 2 + 157 2 total fission tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total fission tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total nu-fission tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total kappa-fission tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total scatter tracklength - 159 2 + 157 2 total flux analog - 159 2 + 157 2 total nu-scatter analog - 159 2 + 157 2 total flux analog - 159 2 5 28 + 157 2 5 28 total scatter analog - 159 2 + 157 2 total flux analog - 159 2 5 28 + 157 2 5 28 total nu-scatter analog - 159 2 5 + 157 2 5 total nu-scatter analog - 159 2 5 + 157 2 5 total scatter analog - 159 2 + 157 2 total flux analog - 159 2 5 + 157 2 5 total nu-fission analog - 159 2 5 + 157 2 5 total scatter analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total scatter tracklength - 159 2 5 28 + 157 2 5 28 total scatter analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total scatter tracklength - 159 2 5 28 + 157 2 5 28 total scatter analog - 159 2 5 + 157 2 5 total nu-scatter analog - 159 52 + 157 52 total nu-fission analog - 159 5 + 157 5 total nu-fission analog - 159 52 + 157 52 total prompt-nu-fission analog - 159 5 + 157 5 total prompt-nu-fission analog - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total inverse-velocity tracklength - 159 2 + 157 2 total flux tracklength - 159 2 + 157 2 total prompt-nu-fission tracklength - 159 2 + 157 2 total flux analog - 159 2 5 + 157 2 5 total prompt-nu-fission analog - 159 2 + 157 2 total flux tracklength - 159 65 2 + 157 65 2 total delayed-nu-fission tracklength - 159 65 52 + 157 65 52 total delayed-nu-fission analog - 159 65 5 + 157 65 5 total delayed-nu-fission analog - 159 2 + 157 2 total nu-fission tracklength - 159 65 2 + 157 65 2 total delayed-nu-fission tracklength - 159 65 2 + 157 65 total delayed-nu-fission tracklength - 159 65 2 + 157 65 total decay-rate tracklength - 159 2 + 157 2 total flux analog - 159 65 2 5 + 157 65 2 5 total delayed-nu-fission analog diff --git a/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat b/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat index dc98a2263e..279a669902 100644 --- a/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat +++ b/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat @@ -167,19 +167,13 @@ 6 1 4 2 total 0.002516 0.000273 8 1 5 2 total 0.001031 0.000112 10 1 6 2 total 0.000432 0.000047 - material delayedgroup group in nuclide mean std. dev. -1 1 1 1 total 0.013445 0.001084 -3 1 2 1 total 0.032064 0.002658 -5 1 3 1 total 0.122136 0.010296 -7 1 4 1 total 0.315269 0.027175 -9 1 5 1 total 0.889233 0.079368 -11 1 6 1 total 2.989404 0.266253 -0 1 1 2 total 0.013336 0.001446 -2 1 2 2 total 0.032739 0.003550 -4 1 3 2 total 0.120780 0.013098 -6 1 4 2 total 0.302780 0.032835 -8 1 5 2 total 0.849490 0.092124 -10 1 6 2 total 2.853001 0.309397 + material delayedgroup nuclide mean std. dev. +0 1 1 total 0.013355 0.001272 +1 1 2 total 0.032600 0.003048 +2 1 3 total 0.121083 0.011182 +3 1 4 total 0.305910 0.027728 +4 1 5 total 0.861934 0.075425 +5 1 6 total 2.895065 0.253942 material delayedgroup group in group out nuclide mean std. dev. 3 1 1 1 1 total 0.000000 0.000000 7 1 2 1 1 total 0.000000 0.000000 @@ -374,19 +368,13 @@ 6 2 4 2 total 0.0 0.0 8 2 5 2 total 0.0 0.0 10 2 6 2 total 0.0 0.0 - material delayedgroup group in nuclide mean std. dev. -1 2 1 1 total 0.0 0.0 -3 2 2 1 total 0.0 0.0 -5 2 3 1 total 0.0 0.0 -7 2 4 1 total 0.0 0.0 -9 2 5 1 total 0.0 0.0 -11 2 6 1 total 0.0 0.0 -0 2 1 2 total 0.0 0.0 -2 2 2 2 total 0.0 0.0 -4 2 3 2 total 0.0 0.0 -6 2 4 2 total 0.0 0.0 -8 2 5 2 total 0.0 0.0 -10 2 6 2 total 0.0 0.0 + material delayedgroup nuclide mean std. dev. +0 2 1 total 0.0 0.0 +1 2 2 total 0.0 0.0 +2 2 3 total 0.0 0.0 +3 2 4 total 0.0 0.0 +4 2 5 total 0.0 0.0 +5 2 6 total 0.0 0.0 material delayedgroup group in group out nuclide mean std. dev. 3 2 1 1 1 total 0.0 0.0 7 2 2 1 1 total 0.0 0.0 @@ -581,19 +569,13 @@ 6 3 4 2 total 0.0 0.0 8 3 5 2 total 0.0 0.0 10 3 6 2 total 0.0 0.0 - material delayedgroup group in nuclide mean std. dev. -1 3 1 1 total 0.0 0.0 -3 3 2 1 total 0.0 0.0 -5 3 3 1 total 0.0 0.0 -7 3 4 1 total 0.0 0.0 -9 3 5 1 total 0.0 0.0 -11 3 6 1 total 0.0 0.0 -0 3 1 2 total 0.0 0.0 -2 3 2 2 total 0.0 0.0 -4 3 3 2 total 0.0 0.0 -6 3 4 2 total 0.0 0.0 -8 3 5 2 total 0.0 0.0 -10 3 6 2 total 0.0 0.0 + material delayedgroup nuclide mean std. dev. +0 3 1 total 0.0 0.0 +1 3 2 total 0.0 0.0 +2 3 3 total 0.0 0.0 +3 3 4 total 0.0 0.0 +4 3 5 total 0.0 0.0 +5 3 6 total 0.0 0.0 material delayedgroup group in group out nuclide mean std. dev. 3 3 1 1 1 total 0.0 0.0 7 3 2 1 1 total 0.0 0.0