diff --git a/processing/pre/geom_fromMinimalSurface.py b/processing/pre/geom_fromMinimalSurface.py index db3592739..2b2887ada 100755 --- a/processing/pre/geom_fromMinimalSurface.py +++ b/processing/pre/geom_fromMinimalSurface.py @@ -89,8 +89,8 @@ for x in range(options.grid[0]): geom=damask.Geom(microstructure,options.size, homogenization=options.homogenization, comments=[scriptID + ' ' + ' '.join(sys.argv[1:])]) - damask.util.croak(geom) + if name is None: sys.stdout.write(str(geom.show())) else: diff --git a/processing/pre/geom_fromOsteonGeometry.py b/processing/pre/geom_fromOsteonGeometry.py index af778020f..ebfde38fa 100755 --- a/processing/pre/geom_fromOsteonGeometry.py +++ b/processing/pre/geom_fromOsteonGeometry.py @@ -134,7 +134,8 @@ for i in range(3,np.max(microstructure)): config_header.append('[Point{}]'.format(i-2)) config_header.append('(gauss)\tphi1 {:.2f}\tPhi {:.2f}\tphi2 0'.format(Alpha[i],Beta[i])) -header = [scriptID + ' ' + ' '.join(sys.argv[1:])] + config_header +header = [scriptID + ' ' + ' '.join(sys.argv[1:])]\ + + config_header geom = damask.Geom(microstructure.reshape(grid), size,-size/2, homogenization=options.homogenization,comments=header) diff --git a/processing/pre/geom_fromTable.py b/processing/pre/geom_fromTable.py old mode 100644 new mode 100755 diff --git a/processing/pre/geom_fromVoronoiTessellation.py b/processing/pre/geom_fromVoronoiTessellation.py index 03880267f..18b9b8b7f 100755 --- a/processing/pre/geom_fromVoronoiTessellation.py +++ b/processing/pre/geom_fromVoronoiTessellation.py @@ -194,15 +194,17 @@ parser.set_defaults(pos = 'pos', normalized = True, config = True, ) + (options,filenames) = parser.parse_args() -# --- loop over input files ------------------------------------------------------------------------- if filenames == []: filenames = [None] for name in filenames: - table = damask.ASCIItable(name = name, readonly = True) damask.util.report(scriptName,name) + + table = damask.ASCIItable(name = name, readonly = True) + # --- read header ----------------------------------------------------------------------------