From c005dbb3b5d7a3e5f91e9b788eb69ccb6af7172f Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 17 Jan 2025 13:34:42 -0600 Subject: [PATCH] Update _THERMAL_DATA --- openmc/data/njoy.py | 61 ++++++++++++++++++++++++++++++++++++++++++ openmc/data/thermal.py | 7 ++--- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/openmc/data/njoy.py b/openmc/data/njoy.py index f5ef836f9ad..43a43cd19c2 100644 --- a/openmc/data/njoy.py +++ b/openmc/data/njoy.py @@ -18,21 +18,45 @@ 'c_Al27': ThermalTuple('al27', [13027], 1), 'c_Al_in_Al2O3': ThermalTuple('asap00', [13027], 1), 'c_Be': ThermalTuple('be', [4009], 1), + 'c_Be_distinct': ThermalTuple('be+sd', [4009], 1), 'c_Be_in_BeO': ThermalTuple('bebeo', [4009], 1), 'c_Be_in_Be2C': ThermalTuple('bebe2c', [4009], 1), + 'c_Be_in_BeF2': ThermalTuple('be in bef2', [4009], 1), 'c_Be_in_FLiBe': ThermalTuple('beflib', [4009], 1), 'c_C6H6': ThermalTuple('benz', [1001, 6000, 6012], 2), + 'c_C_in_Be2C': ThermalTuple('c(be2c)', [6000, 6012, 6013], 1), + 'c_C_in_C5O2H8': ThermalTuple('c(lucite)', [6000, 6012, 6013], 1), + 'c_C_in_C8H8': ThermalTuple('c(polystyr', [6000, 6012, 6013], 1), + 'c_C_in_CF2': ThermalTuple('c(teflon)', [6000, 6012, 6013], 1), 'c_C_in_SiC': ThermalTuple('csic', [6000, 6012, 6013], 1), + 'c_C_in_UC_100p': ThermalTuple('cinuc_100p', [6000, 6012, 6013], 1), + 'c_C_in_UC_10p': ThermalTuple('cinuc_10p', [6000, 6012, 6013], 1), + 'c_C_in_UC_5p': ThermalTuple('cinuc_5p', [6000, 6012, 6013], 1), + 'c_C_in_UC': ThermalTuple('cinuc_nat', [6000, 6012, 6013], 1), + 'c_C_in_UC_HALEU': ThermalTuple('cinuc_haleu', [6000, 6012, 6013], 1), + 'c_C_in_UC_HEU': ThermalTuple('cinuc_heu', [6000, 6012, 6013], 1), + 'c_C_in_ZrC': ThermalTuple('c(zrc)', [6000, 6012, 6013], 1), 'c_Ca_in_CaH2': ThermalTuple('cacah2', [20040, 20042, 20043, 20044, 20046, 20048], 1), + 'c_D_in_7LiD': ThermalTuple('d(7lid)', [1002], 1), 'c_D_in_D2O': ThermalTuple('dd2o', [1002], 1), 'c_D_in_D2O_solid': ThermalTuple('dice', [1002], 1), + 'c_F_in_Be2': ThermalTuple('f in bef2', [9019], 1), + 'c_F_in_CF2': ThermalTuple('f(teflon)', [9019], 1), 'c_F_in_FLiBe': ThermalTuple('fflibe', [9019], 1), + 'c_F_in_HF': ThermalTuple('f_hf', [9019], 1), + 'c_F_in_MgF2': ThermalTuple('f in mgf2', [9019], 1), 'c_Fe56': ThermalTuple('fe56', [26056], 1), 'c_Graphite': ThermalTuple('graph', [6000, 6012, 6013], 1), 'c_Graphite_10p': ThermalTuple('grph10', [6000, 6012, 6013], 1), + 'c_Graphite_20p': ThermalTuple('grph20', [6000, 6012, 6013], 1), 'c_Graphite_30p': ThermalTuple('grph30', [6000, 6012, 6013], 1), + 'c_Graphite_distinct': ThermalTuple('grph+sd', [6000, 6012, 6013], 1), + 'c_H_in_7LiH': ThermalTuple('h(7lih)', [1001], 1), 'c_H_in_C5O2H8': ThermalTuple('lucite', [1001], 1), + 'c_H_in_C8H8': ThermalTuple('h(polystyr', [1001], 1), 'c_H_in_CaH2': ThermalTuple('hcah2', [1001], 1), + 'c_H1_in_CaH2': ThermalTuple('h1_cah2', [1001], 1), + 'c_H2_in_CaH2': ThermalTuple('h2_cah2', [1001], 1), 'c_H_in_CH2': ThermalTuple('hch2', [1001], 1), 'c_H_in_CH4_liquid': ThermalTuple('lch4', [1001], 1), 'c_H_in_CH4_solid': ThermalTuple('sch4', [1001], 1), @@ -49,24 +73,61 @@ 'c_H_in_ZrH2': ThermalTuple('hzrh2', [1001], 1), 'c_H_in_ZrHx': ThermalTuple('hzrhx', [1001], 1), 'c_Li_in_FLiBe': ThermalTuple('liflib', [3006, 3007], 1), + 'c_Li_in_7LiD': ThermalTuple('7li(7lid)', [3007], 1), + 'c_Li_in_7LiH': ThermalTuple('7li(7lih)', [3007], 1), 'c_Mg24': ThermalTuple('mg24', [12024], 1), + 'c_Mg_in_MgF2': ThermalTuple('mg in mgf2', [12024, 12025, 12026], 1), + 'c_Mg_in_MgO': ThermalTuple('mg in mgo', [12024, 12025, 12026], 1), + 'c_N_in_UN_100p': ThermalTuple('n-un-100p', [7014, 7015], 1), + 'c_N_in_UN_10p': ThermalTuple('n-un-10p', [7014, 7015], 1), + 'c_N_in_UN_5p': ThermalTuple('n-un-5p', [7014, 7015], 1), 'c_N_in_UN': ThermalTuple('n-un', [7014, 7015], 1), + 'c_N_in_UN_HALEU': ThermalTuple('n-un-haleu', [7014, 7015], 1), + 'c_N_in_UN_HEU': ThermalTuple('n-un-heu', [7014, 7015], 1), 'c_O_in_Al2O3': ThermalTuple('osap00', [8016, 8017, 8018], 1), 'c_O_in_BeO': ThermalTuple('obeo', [8016, 8017, 8018], 1), + 'c_O_in_C5O2H8': ThermalTuple('o(lucite)', [8016, 8017, 8018], 1), 'c_O_in_D2O': ThermalTuple('od2o', [8016, 8017, 8018], 1), 'c_O_in_H2O_solid': ThermalTuple('oice', [8016, 8017, 8018], 1), + 'c_O_in_MgO': ThermalTuple('o in mgo', [8016, 8017, 8018], 1), + 'c_O_in_PuO2': ThermalTuple('o in puo2', [8016, 8017, 8018], 1), + 'c_O_in_SiO2_alpha': ThermalTuple('o_sio2a', [8016, 8017, 8018], 1), + 'c_O_in_UO2_100p': ThermalTuple('o-uo2-100p', [8016, 8017, 8018], 1), + 'c_O_in_UO2_10p': ThermalTuple('oinuo2-10p', [8016, 8017, 8018], 1), + 'c_O_in_UO2_5p': ThermalTuple('oinuo2-5p', [8016, 8017, 8018], 1), 'c_O_in_UO2': ThermalTuple('ouo2', [8016, 8017, 8018], 1), + 'c_O_in_UO2_HALEU': ThermalTuple('ouo2-haleu', [8016, 8017, 8018], 1), + 'c_O_in_UO2_HEU': ThermalTuple('o_uo2-heu', [8016, 8017, 8018], 1), 'c_ortho_D': ThermalTuple('orthod', [1002], 1), 'c_ortho_H': ThermalTuple('orthoh', [1001], 1), 'c_para_D': ThermalTuple('parad', [1002], 1), 'c_para_H': ThermalTuple('parah', [1001], 1), + 'c_Pu_in_PuO2': ThermalTuple('pu in puo2', [94239, 94240, 94241, 94242, 94243], 1), 'c_Si28': ThermalTuple('si00', [14028], 1), 'c_Si_in_SiC': ThermalTuple('sisic', [14028, 14029, 14030], 1), + 'c_Si_in_SiO2_alpha': ThermalTuple('si_sio2a', [14028, 14029, 14030], 1), 'c_SiO2_alpha': ThermalTuple('sio2-a', [8016, 8017, 8018, 14028, 14029, 14030], 3), 'c_SiO2_beta': ThermalTuple('sio2-b', [8016, 8017, 8018, 14028, 14029, 14030], 3), + 'c_U_metal_100p': ThermalTuple('u-100p', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_metal_10p': ThermalTuple('u-10p', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_metal_5p': ThermalTuple('u-5p', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_metal': ThermalTuple('u-metal', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_metal_HALEU': ThermalTuple('u-haleu', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_metal_HEU': ThermalTuple('u-heu', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UN_100p': ThermalTuple('u-un-100p', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UN_10p': ThermalTuple('u-un-10p', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UN_5p': ThermalTuple('u-un-5p', [92233, 92234, 92235, 92236, 92238], 1), 'c_U_in_UN': ThermalTuple('u-un', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UN_HALEU': ThermalTuple('u-un-haleu', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UN_HEU': ThermalTuple('u-un-heu', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UO2_100p': ThermalTuple('uuo2-100p', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UO2_10p': ThermalTuple('uuo2-10p', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UO2_5p': ThermalTuple('uuo2-5p', [92233, 92234, 92235, 92236, 92238], 1), 'c_U_in_UO2': ThermalTuple('uuo2', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UO2_HALEU': ThermalTuple('uuo2-haleu', [92233, 92234, 92235, 92236, 92238], 1), + 'c_U_in_UO2_HEU': ThermalTuple('u_uo2-heu', [92233, 92234, 92235, 92236, 92238], 1), 'c_Y_in_YH2': ThermalTuple('yyh2', [39089], 1), + 'c_Zr_in_ZrC': ThermalTuple('zr(zrc)', [40000, 40090, 40091, 40092, 40094, 40096], 1), 'c_Zr_in_ZrH': ThermalTuple('zrzrh', [40000, 40090, 40091, 40092, 40094, 40096], 1), 'c_Zr_in_ZrH2': ThermalTuple('zrzrh2', [40000, 40090, 40091, 40092, 40094, 40096], 1), 'c_Zr_in_ZrHx': ThermalTuple('zrzrhx', [40000, 40090, 40091, 40092, 40094, 40096], 1), diff --git a/openmc/data/thermal.py b/openmc/data/thermal.py index 60598568c6c..eed8075d091 100644 --- a/openmc/data/thermal.py +++ b/openmc/data/thermal.py @@ -53,7 +53,7 @@ 'c_Ca_in_CaH2': ('cah', 'cah00', 'cacah2', 'ca(cah2)', 'ca_cah2'), 'c_D_in_7LiD': ('d(7lid)',), 'c_D_in_D2O': ('dd2o', 'd-d2o', 'hwtr', 'hw', 'dhw00', 'd(d2o)'), - 'c_D_in_D2O_ice': ('dice',), + 'c_D_in_D2O_solid': ('dice',), 'c_F_in_Be2': ('f in bef2',), 'c_F_in_CF2': ('f(teflon)',), 'c_F_in_FLiBe': ('fflibe', 'f(flibe)'), @@ -62,7 +62,7 @@ 'c_Fe56': ('fe', 'fe56', 'fe-56', '26-fe- 56'), 'c_Graphite': ('graph', 'grph', 'gr', 'gr00', 'graphite'), 'c_Graphite_10p': ('grph10', '10p graphit'), - 'c_Graphite_20p': ('grph10', '20 graphite'), + 'c_Graphite_20p': ('grph20', '20 graphite'), 'c_Graphite_30p': ('grph30', '30p graphit'), 'c_Graphite_distinct': ('grph+sd',), 'c_H_in_7LiH': ('h(7lih)',), @@ -119,7 +119,8 @@ 'c_Pu_in_PuO2': ('pu in puo2',), 'c_Si28': ('si00', 'sili', 'si'), 'c_Si_in_SiC': ('sisic', 'si-sic', 'si(3c-sic)', 'si_sic'), - 'c_SiO2_alpha': ('sio2', 'sio2a', 'sio2alpha', 'si_sio2a'), + 'c_Si_in_SiO2_alpha': ('si_sio2a',), + 'c_SiO2_alpha': ('sio2', 'sio2a', 'sio2alpha'), 'c_SiO2_beta': ('sio2b', 'sio2beta'), 'c_U_metal_100p': ('u-100p',), 'c_U_metal_10p': ('u-10p',),