diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 501b9e193..a421c6e79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,21 +192,6 @@ Post_addGradient: - master - release -Post_ParaviewRelated: - stage: postprocessing - script: ParaviewRelated/test.py - except: - - master - - release - -Post_OrientationConversion: - stage: postprocessing - script: - - OrientationConversion/test.py - except: - - master - - release - Post_OrientationAverageMisorientation: stage: postprocessing script: diff --git a/PRIVATE b/PRIVATE index 8318aa6b9..073913bf1 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 8318aa6b9b1ef2c59c1f6fa946ede92640baf93c +Subproject commit 073913bf152b3c48f358dfbea5145807c0f7690d diff --git a/processing/post/vtk_addData.py b/processing/post/vtk_addData.py deleted file mode 100755 index 25fcdada0..000000000 --- a/processing/post/vtk_addData.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys -from io import StringIO -from optparse import OptionParser - -import numpy as np - -import damask - -scriptName = os.path.splitext(os.path.basename(__file__))[0] -scriptID = ' '.join([scriptName,damask.version]) - - -# -------------------------------------------------------------------- -# MAIN -# -------------------------------------------------------------------- - -parser = OptionParser(option_class=damask.extendableOption, - usage='%prog options [ASCIItable(s)]', - description = 'Add scalars/vectors, tensors, and/or a RGB tuples from ASCIItable ' - + 'to existing VTK file (.vtr/.vtu/.vtp).', - version = scriptID) - -parser.add_option( '--vtk', - dest = 'vtk', - type = 'string', metavar = 'string', - help = 'VTK file name') -parser.add_option('-d', '--data', - dest = 'data', - action = 'extend', metavar = '', - help = 'scalar/vector value(s) label(s)') -parser.add_option('-t', '--tensor', - dest = 'tensor', - action = 'extend', metavar = '', - help = 'tensor (3x3) value label(s)') -parser.add_option('-c', '--color', - dest = 'color', - action = 'extend', metavar = '', - help = 'RGB color tuple label') - -parser.set_defaults(data = [], - tensor = [], - color = [], -) - -(options, filenames) = parser.parse_args() -if filenames == []: filenames = [None] - -if not options.vtk: - parser.error('No VTK file specified.') - -for name in filenames: - damask.util.report(scriptName,name) - - table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) - vtk = damask.VTK.from_file(options.vtk) - - for data in options.data+options.tensor: - vtk.add(table.get(data),data) - for color in options.color: - vtk.add((table.get(color)*255).astype(np.uint8),color) - - vtk.write(options.vtk) diff --git a/processing/post/vtk_pointCloud.py b/processing/post/vtk_pointCloud.py deleted file mode 100755 index aae31d0ff..000000000 --- a/processing/post/vtk_pointCloud.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys -from io import StringIO -from optparse import OptionParser - -import damask - - -scriptName = os.path.splitext(os.path.basename(__file__))[0] -scriptID = ' '.join([scriptName,damask.version]) - - -# -------------------------------------------------------------------- -# MAIN -# -------------------------------------------------------------------- - -parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [ASCIItable(s)]', description = """ -Produce a VTK point cloud dataset based on coordinates given in an ASCIItable. - -""", version = scriptID) - -parser.add_option('-p', - '--pos', '--position', - dest = 'pos', - type = 'string', metavar = 'string', - help = 'label of coordinates [%default]') - -parser.set_defaults(pos = 'pos', - ) - -(options, filenames) = parser.parse_args() -if filenames == []: filenames = [None] - -for name in filenames: - damask.util.report(scriptName,name) - - table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) - v = damask.VTK.from_polyData(table.get(options.pos)) - - if name: - v.write(os.path.splitext(name)[0]) - else: - sys.stdout.write(v.__repr__()) diff --git a/processing/post/vtk_rectilinearGrid.py b/processing/post/vtk_rectilinearGrid.py deleted file mode 100755 index c8a7d1a6d..000000000 --- a/processing/post/vtk_rectilinearGrid.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys -from io import StringIO -from optparse import OptionParser - -import damask - - -scriptName = os.path.splitext(os.path.basename(__file__))[0] -scriptID = ' '.join([scriptName,damask.version]) - - -# -------------------------------------------------------------------- -# MAIN -# -------------------------------------------------------------------- - -parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [ASCIItable(s)]', description = """ -Create regular voxel grid from points in an ASCIItable. - -""", version = scriptID) - -parser.add_option('-m', - '--mode', - dest = 'mode', - metavar='string', - type = 'choice', choices = ['cell','point'], - help = 'cell-centered or point-centered coordinates') -parser.add_option('-p', - '--pos', '--position', - dest = 'pos', - type = 'string', metavar = 'string', - help = 'label of coordinates [%default]') - -parser.set_defaults(mode = 'cell', - pos = 'pos', - ) - -(options, filenames) = parser.parse_args() -if filenames == []: filenames = [None] - -for name in filenames: - damask.util.report(scriptName,name) - - table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) - - if options.mode == 'cell': - grid, size, origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.get(options.pos)) - elif options.mode == 'point': - grid, size, origin = damask.grid_filters.node_coord0_gridSizeOrigin(table.get(options.pos)) - - v = damask.VTK.from_rectilinearGrid(grid,size,origin) - - if name: - v.write('{}_{}({})'.format(os.path.splitext(name)[0],options.pos,options.mode)) - else: - sys.stdout.write(v.__repr__())