Commit 978bdd01 authored by Carsten Lemmen's avatar Carsten Lemmen
Browse files

explicitly mention Loader in yaml.load

parent 48581ab8
......@@ -77,7 +77,7 @@ if not os.path.exists(filename):
with open(filename,'rU') as fid:
print ('Using ' + filename + ' ...')
config = yaml.load(fid)
config = yaml.load(fid, Loader=Loader)
# Search for the key with name "coupling". If part of the filename is the word "coupling" then assume that the first item on the list read is the name of the coupling
coupling_name = os.path.splitext(os.path.basename(filename))[0]
......@@ -1281,6 +1281,11 @@ for i in range(0,len(couplingList)):
print ('Unknown interval specification "' + intervals[i] + '"')
sys.exit(1)
if unit == 'y': unit='yy'
elif unit == 'hh': unit='h'
elif unit == 'dd': unit='d'
elif unit == 'ss': unit='s'
# Special case infinity
if (number == 'inf') or (number == 'none') or (number == '0'):
unit = 'yy'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment