Merge branch 'develop' into photon-new

This commit is contained in:
Paul Romano 2017-11-11 14:28:38 -06:00
commit 970fc566a8
150 changed files with 11993 additions and 7991 deletions

View file

@ -247,6 +247,11 @@ def update_materials(root):
if 'name' in nuclide.attrib:
nucname = nuclide.attrib['name']
nucname = nucname.replace('-', '')
# If a nuclide name is in the ZAID notation (e.g., a number),
# convert it to the proper nuclide name.
if nucname.strip().isnumeric():
nucname = \
openmc.data.neutron._get_metadata(int(nucname))[0]
nucname = nucname.replace('Nat', '0')
if nucname.endswith('m'):
nucname = nucname[:-1] + '_m1'