From 9a8d42baf32dfa19df0f704cc1fe23f4a719ec8e Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 8 Oct 2016 10:40:28 -0400 Subject: [PATCH 1/5] modified travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 46bb847e6a..ed81e6716e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ -sudo: false +sudo: required +dist: trusty language: python python: - "2.7" From 73d9f7ce019f700211c92cf1ca4ae1abd7b2ec35 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 8 Oct 2016 11:20:13 -0400 Subject: [PATCH 2/5] removed low-hanging gnu fortran 4.6 specific code --- src/global.F90 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/global.F90 b/src/global.F90 index bea5f61a83..d971581bae 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -468,12 +468,7 @@ contains do i = 1, size(nuclides) call nuclides(i) % clear() end do - - ! WARNING: The following statement should work but doesn't under gfortran - ! 4.6 because of a bug. Technically, commenting this out leaves a memory - ! leak. - - ! deallocate(nuclides) + deallocate(nuclides) end if if (allocated(nuclides_0K)) then From 490a0d8338dc2b1e24ed2f39961a121618ce1e79 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 8 Oct 2016 11:34:28 -0400 Subject: [PATCH 3/5] Updated reference to gfrotran 4.6.0 in the docs as being the minimum version --- docs/source/usersguide/install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst index 3dab08e9d3..925008495a 100644 --- a/docs/source/usersguide/install.rst +++ b/docs/source/usersguide/install.rst @@ -51,7 +51,7 @@ Prerequisites installed on your machine. Since a number of Fortran 2003/2008 features are used in the code, it is recommended that you use the latest version of whatever compiler you choose. For gfortran_, it is necessary to use - version 4.6.0 or above. + version 4.8.0 or above. If you are using Debian or a Debian derivative such as Ubuntu, you can install the gfortran compiler using the following command:: From 65513b2664b4686f15c39592b77d6f4d94098ed3 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 10 Oct 2016 09:04:57 -0400 Subject: [PATCH 4/5] Changes to testing scripts to less over-subscribe Travis (3 OMP threads to 2 and 3 MPI processes to 2) --- .travis.yml | 2 +- tests/testing_harness.py | 2 +- tests/travis_install.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed81e6716e..4236c36d1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,6 @@ before_script: script: - cd tests - - export OMP_NUM_THREADS=3 + - export OMP_NUM_THREADS=2 - ./travis.sh - cd .. diff --git a/tests/testing_harness.py b/tests/testing_harness.py index 5300131642..150d124c8c 100644 --- a/tests/testing_harness.py +++ b/tests/testing_harness.py @@ -24,7 +24,7 @@ class TestHarness(object): self.parser = OptionParser() self.parser.add_option('--exe', dest='exe', default='openmc') self.parser.add_option('--mpi_exec', dest='mpi_exec', default=None) - self.parser.add_option('--mpi_np', dest='mpi_np', type=int, default=3) + self.parser.add_option('--mpi_np', dest='mpi_np', type=int, default=2) self.parser.add_option('--update', dest='update', action='store_true', default=False) self._opts = None diff --git a/tests/travis_install.sh b/tests/travis_install.sh index df1c81314b..2e35c4f65b 100755 --- a/tests/travis_install.sh +++ b/tests/travis_install.sh @@ -8,7 +8,7 @@ if [[ ! -e $HOME/mpich_install/bin/mpiexec ]]; then tar -xzvf mpich-3.1.3.tar.gz >/dev/null 2>&1 cd mpich-3.1.3 ./configure --prefix=$HOME/mpich_install -q - make >/dev/null 2>&1 + make -j 2 >/dev/null 2>&1 make install >/dev/null 2>&1 cd .. fi @@ -22,7 +22,7 @@ if [[ ! -e $HOME/phdf5_install/bin/h5pfc ]]; then ./configure \ --prefix=$HOME/phdf5_install -q --enable-fortran \ --enable-fortran2003 --enable-parallel - make >/dev/null 2>&1 + make -j 2 >/dev/null 2>&1 make install >/dev/null 2>&1 cd .. fi @@ -33,7 +33,7 @@ if [[ ! -e $HOME/hdf5_install/bin/h5fc ]]; then cd hdf5-1.8.15 CC=gcc FC=gfortran ./configure --prefix=$HOME/hdf5_install -q \ --enable-fortran --enable-fortran2003 - make -j >/dev/null 2>&1 + make -j 2 >/dev/null 2>&1 make install >/dev/null 2>&1 cd .. fi From 4f3454edead1eacb3aed4b53e3aa9ff79724b316 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 10 Oct 2016 09:49:01 -0400 Subject: [PATCH 5/5] Significantly reduced the number of nuclides in the standard (HM problem I believe) input set, reducing the total test time by a good amount --- tests/input_set.py | 96 ----- tests/test_asymmetric_lattice/inputs_true.dat | 2 +- .../test_asymmetric_lattice/results_true.dat | 2 +- tests/test_filter_mesh/inputs_true.dat | 2 +- tests/test_filter_mesh/results_true.dat | 2 +- tests/test_iso_in_lab/inputs_true.dat | 2 +- tests/test_iso_in_lab/results_true.dat | 2 +- tests/test_mgxs_library_mesh/inputs_true.dat | 2 +- tests/test_mgxs_library_mesh/results_true.dat | 348 +++++++++--------- tests/test_tallies/inputs_true.dat | 2 +- tests/test_tallies/results_true.dat | 2 +- tests/test_tally_aggregation/inputs_true.dat | 2 +- tests/test_tally_aggregation/results_true.dat | 2 +- .../test_tally_aggregation.py | 6 +- tests/test_tally_arithmetic/inputs_true.dat | 2 +- .../test_tally_arithmetic.py | 4 +- tests/test_tally_slice_merge/inputs_true.dat | 2 +- tests/test_tally_slice_merge/results_true.dat | 96 ++--- 18 files changed, 240 insertions(+), 336 deletions(-) diff --git a/tests/input_set.py b/tests/input_set.py index 94576acf0d..f3f9e88bd4 100644 --- a/tests/input_set.py +++ b/tests/input_set.py @@ -27,37 +27,8 @@ class InputSet(object): fuel.set_density('g/cm3', 10.062) fuel.add_nuclide("U234", 4.9476e-6) fuel.add_nuclide("U235", 4.8218e-4) - fuel.add_nuclide("U236", 9.0402e-5) fuel.add_nuclide("U238", 2.1504e-2) - fuel.add_nuclide("Np237", 7.3733e-6) - fuel.add_nuclide("Pu238", 1.5148e-6) - fuel.add_nuclide("Pu239", 1.3955e-4) - fuel.add_nuclide("Pu240", 3.4405e-5) - fuel.add_nuclide("Pu241", 2.1439e-5) - fuel.add_nuclide("Pu242", 3.7422e-6) - fuel.add_nuclide("Am241", 4.5041e-7) - fuel.add_nuclide("Am242_m1", 9.2301e-9) - fuel.add_nuclide("Am243", 4.7878e-7) - fuel.add_nuclide("Cm242", 1.0485e-7) - fuel.add_nuclide("Cm243", 1.4268e-9) - fuel.add_nuclide("Cm244", 8.8756e-8) - fuel.add_nuclide("Cm245", 3.5285e-9) - fuel.add_nuclide("Mo95", 2.6497e-5) - fuel.add_nuclide("Tc99", 3.2772e-5) - fuel.add_nuclide("Ru101", 3.0742e-5) - fuel.add_nuclide("Ru103", 2.3505e-6) - fuel.add_nuclide("Ag109", 2.0009e-6) fuel.add_nuclide("Xe135", 1.0801e-8) - fuel.add_nuclide("Cs133", 3.4612e-5) - fuel.add_nuclide("Nd143", 2.6078e-5) - fuel.add_nuclide("Nd145", 1.9898e-5) - fuel.add_nuclide("Sm147", 1.6128e-6) - fuel.add_nuclide("Sm149", 1.1627e-7) - fuel.add_nuclide("Sm150", 7.1727e-6) - fuel.add_nuclide("Sm151", 5.4947e-7) - fuel.add_nuclide("Sm152", 3.0221e-6) - fuel.add_nuclide("Eu153", 2.6209e-6) - fuel.add_nuclide("Gd155", 1.5369e-9) fuel.add_nuclide("O16", 4.5737e-2) clad = openmc.Material(name='Cladding', material_id=2) @@ -93,27 +64,10 @@ class InputSet(object): rpv_steel.add_nuclide("Fe58", 0.00282159, 'wo') rpv_steel.add_nuclide("Ni58", 0.0067198, 'wo') rpv_steel.add_nuclide("Ni60", 0.0026776, 'wo') - rpv_steel.add_nuclide("Ni61", 0.0001183, 'wo') - rpv_steel.add_nuclide("Ni62", 0.0003835, 'wo') - rpv_steel.add_nuclide("Ni64", 0.0001008, 'wo') rpv_steel.add_nuclide("Mn55", 0.01, 'wo') - rpv_steel.add_nuclide("Mo92", 0.000849, 'wo') - rpv_steel.add_nuclide("Mo94", 0.0005418, 'wo') - rpv_steel.add_nuclide("Mo95", 0.0009438, 'wo') - rpv_steel.add_nuclide("Mo96", 0.0010002, 'wo') - rpv_steel.add_nuclide("Mo97", 0.0005796, 'wo') - rpv_steel.add_nuclide("Mo98", 0.0014814, 'wo') - rpv_steel.add_nuclide("Mo100", 0.0006042, 'wo') - rpv_steel.add_nuclide("Si28", 0.00367464, 'wo') - rpv_steel.add_nuclide("Si29", 0.00019336, 'wo') - rpv_steel.add_nuclide("Si30", 0.000132, 'wo') - rpv_steel.add_nuclide("Cr50", 0.00010435, 'wo') rpv_steel.add_nuclide("Cr52", 0.002092475, 'wo') - rpv_steel.add_nuclide("Cr53", 0.00024185, 'wo') - rpv_steel.add_nuclide("Cr54", 6.1325e-05, 'wo') rpv_steel.add_nuclide("C0", 0.0025, 'wo') rpv_steel.add_nuclide("Cu63", 0.0013696, 'wo') - rpv_steel.add_nuclide("Cu65", 0.0006304, 'wo') lower_rad_ref = openmc.Material(name='Lower radial reflector', material_id=6) @@ -127,18 +81,8 @@ class InputSet(object): lower_rad_ref.add_nuclide("Fe57", 0.01362750048, 'wo') lower_rad_ref.add_nuclide("Fe58", 0.001848545204, 'wo') lower_rad_ref.add_nuclide("Ni58", 0.055298376566, 'wo') - lower_rad_ref.add_nuclide("Ni60", 0.022034425592, 'wo') - lower_rad_ref.add_nuclide("Ni61", 0.000973510811, 'wo') - lower_rad_ref.add_nuclide("Ni62", 0.003155886695, 'wo') - lower_rad_ref.add_nuclide("Ni64", 0.000829500336, 'wo') lower_rad_ref.add_nuclide("Mn55", 0.0182870, 'wo') - lower_rad_ref.add_nuclide("Si28", 0.00839976771, 'wo') - lower_rad_ref.add_nuclide("Si29", 0.00044199679, 'wo') - lower_rad_ref.add_nuclide("Si30", 0.0003017355, 'wo') - lower_rad_ref.add_nuclide("Cr50", 0.007251360806, 'wo') lower_rad_ref.add_nuclide("Cr52", 0.145407678031, 'wo') - lower_rad_ref.add_nuclide("Cr53", 0.016806340306, 'wo') - lower_rad_ref.add_nuclide("Cr54", 0.004261520857, 'wo') lower_rad_ref.add_s_alpha_beta('c_H_in_H2O') upper_rad_ref = openmc.Material(name='Upper radial reflector /' @@ -153,18 +97,8 @@ class InputSet(object): upper_rad_ref.add_nuclide("Fe57", 0.01375486056, 'wo') upper_rad_ref.add_nuclide("Fe58", 0.001865821363, 'wo') upper_rad_ref.add_nuclide("Ni58", 0.055815129186, 'wo') - upper_rad_ref.add_nuclide("Ni60", 0.022240333032, 'wo') - upper_rad_ref.add_nuclide("Ni61", 0.000982608081, 'wo') - upper_rad_ref.add_nuclide("Ni62", 0.003185377845, 'wo') - upper_rad_ref.add_nuclide("Ni64", 0.000837251856, 'wo') upper_rad_ref.add_nuclide("Mn55", 0.0184579, 'wo') - upper_rad_ref.add_nuclide("Si28", 0.00847831314, 'wo') - upper_rad_ref.add_nuclide("Si29", 0.00044612986, 'wo') - upper_rad_ref.add_nuclide("Si30", 0.000304557, 'wo') - upper_rad_ref.add_nuclide("Cr50", 0.00731912987, 'wo') upper_rad_ref.add_nuclide("Cr52", 0.146766614995, 'wo') - upper_rad_ref.add_nuclide("Cr53", 0.01696340737, 'wo') - upper_rad_ref.add_nuclide("Cr54", 0.004301347765, 'wo') upper_rad_ref.add_s_alpha_beta('c_H_in_H2O') bot_plate = openmc.Material(name='Bottom plate region', material_id=8) @@ -178,18 +112,8 @@ class InputSet(object): bot_plate.add_nuclide("Fe57", 0.014750478, 'wo') bot_plate.add_nuclide("Fe58", 0.002000875025, 'wo') bot_plate.add_nuclide("Ni58", 0.059855207342, 'wo') - bot_plate.add_nuclide("Ni60", 0.023850159704, 'wo') - bot_plate.add_nuclide("Ni61", 0.001053732407, 'wo') - bot_plate.add_nuclide("Ni62", 0.003415945715, 'wo') - bot_plate.add_nuclide("Ni64", 0.000897854832, 'wo') bot_plate.add_nuclide("Mn55", 0.0197940, 'wo') - bot_plate.add_nuclide("Si28", 0.00909197802, 'wo') - bot_plate.add_nuclide("Si29", 0.00047842098, 'wo') - bot_plate.add_nuclide("Si30", 0.000326601, 'wo') - bot_plate.add_nuclide("Cr50", 0.007848910646, 'wo') bot_plate.add_nuclide("Cr52", 0.157390026871, 'wo') - bot_plate.add_nuclide("Cr53", 0.018191270146, 'wo') - bot_plate.add_nuclide("Cr54", 0.004612692337, 'wo') bot_plate.add_s_alpha_beta('c_H_in_H2O') bot_nozzle = openmc.Material(name='Bottom nozzle region', @@ -204,18 +128,8 @@ class InputSet(object): bot_nozzle.add_nuclide("Fe57", 0.01163454624, 'wo') bot_nozzle.add_nuclide("Fe58", 0.001578204652, 'wo') bot_nozzle.add_nuclide("Ni58", 0.047211231662, 'wo') - bot_nozzle.add_nuclide("Ni60", 0.018811987544, 'wo') - bot_nozzle.add_nuclide("Ni61", 0.000831139127, 'wo') - bot_nozzle.add_nuclide("Ni62", 0.002694352115, 'wo') - bot_nozzle.add_nuclide("Ni64", 0.000708189552, 'wo') bot_nozzle.add_nuclide("Mn55", 0.0156126, 'wo') - bot_nozzle.add_nuclide("Si28", 0.007171335558, 'wo') - bot_nozzle.add_nuclide("Si29", 0.000377356542, 'wo') - bot_nozzle.add_nuclide("Si30", 0.0002576079, 'wo') - bot_nozzle.add_nuclide("Cr50", 0.006190885148, 'wo') bot_nozzle.add_nuclide("Cr52", 0.124142524198, 'wo') - bot_nozzle.add_nuclide("Cr53", 0.014348496148, 'wo') - bot_nozzle.add_nuclide("Cr54", 0.003638294506, 'wo') bot_nozzle.add_s_alpha_beta('c_H_in_H2O') top_nozzle = openmc.Material(name='Top nozzle region', material_id=10) @@ -229,18 +143,8 @@ class InputSet(object): top_nozzle.add_nuclide("Fe57", 0.0101152584, 'wo') top_nozzle.add_nuclide("Fe58", 0.00137211607, 'wo') top_nozzle.add_nuclide("Ni58", 0.04104621835, 'wo') - top_nozzle.add_nuclide("Ni60", 0.0163554502, 'wo') - top_nozzle.add_nuclide("Ni61", 0.000722605975, 'wo') - top_nozzle.add_nuclide("Ni62", 0.002342513875, 'wo') - top_nozzle.add_nuclide("Ni64", 0.0006157116, 'wo') top_nozzle.add_nuclide("Mn55", 0.0135739, 'wo') - top_nozzle.add_nuclide("Si28", 0.006234853554, 'wo') - top_nozzle.add_nuclide("Si29", 0.000328078746, 'wo') - top_nozzle.add_nuclide("Si30", 0.0002239677, 'wo') - top_nozzle.add_nuclide("Cr50", 0.005382452306, 'wo') top_nozzle.add_nuclide("Cr52", 0.107931450781, 'wo') - top_nozzle.add_nuclide("Cr53", 0.012474806806, 'wo') - top_nozzle.add_nuclide("Cr54", 0.003163190107, 'wo') top_nozzle.add_s_alpha_beta('c_H_in_H2O') top_fa = openmc.Material(name='Top of fuel assemblies', material_id=11) diff --git a/tests/test_asymmetric_lattice/inputs_true.dat b/tests/test_asymmetric_lattice/inputs_true.dat index 9d278724f8..7e48dcf430 100644 --- a/tests/test_asymmetric_lattice/inputs_true.dat +++ b/tests/test_asymmetric_lattice/inputs_true.dat @@ -1 +1 @@ -dfb59bace10a91bb7ffc871d8ee87e91d94754bb8bb002ac6088f80fe0f480741c0489f74b753fc37158d0ff0f1368739ea60638b42083791311eefeac79168e \ No newline at end of file +6bcc9cca24d42995bdff9bf9aca5e852c2dbca5cfb42a12ac637def9cf5cac227654182fc9cf9e17d07cf2e9af11fea832e3ae0eb7001cc09856f73d219664f9 \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/results_true.dat b/tests/test_asymmetric_lattice/results_true.dat index a33b9c9e59..c753afbc78 100644 --- a/tests/test_asymmetric_lattice/results_true.dat +++ b/tests/test_asymmetric_lattice/results_true.dat @@ -1 +1 @@ -bc8bef8121f9b6470e4fea817a4e48eabb1ecba1f42761a4cbd77d71181bf9e1612df4a3d6ddfbcd08a3086ac873e5f3c3e560bf96b2b7c959a2f7aad7e4e08d \ No newline at end of file +a2848fdb0a12c99ce31f4ddee766e0cf33bd5c6feca927bcb4bceca6fbb094bb1309fb8548589a99fcb09a830911457b9175b460aa45773822f8112a34b3b5c1 \ No newline at end of file diff --git a/tests/test_filter_mesh/inputs_true.dat b/tests/test_filter_mesh/inputs_true.dat index b683ebaeb0..d98e2f6f78 100644 --- a/tests/test_filter_mesh/inputs_true.dat +++ b/tests/test_filter_mesh/inputs_true.dat @@ -1 +1 @@ -5a9e65b8a8c9d7c575fc48c5d289bbc805739729a33d83aa79985473d83c8cc3a0c7dad8e95221090917c35ac4842667c8c9daecd06dc6b909a92475f5083753 \ No newline at end of file +c0882d16048d434219d32ed7b875615e00142b55ab78be5b51e0195e23cb534a3aa5a8e9c212f0bfff96c452177315deb1264421d688438814560b4131c88930 \ No newline at end of file diff --git a/tests/test_filter_mesh/results_true.dat b/tests/test_filter_mesh/results_true.dat index 2cc3c9532b..06cd450eff 100644 --- a/tests/test_filter_mesh/results_true.dat +++ b/tests/test_filter_mesh/results_true.dat @@ -1 +1 @@ -89387dd9e5b962c773e1782ff829846968dc456d899963f5dd98761fbde73a3f81676717ff3599bc26a1b77247826c38756735a9b2b329b80ad66286a62bd3f9 \ No newline at end of file +041b7e79d384771bad5bc6800138bd20be6af7d6e1543bdcfef521de3df33ef7b7aca00ea3ccb0234c3a4d7d738dfe17987b5c1a59474efef630217f8ee1af1e \ No newline at end of file diff --git a/tests/test_iso_in_lab/inputs_true.dat b/tests/test_iso_in_lab/inputs_true.dat index 310bccb139..454f891cd6 100644 --- a/tests/test_iso_in_lab/inputs_true.dat +++ b/tests/test_iso_in_lab/inputs_true.dat @@ -1 +1 @@ -4b3d0270a479e65579b305d1c2339b76971790bc7371c685efa6e2d341980fec301cf0859c34796ae04ae98aa01ab8b4905a8d8a3a916895c36d82ca6b58fb39 \ No newline at end of file +57d1ece4aa9633e5fc6d2fce9f7bba444d02046e0cdadc6e53efdf591b6e50fd0e5a14b956b7ad10710b4535b10354899e2ffc783fd78de5ccd09a061cb5678d \ No newline at end of file diff --git a/tests/test_iso_in_lab/results_true.dat b/tests/test_iso_in_lab/results_true.dat index 354ccb0f8c..5b2c5dd001 100644 --- a/tests/test_iso_in_lab/results_true.dat +++ b/tests/test_iso_in_lab/results_true.dat @@ -1,2 +1,2 @@ k-combined: -9.638450E-01 1.237705E-02 +9.753410E-01 6.608245E-02 diff --git a/tests/test_mgxs_library_mesh/inputs_true.dat b/tests/test_mgxs_library_mesh/inputs_true.dat index 6e3fc6e63e..a87549a607 100644 --- a/tests/test_mgxs_library_mesh/inputs_true.dat +++ b/tests/test_mgxs_library_mesh/inputs_true.dat @@ -1 +1 @@ -88b1a1b52bcae466bab63038d03e9b2fb9f2a28aac3d73573ca00d5f0c116aa9e1c97341215b80266e8317a0549f11d9adcb8726c82fcc1741a5a730e10c8186 \ No newline at end of file +5011f0aec7bb04e22f96cec2c23ae485fe21371dc03e16cb38695b3765cb92545459a897184b501bb99f8e7d162cfbf85eb3fb52ce2d82b2d2ca722b567cbff3 \ No newline at end of file diff --git a/tests/test_mgxs_library_mesh/results_true.dat b/tests/test_mgxs_library_mesh/results_true.dat index 8ad0f2eee1..16d20391cf 100644 --- a/tests/test_mgxs_library_mesh/results_true.dat +++ b/tests/test_mgxs_library_mesh/results_true.dat @@ -1,168 +1,168 @@ mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.640786 0.044177 -1 1 2 1 1 total 0.615276 0.104046 -2 2 1 1 1 total 0.660597 0.128423 -3 2 2 1 1 total 0.646999 0.186709 - mesh 1 group in nuclide mean std. dev. - x y z -0 1 1 1 1 total 0.36665 0.048814 -1 1 2 1 1 total 0.36356 0.074111 -2 2 1 1 1 total 0.40784 0.096486 -3 2 2 1 1 total 0.41456 0.160443 +0 1 1 1 1 total 0.654966 0.098415 +1 1 2 1 1 total 0.639357 0.282107 +2 2 1 1 1 total 0.713534 0.079789 +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.366650 0.048814 -1 1 2 1 1 total 0.363560 0.074111 -2 2 1 1 1 total 0.407840 0.096486 -3 2 2 1 1 total 0.414593 0.160436 +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 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.025749 0.002863 -1 1 2 1 1 total 0.022988 0.004099 -2 2 1 1 1 total 0.028400 0.005275 -3 2 2 1 1 total 0.027589 0.010350 +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 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.015861 0.002876 -1 1 2 1 1 total 0.014403 0.003542 -2 2 1 1 1 total 0.017280 0.004371 -3 2 2 1 1 total 0.018061 0.010110 +0 1 1 1 1 total 0.021476 0.004248 +1 1 2 1 1 total 0.020653 0.008355 +2 2 1 1 1 total 0.027384 0.003568 +3 2 2 1 1 total 0.021826 0.004584 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.009888 0.001077 -1 1 2 1 1 total 0.008585 0.001552 -2 2 1 1 1 total 0.011121 0.002456 -3 2 2 1 1 total 0.009527 0.003659 +0 1 1 1 1 total 0.013234 0.004146 +1 1 2 1 1 total 0.012342 0.006800 +2 2 1 1 1 total 0.016807 0.003428 +3 2 2 1 1 total 0.013253 0.004795 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.026065 0.002907 -1 1 2 1 1 total 0.022596 0.004062 -2 2 1 1 1 total 0.029084 0.006430 -3 2 2 1 1 total 0.025066 0.009687 +0 1 1 1 1 total 0.008241 0.001798 +1 1 2 1 1 total 0.008311 0.003296 +2 2 1 1 1 total 0.010577 0.001333 +3 2 2 1 1 total 0.008573 0.002017 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 1.938476 0.211550 -1 1 2 1 1 total 1.682799 0.303764 -2 2 1 1 1 total 2.177360 0.480780 -3 2 2 1 1 total 1.864890 0.715661 +0 1 1 1 1 total 0.020322 0.004415 +1 1 2 1 1 total 0.020546 0.008145 +2 2 1 1 1 total 0.026008 0.003213 +3 2 2 1 1 total 0.021015 0.004911 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.615037 0.041754 -1 1 2 1 1 total 0.592288 0.100439 -2 2 1 1 1 total 0.632196 0.123878 -3 2 2 1 1 total 0.619410 0.177190 +0 1 1 1 1 total 1.596880 0.348354 +1 1 2 1 1 total 1.610266 0.638515 +2 2 1 1 1 total 2.048209 0.257682 +3 2 2 1 1 total 1.660283 0.390011 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.584014 0.054315 -1 1 2 1 1 total 0.587256 0.084833 -2 2 1 1 1 total 0.622514 0.111323 -3 2 2 1 1 total 0.613792 0.168612 +0 1 1 1 1 total 0.633490 0.094536 +1 1 2 1 1 total 0.618705 0.273934 +2 2 1 1 1 total 0.686150 0.076703 +3 2 2 1 1 total 0.619269 0.087616 + mesh 1 group in nuclide mean std. dev. + x y z +0 1 1 1 1 total 0.638348 0.097266 +1 1 2 1 1 total 0.588378 0.266032 +2 2 1 1 1 total 0.698373 0.092394 +3 2 2 1 1 total 0.625643 0.075089 mesh 1 group in group out nuclide moment mean std. dev. x y z -0 1 1 1 1 1 total P0 0.584014 0.054315 -1 1 1 1 1 1 total P1 0.243427 0.025488 -2 1 1 1 1 1 total P2 0.089236 0.007357 -3 1 1 1 1 1 total P3 0.008994 0.005768 -4 1 2 1 1 1 total P0 0.587256 0.084833 -5 1 2 1 1 1 total P1 0.245120 0.041033 -6 1 2 1 1 1 total P2 0.086784 0.016255 -7 1 2 1 1 1 total P3 0.008660 0.004755 -8 2 1 1 1 1 total P0 0.622514 0.111323 -9 2 1 1 1 1 total P1 0.239376 0.042594 -10 2 1 1 1 1 total P2 0.088386 0.017200 -11 2 1 1 1 1 total P3 -0.001243 0.005639 -12 2 2 1 1 1 total P0 0.612950 0.167940 -13 2 2 1 1 1 total P1 0.226176 0.061882 -14 2 2 1 1 1 total P2 0.086593 0.026126 -15 2 2 1 1 1 total P3 0.009672 0.011995 +0 1 1 1 1 1 total P0 0.638348 0.097266 +1 1 1 1 1 1 total P1 0.247099 0.035574 +2 1 1 1 1 1 total P2 0.092195 0.010891 +3 1 1 1 1 1 total P3 0.013224 0.004528 +4 1 2 1 1 1 total P0 0.588378 0.266032 +5 1 2 1 1 1 total P1 0.221552 0.102564 +6 1 2 1 1 1 total P2 0.069798 0.034699 +7 1 2 1 1 1 total P3 -0.003039 0.009633 +8 2 1 1 1 1 total P0 0.698373 0.092394 +9 2 1 1 1 1 total P1 0.261835 0.035253 +10 2 1 1 1 1 total P2 0.096206 0.013947 +11 2 1 1 1 1 total P3 0.016973 0.004808 +12 2 2 1 1 1 total P0 0.625643 0.075089 +13 2 2 1 1 1 total P1 0.244646 0.028604 +14 2 2 1 1 1 total P2 0.088580 0.012369 +15 2 2 1 1 1 total P3 0.019989 0.013950 mesh 1 group in group out nuclide moment mean std. dev. x y z -0 1 1 1 1 1 total P0 0.584014 0.054315 -1 1 1 1 1 1 total P1 0.243427 0.025488 -2 1 1 1 1 1 total P2 0.089236 0.007357 -3 1 1 1 1 1 total P3 0.008994 0.005768 -4 1 2 1 1 1 total P0 0.587256 0.084833 -5 1 2 1 1 1 total P1 0.245120 0.041033 -6 1 2 1 1 1 total P2 0.086784 0.016255 -7 1 2 1 1 1 total P3 0.008660 0.004755 -8 2 1 1 1 1 total P0 0.622514 0.111323 -9 2 1 1 1 1 total P1 0.239376 0.042594 -10 2 1 1 1 1 total P2 0.088386 0.017200 -11 2 1 1 1 1 total P3 -0.001243 0.005639 -12 2 2 1 1 1 total P0 0.613792 0.168612 -13 2 2 1 1 1 total P1 0.226142 0.061856 -14 2 2 1 1 1 total P2 0.086174 0.025979 -15 2 2 1 1 1 total P3 0.009721 0.012027 +0 1 1 1 1 1 total P0 0.638348 0.097266 +1 1 1 1 1 1 total P1 0.247099 0.035574 +2 1 1 1 1 1 total P2 0.092195 0.010891 +3 1 1 1 1 1 total P3 0.013224 0.004528 +4 1 2 1 1 1 total P0 0.588378 0.266032 +5 1 2 1 1 1 total P1 0.221552 0.102564 +6 1 2 1 1 1 total P2 0.069798 0.034699 +7 1 2 1 1 1 total P3 -0.003039 0.009633 +8 2 1 1 1 1 total P0 0.698373 0.092394 +9 2 1 1 1 1 total P1 0.261835 0.035253 +10 2 1 1 1 1 total P2 0.096206 0.013947 +11 2 1 1 1 1 total P3 0.016973 0.004808 +12 2 2 1 1 1 total P0 0.625643 0.075089 +13 2 2 1 1 1 total P1 0.244646 0.028604 +14 2 2 1 1 1 total P2 0.088580 0.012369 +15 2 2 1 1 1 total P3 0.019989 0.013950 + mesh 1 group in group out nuclide mean std. dev. + x y z +0 1 1 1 1 1 total 1.0 0.153265 +1 1 2 1 1 1 total 1.0 0.454973 +2 2 1 1 1 1 total 1.0 0.146747 +3 2 2 1 1 1 total 1.0 0.141824 mesh 1 group in group out nuclide mean std. dev. x y z -0 1 1 1 1 1 total 1.000000 0.088094 -1 1 2 1 1 1 total 1.000000 0.126864 -2 2 1 1 1 1 total 1.000000 0.160891 -3 2 2 1 1 1 total 1.001374 0.305883 - mesh 1 group in group out nuclide mean std. dev. - x y z -0 1 1 1 1 1 total 0.027395 0.004680 -1 1 2 1 1 1 total 0.019384 0.002846 -2 2 1 1 1 1 total 0.022914 0.006025 -3 2 2 1 1 1 total 0.029629 0.006292 +0 1 1 1 1 1 total 0.021059 0.003031 +1 1 2 1 1 1 total 0.017348 0.008786 +2 2 1 1 1 1 total 0.020409 0.003354 +3 2 2 1 1 1 total 0.011105 0.003806 mesh 1 group out nuclide mean std. dev. x y z -0 1 1 1 1 total 1.0 0.220956 -1 1 2 1 1 total 1.0 0.132140 -2 2 1 1 1 total 1.0 0.316565 -3 2 2 1 1 total 1.0 0.181577 +0 1 1 1 1 total 1.0 0.135958 +1 1 2 1 1 total 1.0 0.557756 +2 2 1 1 1 total 1.0 0.201340 +3 2 2 1 1 total 1.0 0.475608 mesh 1 group out nuclide mean std. dev. x y z -0 1 1 1 1 total 1.0 0.222246 -1 1 2 1 1 total 1.0 0.132140 -2 2 1 1 1 total 1.0 0.316565 -3 2 2 1 1 total 1.0 0.181577 +0 1 1 1 1 total 1.0 0.133151 +1 1 2 1 1 total 1.0 0.557756 +2 2 1 1 1 total 1.0 0.201340 +3 2 2 1 1 total 1.0 0.475608 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 3.610522e-07 3.169931e-08 -1 1 2 1 1 total 3.097784e-07 5.252025e-08 -2 2 1 1 1 total 3.942353e-07 8.459167e-08 -3 2 2 1 1 total 3.799163e-07 1.806470e-07 +0 1 1 1 1 total 4.697405e-07 8.304381e-08 +1 1 2 1 1 total 4.173069e-07 1.694647e-07 +2 2 1 1 1 total 6.581421e-07 1.337227e-07 +3 2 2 1 1 total 4.714011e-07 1.140489e-07 mesh 1 group in nuclide mean std. dev. x y z -0 1 1 1 1 total 0.025920 0.002893 -1 1 2 1 1 total 0.022467 0.004039 -2 2 1 1 1 total 0.028922 0.006394 -3 2 2 1 1 total 0.024923 0.009632 +0 1 1 1 1 total 0.020173 0.004383 +1 1 2 1 1 total 0.020397 0.008086 +2 2 1 1 1 total 0.025824 0.003192 +3 2 2 1 1 total 0.020865 0.004879 mesh 1 delayedgroup group in nuclide mean std. dev. x y z -0 1 1 1 1 1 total 0.000004 4.432732e-07 -1 1 1 1 2 1 total 0.000026 2.653319e-06 -2 1 1 1 3 1 total 0.000024 2.402270e-06 -3 1 1 1 4 1 total 0.000054 5.464055e-06 -4 1 1 1 5 1 total 0.000026 2.663025e-06 -5 1 1 1 6 1 total 0.000010 1.038005e-06 -6 1 2 1 1 1 total 0.000004 6.987770e-07 -7 1 2 1 2 1 total 0.000023 4.115234e-06 -8 1 2 1 3 1 total 0.000021 3.816392e-06 -9 1 2 1 4 1 total 0.000049 8.885822e-06 -10 1 2 1 5 1 total 0.000024 4.378290e-06 -11 1 2 1 6 1 total 0.000009 1.745695e-06 -12 2 1 1 1 1 total 0.000005 1.098837e-06 -13 2 1 1 2 1 total 0.000029 6.436855e-06 -14 2 1 1 3 1 total 0.000027 5.926286e-06 -15 2 1 1 4 1 total 0.000061 1.359391e-05 -16 2 1 1 5 1 total 0.000029 6.489015e-06 -17 2 1 1 6 1 total 0.000011 2.574270e-06 -18 2 2 1 1 1 total 0.000004 1.660497e-06 -19 2 2 1 2 1 total 0.000025 9.701974e-06 -20 2 2 1 3 1 total 0.000023 9.005217e-06 -21 2 2 1 4 1 total 0.000054 2.084107e-05 -22 2 2 1 5 1 total 0.000026 9.981045e-06 -23 2 2 1 6 1 total 0.000010 3.987979e-06 +0 1 1 1 1 1 total 0.000005 1.004627e-06 +1 1 1 1 2 1 total 0.000025 5.397916e-06 +2 1 1 1 3 1 total 0.000025 5.274991e-06 +3 1 1 1 4 1 total 0.000058 1.230430e-05 +4 1 1 1 5 1 total 0.000026 5.548686e-06 +5 1 1 1 6 1 total 0.000011 2.306996e-06 +6 1 2 1 1 1 total 0.000004 1.779307e-06 +7 1 2 1 2 1 total 0.000024 9.648451e-06 +8 1 2 1 3 1 total 0.000024 9.479454e-06 +9 1 2 1 4 1 total 0.000056 2.231366e-05 +10 1 2 1 5 1 total 0.000026 1.028267e-05 +11 1 2 1 6 1 total 0.000011 4.268087e-06 +12 2 1 1 1 1 total 0.000006 7.462931e-07 +13 2 1 1 2 1 total 0.000031 3.842628e-06 +14 2 1 1 3 1 total 0.000031 3.666739e-06 +15 2 1 1 4 1 total 0.000071 8.228956e-06 +16 2 1 1 5 1 total 0.000031 3.416811e-06 +17 2 1 1 6 1 total 0.000013 1.429034e-06 +18 2 2 1 1 1 total 0.000005 1.049553e-06 +19 2 2 1 2 1 total 0.000025 5.392757e-06 +20 2 2 1 3 1 total 0.000024 5.145263e-06 +21 2 2 1 4 1 total 0.000056 1.156820e-05 +22 2 2 1 5 1 total 0.000025 4.880083e-06 +23 2 2 1 6 1 total 0.000010 2.037276e-06 mesh 1 delayedgroup group out nuclide mean std. dev. x y z 0 1 1 1 1 1 total 0.0 0.000000 1 1 1 1 2 1 total 0.0 0.000000 2 1 1 1 3 1 total 0.0 0.000000 -3 1 1 1 4 1 total 1.0 1.414214 -4 1 1 1 5 1 total 0.0 0.000000 +3 1 1 1 4 1 total 0.0 0.000000 +4 1 1 1 5 1 total 1.0 1.414214 5 1 1 1 6 1 total 0.0 0.000000 6 1 2 1 1 1 total 0.0 0.000000 7 1 2 1 2 1 total 0.0 0.000000 @@ -184,53 +184,53 @@ 23 2 2 1 6 1 total 0.0 0.000000 mesh 1 delayedgroup group in nuclide mean std. dev. x y z -0 1 1 1 1 1 total 0.000166 0.000023 -1 1 1 1 2 1 total 0.000989 0.000136 -2 1 1 1 3 1 total 0.000907 0.000123 -3 1 1 1 4 1 total 0.002087 0.000282 -4 1 1 1 5 1 total 0.001014 0.000137 -5 1 1 1 6 1 total 0.000400 0.000054 -6 1 2 1 1 1 total 0.000167 0.000030 -7 1 2 1 2 1 total 0.001002 0.000178 -8 1 2 1 3 1 total 0.000926 0.000165 -9 1 2 1 4 1 total 0.002149 0.000384 -10 1 2 1 5 1 total 0.001056 0.000189 -11 1 2 1 6 1 total 0.000417 0.000076 -12 2 1 1 1 1 total 0.000171 0.000039 -13 2 1 1 2 1 total 0.001003 0.000226 -14 2 1 1 3 1 total 0.000918 0.000208 -15 2 1 1 4 1 total 0.002100 0.000477 -16 2 1 1 5 1 total 0.000996 0.000228 -17 2 1 1 6 1 total 0.000394 0.000090 -18 2 2 1 1 1 total 0.000171 0.000082 -19 2 2 1 2 1 total 0.001007 0.000480 -20 2 2 1 3 1 total 0.000929 0.000445 -21 2 2 1 4 1 total 0.002143 0.001028 -22 2 2 1 5 1 total 0.001026 0.000492 -23 2 2 1 6 1 total 0.000408 0.000196 +0 1 1 1 1 1 total 0.000227 0.000061 +1 1 1 1 2 1 total 0.001228 0.000327 +2 1 1 1 3 1 total 0.001206 0.000320 +3 1 1 1 4 1 total 0.002835 0.000748 +4 1 1 1 5 1 total 0.001300 0.000340 +5 1 1 1 6 1 total 0.000540 0.000141 +6 1 2 1 1 1 total 0.000218 0.000074 +7 1 2 1 2 1 total 0.001182 0.000400 +8 1 2 1 3 1 total 0.001160 0.000393 +9 1 2 1 4 1 total 0.002726 0.000926 +10 1 2 1 5 1 total 0.001249 0.000428 +11 1 2 1 6 1 total 0.000519 0.000177 +12 2 1 1 1 1 total 0.000226 0.000033 +13 2 1 1 2 1 total 0.001207 0.000174 +14 2 1 1 3 1 total 0.001175 0.000167 +15 2 1 1 4 1 total 0.002721 0.000378 +16 2 1 1 5 1 total 0.001207 0.000160 +17 2 1 1 6 1 total 0.000502 0.000067 +18 2 2 1 1 1 total 0.000220 0.000068 +19 2 2 1 2 1 total 0.001178 0.000355 +20 2 2 1 3 1 total 0.001150 0.000343 +21 2 2 1 4 1 total 0.002675 0.000783 +22 2 2 1 5 1 total 0.001199 0.000341 +23 2 2 1 6 1 total 0.000499 0.000142 mesh 1 delayedgroup group in nuclide mean std. dev. x y z -0 1 1 1 1 1 total 0.00000 0.000000 -1 1 1 1 2 1 total 0.00000 0.000000 -2 1 1 1 3 1 total 0.00000 0.000000 -3 1 1 1 4 1 total 0.30278 0.428196 -4 1 1 1 5 1 total 0.00000 0.000000 -5 1 1 1 6 1 total 0.00000 0.000000 -6 1 2 1 1 1 total 0.00000 0.000000 -7 1 2 1 2 1 total 0.00000 0.000000 -8 1 2 1 3 1 total 0.00000 0.000000 -9 1 2 1 4 1 total 0.00000 0.000000 -10 1 2 1 5 1 total 0.00000 0.000000 -11 1 2 1 6 1 total 0.00000 0.000000 -12 2 1 1 1 1 total 0.00000 0.000000 -13 2 1 1 2 1 total 0.00000 0.000000 -14 2 1 1 3 1 total 0.00000 0.000000 -15 2 1 1 4 1 total 0.00000 0.000000 -16 2 1 1 5 1 total 0.00000 0.000000 -17 2 1 1 6 1 total 0.00000 0.000000 -18 2 2 1 1 1 total 0.00000 0.000000 -19 2 2 1 2 1 total 0.00000 0.000000 -20 2 2 1 3 1 total 0.00000 0.000000 -21 2 2 1 4 1 total 0.00000 0.000000 -22 2 2 1 5 1 total 0.00000 0.000000 -23 2 2 1 6 1 total 0.00000 0.000000 +0 1 1 1 1 1 total 0.00000 0.00000 +1 1 1 1 2 1 total 0.00000 0.00000 +2 1 1 1 3 1 total 0.00000 0.00000 +3 1 1 1 4 1 total 0.00000 0.00000 +4 1 1 1 5 1 total 0.84949 1.20136 +5 1 1 1 6 1 total 0.00000 0.00000 +6 1 2 1 1 1 total 0.00000 0.00000 +7 1 2 1 2 1 total 0.00000 0.00000 +8 1 2 1 3 1 total 0.00000 0.00000 +9 1 2 1 4 1 total 0.00000 0.00000 +10 1 2 1 5 1 total 0.00000 0.00000 +11 1 2 1 6 1 total 0.00000 0.00000 +12 2 1 1 1 1 total 0.00000 0.00000 +13 2 1 1 2 1 total 0.00000 0.00000 +14 2 1 1 3 1 total 0.00000 0.00000 +15 2 1 1 4 1 total 0.00000 0.00000 +16 2 1 1 5 1 total 0.00000 0.00000 +17 2 1 1 6 1 total 0.00000 0.00000 +18 2 2 1 1 1 total 0.00000 0.00000 +19 2 2 1 2 1 total 0.00000 0.00000 +20 2 2 1 3 1 total 0.00000 0.00000 +21 2 2 1 4 1 total 0.00000 0.00000 +22 2 2 1 5 1 total 0.00000 0.00000 +23 2 2 1 6 1 total 0.00000 0.00000 diff --git a/tests/test_tallies/inputs_true.dat b/tests/test_tallies/inputs_true.dat index 5f4bebb0d2..d716a171ce 100644 --- a/tests/test_tallies/inputs_true.dat +++ b/tests/test_tallies/inputs_true.dat @@ -1 +1 @@ -96d2f92c6017e62d688e3ca245c2ff7904a92816d188d096829440cd8fcfd4f8639dc67c12d54b324081c19e1c7dd2e79c1caeac53d7826399f11766826d5410 \ No newline at end of file +b112ccd96ff89c706c62b4c334021e352de78fc494c4c0513ca7a924bb2e9b18139c5b4fd50c9a92fff07525cc1d9b1464fcc5ca24293e6fd3a8d03d9e12b171 \ No newline at end of file diff --git a/tests/test_tallies/results_true.dat b/tests/test_tallies/results_true.dat index 108c7ee800..6b3bbf4d53 100644 --- a/tests/test_tallies/results_true.dat +++ b/tests/test_tallies/results_true.dat @@ -1 +1 @@ -a6afd2f11affce2467d77b8477881ab20091f67df4f632226ec2dd5d4cd7fabb9ac3e182563bb467ed249e4b3fe95b319cb688d653757f8ea154759b8a7f50e1 \ No newline at end of file +1e0ce3915c37809cf147e5c0634b696bafd99fa3f41573235d884e54a9a62e8440234a4ee1bf4ce94b363e7afde2ded7c0fd22d0dd897b8aacf1ee017b974449 \ No newline at end of file diff --git a/tests/test_tally_aggregation/inputs_true.dat b/tests/test_tally_aggregation/inputs_true.dat index 6d2990754d..d0f617dbfe 100644 --- a/tests/test_tally_aggregation/inputs_true.dat +++ b/tests/test_tally_aggregation/inputs_true.dat @@ -1 +1 @@ -4a4e481b9af3612c71bdc93245011555807061bbd9d9be4c5b399f2c38820d38d9ce3ac6255d045415a216737eac65fb0f0b6e331e49b90bf8edc814d0f2f0e8 \ No newline at end of file +e6604f58a6a3115b902364ac9c73fcb8babb9df0c527b0b04780fefda61fb41856cffac548a1f81fba5fdac8ab55dd00f683b724c732ed54506933e9d943574d \ No newline at end of file diff --git a/tests/test_tally_aggregation/results_true.dat b/tests/test_tally_aggregation/results_true.dat index 6c2d7a5193..929fc9fcf8 100644 --- a/tests/test_tally_aggregation/results_true.dat +++ b/tests/test_tally_aggregation/results_true.dat @@ -1 +1 @@ -840d2648f9ba782926c71baa84e5a2ad31331e156740a3d1e9d86af8f1f0d301ef8c0f69474975d365dbcf8d229a68c62d3e60286d18045e5254373f4e1010bf \ No newline at end of file +2fba1e497435b63ee277a1c8a0ecc566440c56a25cdfef1b790b839fc93da1414bd1af38a63a64fcf3e868d1347ad138f528ae12c1067aea29733670d2c9128f \ No newline at end of file diff --git a/tests/test_tally_aggregation/test_tally_aggregation.py b/tests/test_tally_aggregation/test_tally_aggregation.py index 955d7fecbb..f1915b261e 100644 --- a/tests/test_tally_aggregation/test_tally_aggregation.py +++ b/tests/test_tally_aggregation/test_tally_aggregation.py @@ -16,9 +16,9 @@ class TallyAggregationTestHarness(PyAPITestHarness): self._input_set.settings.output = {'summary': True} # Initialize the nuclides + u234 = openmc.Nuclide('U234') u235 = openmc.Nuclide('U235') u238 = openmc.Nuclide('U238') - pu239 = openmc.Nuclide('Pu239') # Initialize the filters energy_filter = openmc.EnergyFilter([0.0, 0.253e-6, 1.0e-3, 1.0, 20.0]) @@ -28,7 +28,7 @@ class TallyAggregationTestHarness(PyAPITestHarness): tally = openmc.Tally(name='distribcell tally') tally.filters = [energy_filter, distrib_filter] tally.scores = ['nu-fission', 'total'] - tally.nuclides = [u235, u238, pu239] + tally.nuclides = [u234, u235, u238] tallies_file = openmc.Tallies([tally]) # Export tallies to file @@ -59,7 +59,7 @@ class TallyAggregationTestHarness(PyAPITestHarness): outstr += ', '.join(map(str, tally_sum.std_dev)) # Sum across all nuclides - tally_sum = tally.summation(nuclides=['U235', 'U238', 'Pu239']) + tally_sum = tally.summation(nuclides=['U234', 'U235', 'U238']) outstr += ', '.join(map(str, tally_sum.mean)) outstr += ', '.join(map(str, tally_sum.std_dev)) diff --git a/tests/test_tally_arithmetic/inputs_true.dat b/tests/test_tally_arithmetic/inputs_true.dat index b0da0ed247..8cf6c4ff5d 100644 --- a/tests/test_tally_arithmetic/inputs_true.dat +++ b/tests/test_tally_arithmetic/inputs_true.dat @@ -1 +1 @@ -6747131dad4c1efd8c87d857ce9127cb16ec883fdf5fabe309d82732d47851424273e9ad4878a335555d8b25bb0c0a15e68ac30e355ae346e9885c499e9ec979 \ No newline at end of file +530c54691a4f2df131627849dd58c5e6f331ede786c1ffff0b1126c4c0fe64929a15113699103a05f2c6178ec90be4a3d6fc12b80c32ec608ed4a59c965ef2e4 \ No newline at end of file diff --git a/tests/test_tally_arithmetic/test_tally_arithmetic.py b/tests/test_tally_arithmetic/test_tally_arithmetic.py index 6e52313ef7..d28db3e959 100644 --- a/tests/test_tally_arithmetic/test_tally_arithmetic.py +++ b/tests/test_tally_arithmetic/test_tally_arithmetic.py @@ -19,9 +19,9 @@ class TallyArithmeticTestHarness(PyAPITestHarness): tallies_file = openmc.Tallies() # Initialize the nuclides + u234 = openmc.Nuclide('U234') u235 = openmc.Nuclide('U235') u238 = openmc.Nuclide('U238') - pu239 = openmc.Nuclide('Pu239') # Initialize Mesh mesh = openmc.Mesh(mesh_id=1) @@ -40,7 +40,7 @@ class TallyArithmeticTestHarness(PyAPITestHarness): tally = openmc.Tally(name='tally 1') tally.filters = [material_filter, energy_filter, distrib_filter] tally.scores = ['nu-fission', 'total'] - tally.nuclides = [u235, pu239] + tally.nuclides = [u234, u235] tallies_file.append(tally) tally = openmc.Tally(name='tally 2') diff --git a/tests/test_tally_slice_merge/inputs_true.dat b/tests/test_tally_slice_merge/inputs_true.dat index 7a747e6b52..ef2595fbfd 100644 --- a/tests/test_tally_slice_merge/inputs_true.dat +++ b/tests/test_tally_slice_merge/inputs_true.dat @@ -1 +1 @@ -144dd4059444fad5e2e4fa20681fbdc74c0e5cbf3265104a0b49d87c768798eaeb25e3c6c795bcac2eebdde784c51588006d62c9f25be96dda5c51011a76b7c1 \ No newline at end of file +41b06951808ee7ed1e44defbaadff7305737ae494e8e98c682aefa272c0682cbd8803dd2658d8e7d78e3f5f7fb1e9f0f5e443a9374a68474bd25d0d649ac6924 \ No newline at end of file diff --git a/tests/test_tally_slice_merge/results_true.dat b/tests/test_tally_slice_merge/results_true.dat index 278d8ee108..0f43b35e1f 100644 --- a/tests/test_tally_slice_merge/results_true.dat +++ b/tests/test_tally_slice_merge/results_true.dat @@ -1,36 +1,36 @@ cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 21 0.00e+00 6.25e-07 U235 fission 1.08e-01 7.94e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 21 0.00e+00 6.25e-07 U235 nu-fission 2.64e-01 1.94e-02 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 21 0.00e+00 6.25e-07 U238 fission 1.51e-07 1.00e-08 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 21 0.00e+00 6.25e-07 U238 nu-fission 3.76e-07 2.50e-08 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 21 6.25e-07 2.00e+01 U235 fission 3.12e-02 2.56e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 21 6.25e-07 2.00e+01 U235 nu-fission 7.65e-02 6.24e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 21 6.25e-07 2.00e+01 U238 fission 2.00e-02 1.30e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 21 6.25e-07 2.00e+01 U238 nu-fission 5.56e-02 3.78e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 27 0.00e+00 6.25e-07 U235 fission 4.43e-02 7.21e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 27 0.00e+00 6.25e-07 U235 nu-fission 1.08e-01 1.76e-02 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 27 0.00e+00 6.25e-07 U238 fission 6.14e-08 9.64e-09 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 27 0.00e+00 6.25e-07 U238 nu-fission 1.53e-07 2.40e-08 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 27 6.25e-07 2.00e+01 U235 fission 1.39e-02 1.06e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 27 6.25e-07 2.00e+01 U235 nu-fission 3.40e-02 2.61e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 27 6.25e-07 2.00e+01 U238 fission 9.72e-03 1.21e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 27 6.25e-07 2.00e+01 U238 nu-fission 2.71e-02 3.80e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 21 0.00e+00 6.25e-07 U235 fission 1.08e-01 7.94e-03 -1 21 0.00e+00 6.25e-07 U235 nu-fission 2.64e-01 1.94e-02 -2 21 0.00e+00 6.25e-07 U238 fission 1.51e-07 1.00e-08 -3 21 0.00e+00 6.25e-07 U238 nu-fission 3.76e-07 2.50e-08 -4 21 6.25e-07 2.00e+01 U235 fission 3.12e-02 2.56e-03 -5 21 6.25e-07 2.00e+01 U235 nu-fission 7.65e-02 6.24e-03 -6 21 6.25e-07 2.00e+01 U238 fission 2.00e-02 1.30e-03 -7 21 6.25e-07 2.00e+01 U238 nu-fission 5.56e-02 3.78e-03 -8 27 0.00e+00 6.25e-07 U235 fission 4.43e-02 7.21e-03 -9 27 0.00e+00 6.25e-07 U235 nu-fission 1.08e-01 1.76e-02 -10 27 0.00e+00 6.25e-07 U238 fission 6.14e-08 9.64e-09 -11 27 0.00e+00 6.25e-07 U238 nu-fission 1.53e-07 2.40e-08 -12 27 6.25e-07 2.00e+01 U235 fission 1.39e-02 1.06e-03 -13 27 6.25e-07 2.00e+01 U235 nu-fission 3.40e-02 2.61e-03 -14 27 6.25e-07 2.00e+01 U238 fission 9.72e-03 1.21e-03 -15 27 6.25e-07 2.00e+01 U238 nu-fission 2.71e-02 3.80e-03 +0 21 0.00e+00 6.25e-07 U235 fission 2.36e-01 2.26e-02 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 21 0.00e+00 6.25e-07 U235 nu-fission 5.74e-01 5.51e-02 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 21 0.00e+00 6.25e-07 U238 fission 3.19e-07 3.06e-08 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 21 0.00e+00 6.25e-07 U238 nu-fission 7.96e-07 7.63e-08 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 21 6.25e-07 2.00e+01 U235 fission 2.82e-02 1.82e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 21 6.25e-07 2.00e+01 U235 nu-fission 6.92e-02 4.42e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 21 6.25e-07 2.00e+01 U238 fission 1.98e-02 1.74e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 21 6.25e-07 2.00e+01 U238 nu-fission 5.54e-02 4.65e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 27 0.00e+00 6.25e-07 U235 fission 1.11e-01 1.16e-02 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 27 0.00e+00 6.25e-07 U235 nu-fission 2.71e-01 2.83e-02 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 27 0.00e+00 6.25e-07 U238 fission 1.53e-07 1.67e-08 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 27 0.00e+00 6.25e-07 U238 nu-fission 3.81e-07 4.15e-08 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 27 6.25e-07 2.00e+01 U235 fission 2.00e-02 2.72e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 27 6.25e-07 2.00e+01 U235 nu-fission 4.89e-02 6.62e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 27 6.25e-07 2.00e+01 U238 fission 1.06e-02 6.18e-04 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 27 6.25e-07 2.00e+01 U238 nu-fission 2.91e-02 1.85e-03 cell energy low [MeV] energy high [MeV] nuclide score mean std. dev. +0 21 0.00e+00 6.25e-07 U235 fission 2.36e-01 2.26e-02 +1 21 0.00e+00 6.25e-07 U235 nu-fission 5.74e-01 5.51e-02 +2 21 0.00e+00 6.25e-07 U238 fission 3.19e-07 3.06e-08 +3 21 0.00e+00 6.25e-07 U238 nu-fission 7.96e-07 7.63e-08 +4 21 6.25e-07 2.00e+01 U235 fission 2.82e-02 1.82e-03 +5 21 6.25e-07 2.00e+01 U235 nu-fission 6.92e-02 4.42e-03 +6 21 6.25e-07 2.00e+01 U238 fission 1.98e-02 1.74e-03 +7 21 6.25e-07 2.00e+01 U238 nu-fission 5.54e-02 4.65e-03 +8 27 0.00e+00 6.25e-07 U235 fission 1.11e-01 1.16e-02 +9 27 0.00e+00 6.25e-07 U235 nu-fission 2.71e-01 2.83e-02 +10 27 0.00e+00 6.25e-07 U238 fission 1.53e-07 1.67e-08 +11 27 0.00e+00 6.25e-07 U238 nu-fission 3.81e-07 4.15e-08 +12 27 6.25e-07 2.00e+01 U235 fission 2.00e-02 2.72e-03 +13 27 6.25e-07 2.00e+01 U235 nu-fission 4.89e-02 6.62e-03 +14 27 6.25e-07 2.00e+01 U238 fission 1.06e-02 6.18e-04 +15 27 6.25e-07 2.00e+01 U238 nu-fission 2.91e-02 1.85e-03 sum(distribcell) energy low [MeV] energy high [MeV] nuclide score mean std. dev. 0 (0, 100, 2000, 30000) 0.00e+00 6.25e-07 U235 fission 0.00e+00 0.00e+00 1 (0, 100, 2000, 30000) 0.00e+00 6.25e-07 U235 nu-fission 0.00e+00 0.00e+00 @@ -49,19 +49,19 @@ 14 (500, 5000, 50000) 6.25e-07 2.00e+01 U238 fission 0.00e+00 0.00e+00 15 (500, 5000, 50000) 6.25e-07 2.00e+01 U238 nu-fission 0.00e+00 0.00e+00 sum(mesh) energy low [MeV] energy high [MeV] nuclide score mean std. dev. -0 ((1, 1, 1), (1, 2, 1)) 0.00e+00 6.25e-07 U235 fission 8.54e-03 1.30e-03 -1 ((1, 1, 1), (1, 2, 1)) 0.00e+00 6.25e-07 U235 nu-fission 2.08e-02 3.17e-03 -2 ((1, 1, 1), (1, 2, 1)) 0.00e+00 6.25e-07 U238 fission 1.21e-08 1.74e-09 -3 ((1, 1, 1), (1, 2, 1)) 0.00e+00 6.25e-07 U238 nu-fission 3.01e-08 4.34e-09 -4 ((1, 1, 1), (1, 2, 1)) 6.25e-07 2.00e+01 U235 fission 2.20e-03 6.05e-04 -5 ((1, 1, 1), (1, 2, 1)) 6.25e-07 2.00e+01 U235 nu-fission 5.38e-03 1.48e-03 -6 ((1, 1, 1), (1, 2, 1)) 6.25e-07 2.00e+01 U238 fission 1.40e-03 7.17e-04 -7 ((1, 1, 1), (1, 2, 1)) 6.25e-07 2.00e+01 U238 nu-fission 3.84e-03 1.97e-03 -8 ((2, 1, 1), (2, 2, 1)) 0.00e+00 6.25e-07 U235 fission 9.40e-03 1.62e-03 -9 ((2, 1, 1), (2, 2, 1)) 0.00e+00 6.25e-07 U235 nu-fission 2.29e-02 3.95e-03 -10 ((2, 1, 1), (2, 2, 1)) 0.00e+00 6.25e-07 U238 fission 1.34e-08 2.08e-09 -11 ((2, 1, 1), (2, 2, 1)) 0.00e+00 6.25e-07 U238 nu-fission 3.33e-08 5.18e-09 -12 ((2, 1, 1), (2, 2, 1)) 6.25e-07 2.00e+01 U235 fission 9.41e-04 2.52e-04 -13 ((2, 1, 1), (2, 2, 1)) 6.25e-07 2.00e+01 U235 nu-fission 2.31e-03 6.13e-04 -14 ((2, 1, 1), (2, 2, 1)) 6.25e-07 2.00e+01 U238 fission 7.54e-04 3.45e-04 -15 ((2, 1, 1), (2, 2, 1)) 6.25e-07 2.00e+01 U238 nu-fission 2.12e-03 1.02e-03 +0 ((1, 1, 1), (1, 2, 1)) 0.00e+00 6.25e-07 U235 fission 1.12e-02 2.45e-03 +1 ((1, 1, 1), (1, 2, 1)) 0.00e+00 6.25e-07 U235 nu-fission 2.74e-02 5.96e-03 +2 ((1, 1, 1), (1, 2, 1)) 0.00e+00 6.25e-07 U238 fission 1.56e-08 3.04e-09 +3 ((1, 1, 1), (1, 2, 1)) 0.00e+00 6.25e-07 U238 nu-fission 3.89e-08 7.57e-09 +4 ((1, 1, 1), (1, 2, 1)) 6.25e-07 2.00e+01 U235 fission 1.15e-03 4.71e-04 +5 ((1, 1, 1), (1, 2, 1)) 6.25e-07 2.00e+01 U235 nu-fission 2.81e-03 1.15e-03 +6 ((1, 1, 1), (1, 2, 1)) 6.25e-07 2.00e+01 U238 fission 3.25e-04 9.99e-05 +7 ((1, 1, 1), (1, 2, 1)) 6.25e-07 2.00e+01 U238 nu-fission 8.81e-04 2.68e-04 +8 ((2, 1, 1), (2, 2, 1)) 0.00e+00 6.25e-07 U235 fission 1.44e-02 5.57e-03 +9 ((2, 1, 1), (2, 2, 1)) 0.00e+00 6.25e-07 U235 nu-fission 3.51e-02 1.36e-02 +10 ((2, 1, 1), (2, 2, 1)) 0.00e+00 6.25e-07 U238 fission 1.95e-08 7.37e-09 +11 ((2, 1, 1), (2, 2, 1)) 0.00e+00 6.25e-07 U238 nu-fission 4.86e-08 1.84e-08 +12 ((2, 1, 1), (2, 2, 1)) 6.25e-07 2.00e+01 U235 fission 2.55e-03 1.30e-03 +13 ((2, 1, 1), (2, 2, 1)) 6.25e-07 2.00e+01 U235 nu-fission 6.23e-03 3.16e-03 +14 ((2, 1, 1), (2, 2, 1)) 6.25e-07 2.00e+01 U238 fission 8.62e-04 4.53e-04 +15 ((2, 1, 1), (2, 2, 1)) 6.25e-07 2.00e+01 U238 nu-fission 2.30e-03 1.21e-03