Commit a91077c2 authored by Gregory Ashton's avatar Gregory Ashton

Merge branch 'gridoutput' into 'master'

Allow writing/reading of Grid results object

See merge request !563
parents e0a0e0a9 747e2243
Pipeline #72305 passed with stages
in 6 minutes and 42 seconds
This diff is collapsed.
......@@ -43,9 +43,9 @@ def result_file_name(outdir, label, extension='json', gzip=False):
"""
if extension in ['json', 'hdf5']:
if extension == 'json' and gzip:
return '{}/{}_result.{}.gz'.format(outdir, label, extension)
return os.path.join(outdir, '{}_result.{}.gz'.format(label, extension))
else:
return '{}/{}_result.{}'.format(outdir, label, extension)
return os.path.join(outdir, '{}_result.{}'.format(label, extension))
else:
raise ValueError("Extension type {} not understood".format(extension))
......
This diff is collapsed.
Markdown is supported
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