From ca0f415de48b8b45888280307f8caec590ead949 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Wed, 20 Jun 2018 07:06:02 -0500
Subject: [PATCH] Update recognized thermal scattering names with Lib80x names

---
 openmc/data/thermal.py | 60 ++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/openmc/data/thermal.py b/openmc/data/thermal.py
index a036a2680c..18ba56bc56 100644
--- a/openmc/data/thermal.py
+++ b/openmc/data/thermal.py
@@ -24,40 +24,44 @@ from openmc.stats import Discrete, Tabular
 
 
 _THERMAL_NAMES = {
-    'c_Al27': ('al', 'al27'),
-    'c_Be': ('be', 'be-metal'),
-    'c_BeO': ('beo'),
-    'c_Be_in_BeO': ('bebeo', 'be-o', 'be/o'),
+    'c_Al27': ('al', 'al27', 'al-27'),
+    'c_Be': ('be', 'be-metal', 'be-met'),
+    'c_BeO': ('beo',),
+    'c_Be_in_BeO': ('bebeo', 'be-beo', 'be-o', 'be/o'),
     'c_C6H6': ('benz', 'c6h6'),
-    'c_C_in_SiC': ('csic',),
-    'c_Ca_in_CaH2': ('cah'),
-    'c_D_in_D2O': ('dd2o', 'hwtr', 'hw'),
-    'c_Fe56': ('fe', 'fe56'),
+    'c_C_in_SiC': ('csic', 'c-sic'),
+    'c_Ca_in_CaH2': ('cah',),
+    'c_D_in_D2O': ('dd2o', 'd-d2o', 'hwtr', 'hw'),
+    'c_Fe56': ('fe', 'fe56', 'fe-56'),
     'c_Graphite': ('graph', 'grph', 'gr'),
-    'c_H_in_CaH2': ('hcah2'),
-    'c_H_in_CH2': ('hch2', 'poly', 'pol'),
+    'c_Graphite_10p': ('grph10',),
+    'c_Graphite_30p': ('grph30',),
+    'c_H_in_CaH2': ('hcah2',),
+    'c_H_in_CH2': ('hch2', 'poly', 'pol', 'h-poly'),
     'c_H_in_CH4_liquid': ('lch4', 'lmeth'),
     'c_H_in_CH4_solid': ('sch4', 'smeth'),
-    'c_H_in_H2O': ('hh2o', 'lwtr', 'lw'),
-    'c_H_in_H2O_solid': ('hice',),
-    'c_H_in_C5O2H8': ('lucite', 'c5o2h8'),
-    'c_H_in_YH2': ('hyh2'),
-    'c_H_in_ZrH': ('hzrh', 'h-zr', 'h/zr', 'hzr'),
+    'c_H_in_H2O': ('hh2o', 'h-h2o', 'lwtr', 'lw'),
+    'c_H_in_H2O_solid': ('hice', 'h-ice'),
+    'c_H_in_C5O2H8': ('lucite', 'c5o2h8', 'h-luci'),
+    'c_H_in_YH2': ('hyh2', 'h-yh2'),
+    'c_H_in_ZrH': ('hzrh', 'h-zrh', 'h-zr', 'h/zr', 'hzr'),
     'c_Mg24': ('mg', 'mg24'),
-    'c_O_in_BeO': ('obeo', 'o-be', 'o/be'),
-    'c_O_in_D2O': ('od2o'),
-    'c_O_in_H2O_ice': ('oice'),
-    'c_O_in_UO2': ('ouo2', 'o2-u', 'o2/u'),
-    'c_ortho_D': ('orthod', 'dortho'),
-    'c_ortho_H': ('orthoh', 'hortho'),
-    'c_Si_in_SiC': ('sisic'),
+    'c_O_in_BeO': ('obeo', 'o-beo', 'o-be', 'o/be'),
+    'c_O_in_D2O': ('od2o', 'o-d2o'),
+    'c_O_in_H2O_ice': ('oice', 'o-ice'),
+    'c_O_in_UO2': ('ouo2', 'o-uo2', 'o2-u', 'o2/u'),
+    'c_N_in_UN': ('n-un',),
+    'c_ortho_D': ('orthod', 'orthoD', 'dortho'),
+    'c_ortho_H': ('orthoh', 'orthoH', 'hortho'),
+    'c_Si_in_SiC': ('sisic', 'si-sic'),
     'c_SiO2_alpha': ('sio2', 'sio2a'),
-    'c_SiO2_beta': ('sio2b'),
-    'c_para_D': ('parad', 'dpara'),
-    'c_para_H': ('parah', 'hpara'),
-    'c_U_in_UO2': ('uuo2', 'u-o2', 'u/o2'),
-    'c_Y_in_YH2': ('yyh2'),
-    'c_Zr_in_ZrH': ('zrzrh', 'zr-h', 'zr/h')
+    'c_SiO2_beta': ('sio2b',),
+    'c_para_D': ('parad', 'paraD', 'dpara'),
+    'c_para_H': ('parah', 'paraH', 'hpara'),
+    'c_U_in_UN': ('u-un',),
+    'c_U_in_UO2': ('uuo2', 'u-uo2', 'u-o2', 'u/o2'),
+    'c_Y_in_YH2': ('yyh2', 'y-yh2'),
+    'c_Zr_in_ZrH': ('zrzrh', 'zr-zrh', 'zr-h', 'zr/h')
 }