From 1eaf67ad8225411d722f6616e3518524428affc3 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 7 May 2019 13:30:05 +0200 Subject: [PATCH] store results in subdirectory defaults to postProc --- processing/post/DADF5_postResults.py | 10 +++++++++- processing/post/DADF5_vtk_cells.py | 15 +++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/processing/post/DADF5_postResults.py b/processing/post/DADF5_postResults.py index 73b126487..66ef52588 100755 --- a/processing/post/DADF5_postResults.py +++ b/processing/post/DADF5_postResults.py @@ -20,6 +20,8 @@ parser = argparse.ArgumentParser() #parser.add_argument('--version', action='version', version='%(prog)s {}'.format(scriptID)) parser.add_argument('filenames', nargs='+', help='DADF5 files') +parser.add_argument('-d','--dir', dest='dir',default='postProc',metavar='string', + help='name of subdirectory to hold output') options = parser.parse_args() @@ -54,7 +56,13 @@ for filename in options.filenames: data = np.concatenate((data,coords),1) header+=' 1_pos 2_pos 3_pos' - np.savetxt('{}_inc{}.txt'.format(filename.split('.')[0],i),data,header=header,comments='') + dirname = os.path.abspath(os.path.join(os.path.dirname(filename),options.dir)) + try: + os.mkdir(dirname) + except FileExistsError: + pass + file_out = '{}_inc{:04d}.txt'.format(filename.split('.')[0],i) + np.savetxt(os.path.join(dirname,file_out),data,header=header,comments='') results.active['increments'] = [inc] for label in options.labels: diff --git a/processing/post/DADF5_vtk_cells.py b/processing/post/DADF5_vtk_cells.py index 3bbf9fd45..0aa2ff275 100755 --- a/processing/post/DADF5_vtk_cells.py +++ b/processing/post/DADF5_vtk_cells.py @@ -21,6 +21,8 @@ parser = argparse.ArgumentParser() #parser.add_argument('--version', action='version', version='%(prog)s {}'.format(scriptID)) parser.add_argument('filenames', nargs='+', help='DADF5 files') +parser.add_argument('-d','--dir', dest='dir',default='postProc',metavar='string', + help='name of subdirectory to hold output') options = parser.parse_args() @@ -80,12 +82,17 @@ for filename in options.filenames: if results.structured: writer = vtk.vtkXMLRectilinearGridWriter() + + dirname = os.path.abspath(os.path.join(os.path.dirname(filename),options.dir)) + try: + os.mkdir(dirname) + except FileExistsError: + pass + file_out = '{}_inc{:04d}.{}'.format(filename.split('.')[0],i,writer.GetDefaultFileExtension()) + writer.SetCompressorTypeToZLib() writer.SetDataModeToBinary() - writer.SetFileName(os.path.join(os.path.split(filename)[0], - os.path.splitext(os.path.split(filename)[1])[0] + - '_inc{:04d}'.format(i) + # ToDo: adjust to length of increments - '.' + writer.GetDefaultFileExtension())) + writer.SetFileName(os.path.join(dirname,file_out)) if results.structured: writer.SetInputData(rGrid)