corrected isotope names, removed -

fusion-energy · Apr 19, 2024 · a656ea5 · a656ea5
1 parent c06c36e
commit a656ea5
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 37 deletions.
diff --git a/src/neutronics_material_maker/data/pnnl_materials.json b/src/neutronics_material_maker/data/pnnl_materials.json
@@ -4911,9 +4911,9 @@
         "percent_type": "ao",
         "comment": "https://www.pnnl.gov/main/publications/external/technical_reports/PNNL-15870Rev2.pdf",
         "isotopes": {
-            "U-234": 5.085502186733834e-06,
-            "U-235": 0.002531900683843523,
-            "U-238": 0.9974630138139697
+            "U234": 5.085502186733834e-06,
+            "U235": 0.002531900683843523,
+            "U238": 0.9974630138139697
         }
     },
     "Uranium, Enriched, Typical Commercial": {
@@ -4922,9 +4922,9 @@
         "percent_type": "ao",
         "comment": "https://www.pnnl.gov/main/publications/external/technical_reports/PNNL-15870Rev2.pdf",
         "isotopes": {
-            "U-234": 0.0003101065341391381,
-            "U-235": 0.029967161284771438,
-            "U-238": 0.9697227321810894
+            "U234": 0.0003101065341391381,
+            "U235": 0.029967161284771438,
+            "U238": 0.9697227321810894
         }
     },
     "Uranium, HEU, Health Physics Society": {
@@ -4933,10 +4933,10 @@
         "percent_type": "ao",
         "comment": "https://www.pnnl.gov/main/publications/external/technical_reports/PNNL-15870Rev2.pdf",
         "isotopes": {
-            "U-234": 0.010582182219656016,
-            "U-235": 0.9323616914686151,
-            "U-236": 0.002052627251378336,
-            "U-238": 0.05500349906035039
+            "U234": 0.010582182219656016,
+            "U235": 0.9323616914686151,
+            "U236": 0.002052627251378336,
+            "U238": 0.05500349906035039
         }
     },
     "Uranium, HEU, Russian Average": {
@@ -4945,10 +4945,10 @@
         "percent_type": "ao",
         "comment": "https://www.pnnl.gov/main/publications/external/technical_reports/PNNL-15870Rev2.pdf",
         "isotopes": {
-            "U-234": 0.009722065226720615,
-            "U-235": 0.8989824415853601,
-            "U-236": 0.0037979831861608107,
-            "U-238": 0.08749751000175858
+            "U234": 0.009722065226720615,
+            "U235": 0.8989824415853601,
+            "U236": 0.0037979831861608107,
+            "U238": 0.08749751000175858
         }
     },
     "Uranium, HEU, US Average": {
@@ -4957,10 +4957,10 @@
         "percent_type": "ao",
         "comment": "https://www.pnnl.gov/main/publications/external/technical_reports/PNNL-15870Rev2.pdf",
         "isotopes": {
-            "U-234": 0.009848508306917338,
-            "U-235": 0.9321662318993514,
-            "U-236": 0.004483868829572206,
-            "U-238": 0.05350139096415908
+            "U234": 0.009848508306917338,
+            "U235": 0.9321662318993514,
+            "U236": 0.004483868829572206,
+            "U238": 0.05350139096415908
         }
     },
     "Uranium, Low Enriched (LEU)": {
@@ -4969,10 +4969,10 @@
         "percent_type": "ao",
         "comment": "https://www.pnnl.gov/main/publications/external/technical_reports/PNNL-15870Rev2.pdf",
         "isotopes": {
-            "U-234": 0.0002714687801617951,
-            "U-235": 0.03037195174141948,
-            "U-236": 0.0001391181270638639,
-            "U-238": 0.9692174613513548
+            "U234": 0.0002714687801617951,
+            "U235": 0.03037195174141948,
+            "U236": 0.0001391181270638639,
+            "U238": 0.9692174613513548
         }
     },
     "Uranium, Natural (NU)": {
@@ -4981,9 +4981,9 @@
         "percent_type": "ao",
         "comment": "https://www.pnnl.gov/main/publications/external/technical_reports/PNNL-15870Rev2.pdf",
         "isotopes": {
-            "U-234": 5.797118485704071e-05,
-            "U-235": 0.007295479504390431,
-            "U-238": 0.9926465493107526
+            "U234": 5.797118485704071e-05,
+            "U235": 0.007295479504390431,
+            "U238": 0.9926465493107526
         }
     },
     "Uranium-Plutonium, Mixed Oxide (MOX)": {
@@ -4995,15 +4995,15 @@
             "O": 0.666666
         },
         "isotopes": {
-            "Pu-238": 0.0003895015879848798,
-            "Pu-239": 0.008486551573364549,
-            "Pu-240": 0.0040324454812675995,
-            "Pu-241": 0.0014616410522738021,
-            "Pu-242": 0.0011031849547918496,
-            "U-234": 3.847219596060759e-06,
-            "U-235": 0.0008047904974259019,
-            "U-236": 0,
-            "U-238": 0.31705161553032307
+            "Pu238": 0.0003895015879848798,
+            "Pu239": 0.008486551573364549,
+            "Pu240": 0.0040324454812675995,
+            "Pu241": 0.0014616410522738021,
+            "Pu242": 0.0011031849547918496,
+            "U234": 3.847219596060759e-06,
+            "U235": 0.0008047904974259019,
+            "U236": 0,
+            "U238": 0.31705161553032307
         }
     },
     "Uranyl Fluoride": {

diff --git a/src/neutronics_material_maker/material.py b/src/neutronics_material_maker/material.py
@@ -610,8 +610,8 @@ def volume_in_cm3(self, value):
 
     def _make_openmc_material(self):
         """Makes an openmc.Material() object that is used to make other
-        material tpyes (e.g. Serpent, MCNP, Shift, Fispact). If elements are
-        specified then makes material using natural adundances of isotopes.
+        material types (e.g. Serpent, MCNP, Shift, Fispact). If elements are
+        specified then makes material using natural abundances of isotopes.
         This is slightly different to the native openmc method that uses
         isotopes available in the cross_sections.xml file"""
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -195,7 +195,7 @@ def test_isotope_to_zaid(self):
     def test_entries_from_each_json_file_get_into_the_internal_dict(self):
         all_mats = nmm.AvailableMaterials().keys()
 
-        assert "A-150 Tissue-Equivalent Plastic (A150TEP)" in all_mats
+        assert "A-150 Tissue-Equivalent Plastic" in all_mats
         assert "Zirconium Hydride (ZrH2)" in all_mats
         assert "Pb842Li158" in all_mats
         assert "FLiNaBe" in all_mats