crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 21:55:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #2198 from shimwell/format_to_f_strings

Browse source 
format to f strings
This commit is contained in:
Paul Romano 2022-08-29 07:16:14 -05:00 • committed by GitHub
commit 9062e09e83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
openmc/data/data.py
View file

@ -228,7 +228,7 @@ def atomic_mass(isotope):
with open(mass_file, 'r') as ame:
# Read lines in file starting at line 40
for line in itertools.islice(ame, 39, None):
name = '{}{}'.format(line[20:22].strip(), int(line[16:19]))
name = f'{line[20:22].strip()}{int(line[16:19])}'
mass = float(line[96:99]) + 1e-6*float(
line[100:106] + '.' + line[107:112])
_ATOMIC_MASS[name.lower()] = mass
@ -273,8 +273,7 @@ def atomic_weight(element):
if weight > 0.:
return weight
else:
raise ValueError("No naturally-occurring isotopes for element '{}'."
.format(element))
raise ValueError(f"No naturally-occurring isotopes for element '{element}'.")
def half_life(isotope):
@ -456,9 +455,8 @@ def gnd_name(Z, A, m=0):
"""
if m > 0:
return '{}{}_m{}'.format(ATOMIC_SYMBOL[Z], A, m)
else:
return '{}{}'.format(ATOMIC_SYMBOL[Z], A)
return f'{ATOMIC_SYMBOL[Z]}{A}_m{m}'
return f'{ATOMIC_SYMBOL[Z]}{A}'
def isotopes(element):
@ -486,7 +484,7 @@ def isotopes(element):
if len(element) > 2:
symbol = ELEMENT_SYMBOL.get(element.lower())
if symbol is None:
raise ValueError('Element name "{}" not recognised'.format(element))
raise ValueError(f'Element name "{element}" not recognised')
element = symbol
# Get the nuclides present in nature
@ -515,12 +513,11 @@ def zam(name):
try:
symbol, A, state = _GND_NAME_RE.match(name).groups()
except AttributeError:
raise ValueError("'{}' does not appear to be a nuclide name in GND "
"format".format(name))
raise ValueError(f"'{name}' does not appear to be a nuclide name in "
"GND format")
if symbol not in ATOMIC_NUMBER:
raise ValueError("'{}' is not a recognized element symbol"
.format(symbol))
raise ValueError(f"'{symbol}' is not a recognized element symbol")
metastable = int(state[2:]) if state else 0
return (ATOMIC_NUMBER[symbol], int(A), metastable)