diff --git a/examples/python/boxes/build-xml.py b/examples/python/boxes/build-xml.py index 3eed4059c..175d3f511 100644 --- a/examples/python/boxes/build-xml.py +++ b/examples/python/boxes/build-xml.py @@ -34,11 +34,11 @@ moderator = openmc.Material(material_id=3, name='moderator') moderator.set_density('g/cc', 1.0) moderator.add_nuclide(h1, 2.) moderator.add_nuclide(o16, 1.) -moderator.add_s_alpha_beta('c_H_in_H2O', '71t') +moderator.add_s_alpha_beta('c_H_in_H2O') # Instantiate a Materials collection and export to XML materials_file = openmc.Materials([fuel1, fuel2, moderator]) -materials_file.default_xs = '71c' +materials_file.default_temperature = '294K' materials_file.export_to_xml() diff --git a/examples/python/lattice/hexagonal/build-xml.py b/examples/python/lattice/hexagonal/build-xml.py index ba2cac367..b131e9dea 100644 --- a/examples/python/lattice/hexagonal/build-xml.py +++ b/examples/python/lattice/hexagonal/build-xml.py @@ -29,7 +29,7 @@ moderator = openmc.Material(material_id=2, name='moderator') moderator.set_density('g/cc', 1.0) moderator.add_nuclide(h1, 2.) moderator.add_nuclide(o16, 1.) -moderator.add_s_alpha_beta('c_H_in_H2O', '71t') +moderator.add_s_alpha_beta('c_H_in_H2O') iron = openmc.Material(material_id=3, name='iron') iron.set_density('g/cc', 7.9) @@ -37,7 +37,7 @@ iron.add_nuclide(fe56, 1.) # Instantiate a Materials collection and export to XML materials_file = openmc.Materials([moderator, fuel, iron]) -materials_file.default_xs = '71c' +materials_file.default_temperature = '294K' materials_file.export_to_xml() diff --git a/examples/python/lattice/nested/build-xml.py b/examples/python/lattice/nested/build-xml.py index edf3ad7b1..59962c2c3 100644 --- a/examples/python/lattice/nested/build-xml.py +++ b/examples/python/lattice/nested/build-xml.py @@ -28,11 +28,11 @@ moderator = openmc.Material(material_id=2, name='moderator') moderator.set_density('g/cc', 1.0) moderator.add_nuclide(h1, 2.) moderator.add_nuclide(o16, 1.) -moderator.add_s_alpha_beta('c_H_in_H2O', '71t') +moderator.add_s_alpha_beta('c_H_in_H2O') # Instantiate a Materials collection and export to XML materials_file = openmc.Materials((moderator, fuel)) -materials_file.default_xs = '71c' +materials_file.default_temperature = '294K' materials_file.export_to_xml() diff --git a/examples/python/lattice/simple/build-xml.py b/examples/python/lattice/simple/build-xml.py index 5ec1b7ee9..ad1c465d4 100644 --- a/examples/python/lattice/simple/build-xml.py +++ b/examples/python/lattice/simple/build-xml.py @@ -28,11 +28,11 @@ moderator = openmc.Material(material_id=2, name='moderator') moderator.set_density('g/cc', 1.0) moderator.add_nuclide(h1, 2.) moderator.add_nuclide(o16, 1.) -moderator.add_s_alpha_beta('c_H_in_H2O', '71t') +moderator.add_s_alpha_beta('c_H_in_H2O') # Instantiate a Materials collection and export to XML materials_file = openmc.Materials([moderator, fuel]) -materials_file.default_xs = '71c' +materials_file.default_temperature = '294K' materials_file.export_to_xml() diff --git a/examples/python/pincell/build-xml.py b/examples/python/pincell/build-xml.py index 3bda05027..a11ddb7cd 100644 --- a/examples/python/pincell/build-xml.py +++ b/examples/python/pincell/build-xml.py @@ -98,11 +98,11 @@ borated_water.add_nuclide(h1, 4.9457e-2) borated_water.add_nuclide(h2, 7.4196e-6) borated_water.add_nuclide(o16, 2.4672e-2) borated_water.add_nuclide(o17, 6.0099e-5) -borated_water.add_s_alpha_beta('c_H_in_H2O', '71t') +borated_water.add_s_alpha_beta('c_H_in_H2O') # Instantiate a Materials collection and export to XML materials_file = openmc.Materials([uo2, helium, zircaloy, borated_water]) -materials_file.default_xs = '71c' +materials_file.default_temperature = '294K' materials_file.export_to_xml() diff --git a/examples/python/reflective/build-xml.py b/examples/python/reflective/build-xml.py index 0e064ab61..098fa8620 100644 --- a/examples/python/reflective/build-xml.py +++ b/examples/python/reflective/build-xml.py @@ -25,7 +25,7 @@ fuel.add_nuclide(u235, 1.) # Instantiate a Materials collection and export to XML materials_file = openmc.Materials([fuel]) -materials_file.default_xs = '71c' +materials_file.default_temperature = '294K' materials_file.export_to_xml() diff --git a/examples/xml/basic/materials.xml b/examples/xml/basic/materials.xml index 573b96cb2..b7bc2e4e5 100644 --- a/examples/xml/basic/materials.xml +++ b/examples/xml/basic/materials.xml @@ -1,12 +1,11 @@ - 71c + 294K - 294K @@ -14,7 +13,6 @@ - 294K diff --git a/examples/xml/boxes/materials.xml b/examples/xml/boxes/materials.xml index c74714a08..417fb83ba 100644 --- a/examples/xml/boxes/materials.xml +++ b/examples/xml/boxes/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K @@ -17,7 +17,7 @@ - + diff --git a/examples/xml/lattice/nested/materials.xml b/examples/xml/lattice/nested/materials.xml index 7f8b06bb1..ddd932fcb 100644 --- a/examples/xml/lattice/nested/materials.xml +++ b/examples/xml/lattice/nested/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K @@ -13,7 +13,7 @@ - + diff --git a/examples/xml/lattice/simple/materials.xml b/examples/xml/lattice/simple/materials.xml index 7f8b06bb1..ddd932fcb 100644 --- a/examples/xml/lattice/simple/materials.xml +++ b/examples/xml/lattice/simple/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K @@ -13,7 +13,7 @@ - + diff --git a/examples/xml/pincell/materials.xml b/examples/xml/pincell/materials.xml index b6af486d1..020c0e676 100644 --- a/examples/xml/pincell/materials.xml +++ b/examples/xml/pincell/materials.xml @@ -1,8 +1,8 @@ - - 71c + + 294K - - - + + + diff --git a/tests/test_cmfd_nofeed/materials.xml b/tests/test_cmfd_nofeed/materials.xml index 8f32169d9..f773d83d0 100644 --- a/tests/test_cmfd_nofeed/materials.xml +++ b/tests/test_cmfd_nofeed/materials.xml @@ -1,12 +1,14 @@ +294K + - - - + + + diff --git a/tests/test_complex_cell/materials.xml b/tests/test_complex_cell/materials.xml index a9e69b8bc..857626d5a 100644 --- a/tests/test_complex_cell/materials.xml +++ b/tests/test_complex_cell/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K diff --git a/tests/test_confidence_intervals/materials.xml b/tests/test_confidence_intervals/materials.xml index 23d7f969d..e1124a303 100644 --- a/tests/test_confidence_intervals/materials.xml +++ b/tests/test_confidence_intervals/materials.xml @@ -2,8 +2,9 @@ + 294K - + diff --git a/tests/test_density/materials.xml b/tests/test_density/materials.xml index c474c5c65..53a7b0fcb 100644 --- a/tests/test_density/materials.xml +++ b/tests/test_density/materials.xml @@ -1,26 +1,28 @@ + 294K + - + - + - + - - - + + + diff --git a/tests/test_distribmat/inputs_true.dat b/tests/test_distribmat/inputs_true.dat index 1212a28e5..d21da2f89 100644 --- a/tests/test_distribmat/inputs_true.dat +++ b/tests/test_distribmat/inputs_true.dat @@ -1 +1 @@ -46df57157980545d90b482acfb01f525b84c0e623fa93a5d9c08a65723d677ef1c092360219a3c7fcf5110c6ba32f1eacbd5c5eaed40be4bfe154f302400c0a4 \ No newline at end of file +6ae54c198e7659503d297e40be746a5bd72b35909fceed4b3ef357876b781946c0ea5021342556ef21f4034fa9e42b2c6014077c0efd3459dc063e6da4b12b59 \ No newline at end of file diff --git a/tests/test_distribmat/test_distribmat.py b/tests/test_distribmat/test_distribmat.py index a8d013996..29c5d638f 100644 --- a/tests/test_distribmat/test_distribmat.py +++ b/tests/test_distribmat/test_distribmat.py @@ -29,7 +29,7 @@ class DistribmatTestHarness(PyAPITestHarness): light_fuel.add_nuclide('U235', 1.0) mats_file = openmc.Materials([moderator, dense_fuel, light_fuel]) - mats_file.default_xs = '71c' + mats_file.default_temperature = '294K' mats_file.export_to_xml() diff --git a/tests/test_eigenvalue_genperbatch/materials.xml b/tests/test_eigenvalue_genperbatch/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_eigenvalue_genperbatch/materials.xml +++ b/tests/test_eigenvalue_genperbatch/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_eigenvalue_no_inactive/materials.xml b/tests/test_eigenvalue_no_inactive/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_eigenvalue_no_inactive/materials.xml +++ b/tests/test_eigenvalue_no_inactive/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_energy_grid/materials.xml b/tests/test_energy_grid/materials.xml index ed9b38d90..2946a8d60 100644 --- a/tests/test_energy_grid/materials.xml +++ b/tests/test_energy_grid/materials.xml @@ -1,11 +1,13 @@ + 294K + - - - + + + diff --git a/tests/test_energy_laws/materials.xml b/tests/test_energy_laws/materials.xml index c70e071cf..e7acd32e2 100644 --- a/tests/test_energy_laws/materials.xml +++ b/tests/test_energy_laws/materials.xml @@ -1,6 +1,6 @@ - 71c + 294K diff --git a/tests/test_entropy/materials.xml b/tests/test_entropy/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_entropy/materials.xml +++ b/tests/test_entropy/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_filter_distribcell/case-1/materials.xml b/tests/test_filter_distribcell/case-1/materials.xml index 891cc9fd0..afd4b05b7 100644 --- a/tests/test_filter_distribcell/case-1/materials.xml +++ b/tests/test_filter_distribcell/case-1/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K diff --git a/tests/test_filter_distribcell/case-2/materials.xml b/tests/test_filter_distribcell/case-2/materials.xml index 891cc9fd0..afd4b05b7 100644 --- a/tests/test_filter_distribcell/case-2/materials.xml +++ b/tests/test_filter_distribcell/case-2/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K diff --git a/tests/test_filter_distribcell/case-3/materials.xml b/tests/test_filter_distribcell/case-3/materials.xml index 6a5916a83..f03693e52 100644 --- a/tests/test_filter_distribcell/case-3/materials.xml +++ b/tests/test_filter_distribcell/case-3/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K diff --git a/tests/test_filter_distribcell/case-4/materials.xml b/tests/test_filter_distribcell/case-4/materials.xml index ab9f8688e..15cf0c54b 100644 --- a/tests/test_filter_distribcell/case-4/materials.xml +++ b/tests/test_filter_distribcell/case-4/materials.xml @@ -1,18 +1,21 @@ - 71c - - - + 294K + + + + - - - - - + + + + + + - - - + + + + diff --git a/tests/test_filter_mesh_2d/materials.xml b/tests/test_filter_mesh_2d/materials.xml index f5a9e61be..bead58f8b 100644 --- a/tests/test_filter_mesh_2d/materials.xml +++ b/tests/test_filter_mesh_2d/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K @@ -59,7 +59,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -266,7 +266,7 @@ - + diff --git a/tests/test_filter_mesh_3d/materials.xml b/tests/test_filter_mesh_3d/materials.xml index f5a9e61be..bead58f8b 100644 --- a/tests/test_filter_mesh_3d/materials.xml +++ b/tests/test_filter_mesh_3d/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K @@ -59,7 +59,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -266,7 +266,7 @@ - + diff --git a/tests/test_fixed_source/materials.xml b/tests/test_fixed_source/materials.xml index 6c52b2501..cfd0efd6c 100644 --- a/tests/test_fixed_source/materials.xml +++ b/tests/test_fixed_source/materials.xml @@ -1,10 +1,12 @@ + 294K + - - + + diff --git a/tests/test_infinite_cell/materials.xml b/tests/test_infinite_cell/materials.xml index 1c2d64942..8bd6c820b 100644 --- a/tests/test_infinite_cell/materials.xml +++ b/tests/test_infinite_cell/materials.xml @@ -1,14 +1,16 @@ + 294K + - + - + diff --git a/tests/test_iso_in_lab/inputs_true.dat b/tests/test_iso_in_lab/inputs_true.dat index 34f522872..0298e581c 100644 --- a/tests/test_iso_in_lab/inputs_true.dat +++ b/tests/test_iso_in_lab/inputs_true.dat @@ -1 +1 @@ -c05fdb7815ccc1dcd2f260429b9139ad96ad4a7d1643e2bb938e3cd61268451363538ef4e41c5eaf73a64dbace43b2bd4489d5ff012a33104c2c1d6fa61146eb \ No newline at end of file +a84e601e6ba0891aaeaa37b1aa55076fecee598bb46be2b99dcdedab597b5d7e1731e2a0dc265df2ad6f475e33dae91a3cc27bc23d0c37be25a097ea83e74fd6 \ No newline at end of file diff --git a/tests/test_lattice/materials.xml b/tests/test_lattice/materials.xml index 67240c4c9..91772da79 100644 --- a/tests/test_lattice/materials.xml +++ b/tests/test_lattice/materials.xml @@ -10,7 +10,7 @@ =============================================================== --> - 71c + 294K @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -88,9 +88,9 @@ - + - + @@ -128,7 +128,7 @@ - + diff --git a/tests/test_lattice_hex/materials.xml b/tests/test_lattice_hex/materials.xml index 92d10fa81..90b79b7b4 100644 --- a/tests/test_lattice_hex/materials.xml +++ b/tests/test_lattice_hex/materials.xml @@ -1,42 +1,44 @@ + 294K + - - - + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + diff --git a/tests/test_lattice_mixed/materials.xml b/tests/test_lattice_mixed/materials.xml index 92d10fa81..90b79b7b4 100644 --- a/tests/test_lattice_mixed/materials.xml +++ b/tests/test_lattice_mixed/materials.xml @@ -1,42 +1,44 @@ + 294K + - - - + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + diff --git a/tests/test_lattice_multiple/materials.xml b/tests/test_lattice_multiple/materials.xml index f5a9e61be..bead58f8b 100644 --- a/tests/test_lattice_multiple/materials.xml +++ b/tests/test_lattice_multiple/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K @@ -59,7 +59,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -266,7 +266,7 @@ - + diff --git a/tests/test_mg_nuclide/inputs_true.dat b/tests/test_mg_nuclide/inputs_true.dat index e0af3352b..18811f285 100644 --- a/tests/test_mg_nuclide/inputs_true.dat +++ b/tests/test_mg_nuclide/inputs_true.dat @@ -1 +1 @@ -0efba3dd7882fdd38756d0a8f01ff00d7a1abdaab6430b3f090f3339e552448453bbb733852b6bd6ff09608d923c282f168320f942fc2eb3a45610873c588734 \ No newline at end of file +be296da93031694b2915e1a10e3e6fd663d612cdd29a84745e3ccb0065c088b4bcda45f6919962f6ee784efe52ebe178bf7d3ce019859637ae57c2da1e240a04 \ No newline at end of file diff --git a/tests/test_mgxs_library_ce_to_mg/inputs_true.dat b/tests/test_mgxs_library_ce_to_mg/inputs_true.dat index 332c2df5f..e48c50d0a 100644 --- a/tests/test_mgxs_library_ce_to_mg/inputs_true.dat +++ b/tests/test_mgxs_library_ce_to_mg/inputs_true.dat @@ -1 +1 @@ -fb9c9180f692198548ca14543b29a8b623b382a19932999b2140ca4dd440f2102ba2fdbcb500ede3b8829aa85e1b4498151d280f1422d2d6b1bb5789aff34d71 \ No newline at end of file +a33f770307b365103c5d71aa3e70deebd78d3a2fa90e88632641c1a40d64d19de0ce3c95c858aedf3beccc5de64cac434e1cd55b2b162ed315c78450c53a24a4 \ No newline at end of file diff --git a/tests/test_mgxs_library_condense/inputs_true.dat b/tests/test_mgxs_library_condense/inputs_true.dat index e58015868..c261a0ede 100644 --- a/tests/test_mgxs_library_condense/inputs_true.dat +++ b/tests/test_mgxs_library_condense/inputs_true.dat @@ -1 +1 @@ -08c5f1c783dd88c5fed51c054718ca09fc4e99aa4560a6f928b3902991948f3a878d055ac46c07548904285c2c5f22dc2a3d8c1bb82b8e73d76dd790820117df \ No newline at end of file +df2e5370925785e061e094561e9d2048c3104aaecf533ee9590a187d4597e53b489fb6e8cc54ed878f7d313bcf00586edceae4ff712c837faaa5ddab0ad378b3 \ No newline at end of file diff --git a/tests/test_mgxs_library_distribcell/inputs_true.dat b/tests/test_mgxs_library_distribcell/inputs_true.dat index 924c53838..2ca1810e9 100644 --- a/tests/test_mgxs_library_distribcell/inputs_true.dat +++ b/tests/test_mgxs_library_distribcell/inputs_true.dat @@ -1 +1 @@ -9ce3d6987d67e92b0924916bb54288429d2bd6dfd12a69f86c5dbefb407f7eb72adb0e44d558c09e9a39610ffeb651aee4aedc629cf3a28a181d62ca4cfbcd5a \ No newline at end of file +687358da3e7d658b6187e1d76280437d5b1a97a7ca3920483792e74de6fa9556fa86f4d55150c03d8628b3aa424afa187d8745f087f252ad0fca44ccc2a85f4c \ No newline at end of file diff --git a/tests/test_mgxs_library_hdf5/inputs_true.dat b/tests/test_mgxs_library_hdf5/inputs_true.dat index e58015868..c261a0ede 100644 --- a/tests/test_mgxs_library_hdf5/inputs_true.dat +++ b/tests/test_mgxs_library_hdf5/inputs_true.dat @@ -1 +1 @@ -08c5f1c783dd88c5fed51c054718ca09fc4e99aa4560a6f928b3902991948f3a878d055ac46c07548904285c2c5f22dc2a3d8c1bb82b8e73d76dd790820117df \ No newline at end of file +df2e5370925785e061e094561e9d2048c3104aaecf533ee9590a187d4597e53b489fb6e8cc54ed878f7d313bcf00586edceae4ff712c837faaa5ddab0ad378b3 \ No newline at end of file diff --git a/tests/test_mgxs_library_mesh/inputs_true.dat b/tests/test_mgxs_library_mesh/inputs_true.dat index f62e0aa05..4cebb274e 100644 --- a/tests/test_mgxs_library_mesh/inputs_true.dat +++ b/tests/test_mgxs_library_mesh/inputs_true.dat @@ -1 +1 @@ -5f167bdd4d6ae5873d48483e85aceaec8a934239ed5a50ef6f6500ce204f5851ae330621a5007f3b3d6bdab49f2cd627d011c1f6e6983fec958a6984eb9cb7ca \ No newline at end of file +7f3aec9cedab76262de3706427ccba88b4c81fd4c9a033ff5467671ca21abe13b3981100d688502818bdd0534db22438970b02d652ca9d105557276de2d2a550 \ No newline at end of file diff --git a/tests/test_mgxs_library_no_nuclides/inputs_true.dat b/tests/test_mgxs_library_no_nuclides/inputs_true.dat index e58015868..c261a0ede 100644 --- a/tests/test_mgxs_library_no_nuclides/inputs_true.dat +++ b/tests/test_mgxs_library_no_nuclides/inputs_true.dat @@ -1 +1 @@ -08c5f1c783dd88c5fed51c054718ca09fc4e99aa4560a6f928b3902991948f3a878d055ac46c07548904285c2c5f22dc2a3d8c1bb82b8e73d76dd790820117df \ No newline at end of file +df2e5370925785e061e094561e9d2048c3104aaecf533ee9590a187d4597e53b489fb6e8cc54ed878f7d313bcf00586edceae4ff712c837faaa5ddab0ad378b3 \ No newline at end of file diff --git a/tests/test_mgxs_library_nuclides/inputs_true.dat b/tests/test_mgxs_library_nuclides/inputs_true.dat index a15bbee4c..f3c25d4d5 100644 --- a/tests/test_mgxs_library_nuclides/inputs_true.dat +++ b/tests/test_mgxs_library_nuclides/inputs_true.dat @@ -1 +1 @@ -e4a5f03ab6167e96462c4ef537533fe33b98d7878ae00824c5619356bda8d548b3c71af01ba8c88d5a9b46dd1471d331e6f678a164af922200f2ee3642be6340 \ No newline at end of file +332fd9ff1ca576410ffc6c0f3f03c00618fc863509dc3725f2f3a82134e2400de9c1edf2adc68cb8bce528789094f8eb468371e65cbc13efe76d76467ef291d9 \ No newline at end of file diff --git a/tests/test_multipole/inputs_true.dat b/tests/test_multipole/inputs_true.dat index 801536d07..f99b29e8e 100644 --- a/tests/test_multipole/inputs_true.dat +++ b/tests/test_multipole/inputs_true.dat @@ -1 +1 @@ -c727431ebef7a5987dade28f4cd940c566142f97b5ce01fbf9343d680caf9056623f0fac550db64f8f1043fa2cd8230155cfcbbcaffd1ae92cede723974596d7 \ No newline at end of file +54044104d26e9aa90abcdb62290b598bd6ef0d46c3a9e509726ae7b20a7155471edd3e942b71f07b5c855ac1e451d58913a2f43fa971a8c4d56e569ae3b401ed \ No newline at end of file diff --git a/tests/test_multipole/test_multipole.py b/tests/test_multipole/test_multipole.py index bd6822bdf..812f5b6d0 100644 --- a/tests/test_multipole/test_multipole.py +++ b/tests/test_multipole/test_multipole.py @@ -24,7 +24,7 @@ class MultipoleTestHarness(PyAPITestHarness): dense_fuel.add_nuclide('U235', 1.0) mats_file = openmc.Materials([moderator, dense_fuel]) - mats_file.default_xs = '71c' + mats_file.default_temperature = '294K' mats_file.export_to_xml() diff --git a/tests/test_natural_element/materials.xml b/tests/test_natural_element/materials.xml index 60d60b81f..543b5351d 100644 --- a/tests/test_natural_element/materials.xml +++ b/tests/test_natural_element/materials.xml @@ -3,7 +3,7 @@ - 71c + 294K diff --git a/tests/test_output/materials.xml b/tests/test_output/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_output/materials.xml +++ b/tests/test_output/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_particle_restart_eigval/materials.xml b/tests/test_particle_restart_eigval/materials.xml index 5ff4b736f..301efd2bd 100644 --- a/tests/test_particle_restart_eigval/materials.xml +++ b/tests/test_particle_restart_eigval/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_particle_restart_fixed/materials.xml b/tests/test_particle_restart_fixed/materials.xml index f132f9763..95afc3999 100644 --- a/tests/test_particle_restart_fixed/materials.xml +++ b/tests/test_particle_restart_fixed/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_periodic/test_periodic.py b/tests/test_periodic/test_periodic.py index 026071104..3883654c1 100644 --- a/tests/test_periodic/test_periodic.py +++ b/tests/test_periodic/test_periodic.py @@ -13,7 +13,7 @@ class PeriodicTest(PyAPITestHarness): water = openmc.Material(1) water.add_nuclide('H1', 2.0) water.add_nuclide('O16', 1.0) - water.add_s_alpha_beta('c_H_in_H2O', '71t') + water.add_s_alpha_beta('c_H_in_H2O') water.set_density('g/cc', 1.0) fuel = openmc.Material(2) @@ -21,7 +21,7 @@ class PeriodicTest(PyAPITestHarness): fuel.set_density('g/cc', 4.5) materials = openmc.Materials((water, fuel)) - materials.default_xs = '71c' + materials.default_temperature = '294K' materials.export_to_xml() # Define geometry diff --git a/tests/test_plot/materials.xml b/tests/test_plot/materials.xml index 826f670a4..0d5ee77ce 100644 --- a/tests/test_plot/materials.xml +++ b/tests/test_plot/materials.xml @@ -1,19 +1,21 @@ + 294K + - + - + - + diff --git a/tests/test_ptables_off/materials.xml b/tests/test_ptables_off/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_ptables_off/materials.xml +++ b/tests/test_ptables_off/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_quadric_surfaces/materials.xml b/tests/test_quadric_surfaces/materials.xml index 606253bec..baf523b34 100644 --- a/tests/test_quadric_surfaces/materials.xml +++ b/tests/test_quadric_surfaces/materials.xml @@ -1,10 +1,12 @@ + 294K + - - + + diff --git a/tests/test_reflective_plane/materials.xml b/tests/test_reflective_plane/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_reflective_plane/materials.xml +++ b/tests/test_reflective_plane/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_rotation/materials.xml b/tests/test_rotation/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_rotation/materials.xml +++ b/tests/test_rotation/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_salphabeta/materials.xml b/tests/test_salphabeta/materials.xml index 2bc401e49..0d250e7b4 100644 --- a/tests/test_salphabeta/materials.xml +++ b/tests/test_salphabeta/materials.xml @@ -1,20 +1,20 @@ - 71c + 294K - + - + @@ -22,8 +22,8 @@ - - + + @@ -36,8 +36,8 @@ - - + + diff --git a/tests/test_score_current/materials.xml b/tests/test_score_current/materials.xml index f5a9e61be..bead58f8b 100644 --- a/tests/test_score_current/materials.xml +++ b/tests/test_score_current/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K @@ -59,7 +59,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -266,7 +266,7 @@ - + diff --git a/tests/test_seed/materials.xml b/tests/test_seed/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_seed/materials.xml +++ b/tests/test_seed/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_source/test_source.py b/tests/test_source/test_source.py index 09a13efaa..f83e39974 100644 --- a/tests/test_source/test_source.py +++ b/tests/test_source/test_source.py @@ -13,9 +13,9 @@ import openmc class SourceTestHarness(PyAPITestHarness): def _build_inputs(self): - mat1 = openmc.Material(material_id=1) + mat1 = openmc.Material(material_id=1, temperature='294K') mat1.set_density('g/cm3', 4.5) - mat1.add_nuclide(openmc.Nuclide('U235', '71c'), 1.0) + mat1.add_nuclide(openmc.Nuclide('U235'), 1.0) materials = openmc.Materials([mat1]) materials.export_to_xml() diff --git a/tests/test_source_file/materials.xml b/tests/test_source_file/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_source_file/materials.xml +++ b/tests/test_source_file/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_sourcepoint_batch/materials.xml b/tests/test_sourcepoint_batch/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_sourcepoint_batch/materials.xml +++ b/tests/test_sourcepoint_batch/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_sourcepoint_interval/materials.xml b/tests/test_sourcepoint_interval/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_sourcepoint_interval/materials.xml +++ b/tests/test_sourcepoint_interval/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_sourcepoint_latest/materials.xml b/tests/test_sourcepoint_latest/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_sourcepoint_latest/materials.xml +++ b/tests/test_sourcepoint_latest/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_sourcepoint_restart/materials.xml b/tests/test_sourcepoint_restart/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_sourcepoint_restart/materials.xml +++ b/tests/test_sourcepoint_restart/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_statepoint_batch/materials.xml b/tests/test_statepoint_batch/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_statepoint_batch/materials.xml +++ b/tests/test_statepoint_batch/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_statepoint_interval/materials.xml b/tests/test_statepoint_interval/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_statepoint_interval/materials.xml +++ b/tests/test_statepoint_interval/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_statepoint_restart/materials.xml b/tests/test_statepoint_restart/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_statepoint_restart/materials.xml +++ b/tests/test_statepoint_restart/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_statepoint_sourcesep/materials.xml b/tests/test_statepoint_sourcesep/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_statepoint_sourcesep/materials.xml +++ b/tests/test_statepoint_sourcesep/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_survival_biasing/materials.xml b/tests/test_survival_biasing/materials.xml index facad016b..03b2162b3 100644 --- a/tests/test_survival_biasing/materials.xml +++ b/tests/test_survival_biasing/materials.xml @@ -1,10 +1,12 @@ + 294K + - - + + diff --git a/tests/test_tallies/inputs_true.dat b/tests/test_tallies/inputs_true.dat index f5390eea1..196925c38 100644 --- a/tests/test_tallies/inputs_true.dat +++ b/tests/test_tallies/inputs_true.dat @@ -1 +1 @@ -1bef757d276362fdcd9405096b4cdcbd894f9215ed406493486a45193729be446c9a12242c887f89b6e209ec5beaaacb04dee2fd61e72b4f5c6a8712b776ed6e \ No newline at end of file +11adb9111f20950e28b1c1929ee4ca0c9a6b2524de89bef44a495b2fe8cda3a2acac9e87d64ddb5eba591c8d22289956cb1f024d31e05da3c9a4162b8c589d85 \ 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 9c7978755..fa61e20b7 100644 --- a/tests/test_tally_aggregation/inputs_true.dat +++ b/tests/test_tally_aggregation/inputs_true.dat @@ -1 +1 @@ -67daf0d74cddb40ecbbc7e3793a3302866adcb1617fe2dc454dd161c06105e65027523f5e5954d80b961ba6c6abf14114b8be5c4d5b7682eaddffc1288d3e7c8 \ No newline at end of file +bc17ba12ee5de7e6b0226e589be9044af725ff4e27683b765a9c75e5629176b5ca51d1e0306028ae90185d64644babf9ac22e4753f092b4b836790f4e162f9d0 \ No newline at end of file diff --git a/tests/test_tally_arithmetic/inputs_true.dat b/tests/test_tally_arithmetic/inputs_true.dat index b56c17b6b..56798828c 100644 --- a/tests/test_tally_arithmetic/inputs_true.dat +++ b/tests/test_tally_arithmetic/inputs_true.dat @@ -1 +1 @@ -c8772a174e2162030f0315a318991085f1a5c0b054883a5f071d520e34f9ecf7d309f25700067bea8685e2b6324a19a003bd6f6ab38161ee87c95257b5a6ae69 \ No newline at end of file +6b59ea3a0dc0d25c590f724b8c051a54e8d7836467ba31b7da72b0574398e6c73160a180524952ea983b0e7a7de776d2d7102d280d5a4e7e3624bd76f6f42a09 \ No newline at end of file diff --git a/tests/test_tally_assumesep/materials.xml b/tests/test_tally_assumesep/materials.xml index f5a9e61be..bead58f8b 100644 --- a/tests/test_tally_assumesep/materials.xml +++ b/tests/test_tally_assumesep/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K @@ -59,7 +59,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -266,7 +266,7 @@ - + diff --git a/tests/test_tally_nuclides/materials.xml b/tests/test_tally_nuclides/materials.xml index e9667b41f..5ac4f6942 100644 --- a/tests/test_tally_nuclides/materials.xml +++ b/tests/test_tally_nuclides/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K diff --git a/tests/test_tally_slice_merge/inputs_true.dat b/tests/test_tally_slice_merge/inputs_true.dat index 16d11b6d2..a40c0a01d 100644 --- a/tests/test_tally_slice_merge/inputs_true.dat +++ b/tests/test_tally_slice_merge/inputs_true.dat @@ -1 +1 @@ -a17354ce54bcb5ce93e861ae95fd932c45fe60c733d999aa180d5dee636f43130fac5b003c615e23c65d44fe55f376ef4c86596b78603ab217d7e37fd694074d \ No newline at end of file +6d9ebab08ccce003e6128c6346ffd80e69a957fab15e9a0e211771efa68b24f276e62781f8471c72072f9017380d7e821c38002c03689993efed45db9590c039 \ No newline at end of file diff --git a/tests/test_trace/materials.xml b/tests/test_trace/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_trace/materials.xml +++ b/tests/test_trace/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_track_output/materials.xml b/tests/test_track_output/materials.xml index 017797aa1..f31f61fc3 100644 --- a/tests/test_track_output/materials.xml +++ b/tests/test_track_output/materials.xml @@ -1,95 +1,97 @@ + 294K + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + diff --git a/tests/test_translation/materials.xml b/tests/test_translation/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_translation/materials.xml +++ b/tests/test_translation/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_trigger_batch_interval/materials.xml b/tests/test_trigger_batch_interval/materials.xml index e9667b41f..5ac4f6942 100644 --- a/tests/test_trigger_batch_interval/materials.xml +++ b/tests/test_trigger_batch_interval/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K diff --git a/tests/test_trigger_no_batch_interval/materials.xml b/tests/test_trigger_no_batch_interval/materials.xml index e9667b41f..5ac4f6942 100644 --- a/tests/test_trigger_no_batch_interval/materials.xml +++ b/tests/test_trigger_no_batch_interval/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K diff --git a/tests/test_trigger_no_status/materials.xml b/tests/test_trigger_no_status/materials.xml index e9667b41f..5ac4f6942 100644 --- a/tests/test_trigger_no_status/materials.xml +++ b/tests/test_trigger_no_status/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K diff --git a/tests/test_trigger_tallies/materials.xml b/tests/test_trigger_tallies/materials.xml index e9667b41f..5ac4f6942 100644 --- a/tests/test_trigger_tallies/materials.xml +++ b/tests/test_trigger_tallies/materials.xml @@ -1,7 +1,7 @@ - 71c + 294K diff --git a/tests/test_triso/test_triso.py b/tests/test_triso/test_triso.py index 9a8fb0c3b..04bd1322a 100644 --- a/tests/test_triso/test_triso.py +++ b/tests/test_triso/test_triso.py @@ -27,12 +27,12 @@ class TRISOTestHarness(PyAPITestHarness): porous_carbon = openmc.Material() porous_carbon.set_density('g/cm3', 1.0) porous_carbon.add_nuclide('C0', 1.0) - porous_carbon.add_s_alpha_beta('c_Graphite', '71t') + porous_carbon.add_s_alpha_beta('c_Graphite') ipyc = openmc.Material() ipyc.set_density('g/cm3', 1.90) ipyc.add_nuclide('C0', 1.0) - ipyc.add_s_alpha_beta('c_Graphite', '71t') + ipyc.add_s_alpha_beta('c_Graphite') sic = openmc.Material() sic.set_density('g/cm3', 3.20) @@ -42,12 +42,12 @@ class TRISOTestHarness(PyAPITestHarness): opyc = openmc.Material() opyc.set_density('g/cm3', 1.87) opyc.add_nuclide('C0', 1.0) - opyc.add_s_alpha_beta('c_Graphite', '71t') + opyc.add_s_alpha_beta('c_Graphite') graphite = openmc.Material() graphite.set_density('g/cm3', 1.1995) graphite.add_nuclide('C0', 1.0) - graphite.add_s_alpha_beta('c_Graphite', '71t') + graphite.add_s_alpha_beta('c_Graphite') # Create TRISO particles spheres = [openmc.Sphere(R=r*1e-4) @@ -108,7 +108,7 @@ class TRISOTestHarness(PyAPITestHarness): settings.export_to_xml() mats = openmc.Materials([fuel, porous_carbon, ipyc, sic, opyc, graphite]) - mats.default_xs = '71c' + mats.default_temperature = '294K' mats.export_to_xml() diff --git a/tests/test_uniform_fs/materials.xml b/tests/test_uniform_fs/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_uniform_fs/materials.xml +++ b/tests/test_uniform_fs/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_union_energy_grids/materials.xml b/tests/test_union_energy_grids/materials.xml index ed9b38d90..2946a8d60 100644 --- a/tests/test_union_energy_grids/materials.xml +++ b/tests/test_union_energy_grids/materials.xml @@ -1,11 +1,13 @@ + 294K + - - - + + + diff --git a/tests/test_universe/materials.xml b/tests/test_universe/materials.xml index 23d7f969d..37cfcdc6e 100644 --- a/tests/test_universe/materials.xml +++ b/tests/test_universe/materials.xml @@ -1,9 +1,11 @@ + 294K + - + diff --git a/tests/test_void/materials.xml b/tests/test_void/materials.xml index 4768bad0b..2a578e0ed 100644 --- a/tests/test_void/materials.xml +++ b/tests/test_void/materials.xml @@ -3,7 +3,7 @@ - 71c + 294K @@ -41,7 +41,7 @@ - + diff --git a/tests/test_volume_calc/test_volume_calc.py b/tests/test_volume_calc/test_volume_calc.py index e2c3eba79..656f4654a 100644 --- a/tests/test_volume_calc/test_volume_calc.py +++ b/tests/test_volume_calc/test_volume_calc.py @@ -15,7 +15,7 @@ class VolumeTest(PyAPITestHarness): water.add_nuclide('H1', 2.0) water.add_nuclide('O16', 1.0) water.add_nuclide('B10', 0.0001) - water.add_s_alpha_beta('c_H_in_H2O', '71t') + water.add_s_alpha_beta('c_H_in_H2O') water.set_density('g/cc', 1.0) fuel = openmc.Material(2) @@ -24,7 +24,7 @@ class VolumeTest(PyAPITestHarness): fuel.set_density('g/cc', 4.5) materials = openmc.Materials((water, fuel)) - materials.default_xs = '71c' + materials.default_temperature = '294K' materials.export_to_xml() cyl = openmc.ZCylinder(1, R=1.0, boundary_type='vacuum')