diff --git a/processing/pre/geom_addPrimitive.py b/processing/pre/geom_addPrimitive.py index 932df46de..875c62f07 100755 --- a/processing/pre/geom_addPrimitive.py +++ b/processing/pre/geom_addPrimitive.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,re,sys,math,string +import os,sys,math,string import numpy as np from optparse import OptionParser import damask @@ -69,32 +69,32 @@ options.center = np.array(options.center) invRotation = rotation.conjugated() # rotation of gridpos into primitive coordinate system # --- loop over input files ------------------------------------------------------------------------- - -if filenames == []: filenames = ['STDIN'] +if filenames == []: filenames = [None] for name in filenames: - if not (name == 'STDIN' or os.path.exists(name)): continue - table = damask.ASCIItable(name = name, outname = name+'_tmp', - buffered = False, labeled = False) - table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name != 'STDIN' else '')) + try: + table = damask.ASCIItable(name = name, + buffered = False, labeled = False) + except: continue + damask.util.report(scriptName,name) # --- interpret header ---------------------------------------------------------------------------- table.head_read() info,extra_header = table.head_getGeom() - table.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), - 'size x y z: %s'%(' x '.join(map(str,info['size']))), - 'origin x y z: %s'%(' : '.join(map(str,info['origin']))), - 'homogenization: %i'%info['homogenization'], - 'microstructures: %i'%info['microstructures'], + damask.util.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), + 'size x y z: %s'%(' x '.join(map(str,info['size']))), + 'origin x y z: %s'%(' : '.join(map(str,info['origin']))), + 'homogenization: %i'%info['homogenization'], + 'microstructures: %i'%info['microstructures'], ]) errors = [] if np.any(info['grid'] < 1): errors.append('invalid grid a b c.') if np.any(info['size'] <= 0.0): errors.append('invalid size x y z.') if errors != []: - table.croak(errors) + damask.util.croak(errors) table.close(dismiss = True) continue @@ -137,7 +137,7 @@ for name in filenames: remarks = [] if ( newInfo['microstructures'] != info['microstructures']): remarks.append('--> microstructures: %i'%newInfo['microstructures']) - if remarks != []: table.croak(remarks) + if remarks != []: damask.util.croak(remarks) #--- write header --------------------------------------------------------------------------------- @@ -148,7 +148,8 @@ for name in filenames: "size\tx {size[0]}\ty {size[1]}\tz {size[2]}".format(size=info['size']), "origin\tx {origin[0]}\ty {origin[1]}\tz {origin[2]}".format(origin=info['origin']), "homogenization\t{homog}".format(homog=info['homogenization']), - "microstructures\t{microstructures}".format(microstructures=newInfo['microstructures']) + "microstructures\t{microstructures}".format(microstructures=newInfo['microstructures']), + extra_header ]) table.labels_clear() table.head_write() @@ -160,7 +161,6 @@ for name in filenames: table.data = microstructure.reshape((info['grid'][0],info['grid'][1]*info['grid'][2]),order='F').transpose() table.data_writeArray('%%%ii'%(formatwidth),delimiter = ' ') -# --- output finalization -------------------------------------------------------------------------- +#--- output finalization -------------------------------------------------------------------------- - table.close() # close ASCII table - if name != 'STDIN': os.rename(name+'_tmp',name) # overwrite old one with tmp new + table.close() diff --git a/processing/pre/geom_canvas.py b/processing/pre/geom_canvas.py index c20871371..cbbd42006 100755 --- a/processing/pre/geom_canvas.py +++ b/processing/pre/geom_canvas.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,re,sys,math,string +import os,sys,math,string import numpy as np from optparse import OptionParser import damask @@ -47,14 +47,14 @@ for name in filenames: table = damask.ASCIItable(name = name, buffered = False, labeled = False) except: continue - table.croak(damask.util.emph(scriptName)+(': '+name if name else '')) + damask.util.report(scriptName,name) # --- interpret header ---------------------------------------------------------------------------- table.head_read() info,extra_header = table.head_getGeom() - table.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), + damask.util.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), 'size x y z: %s'%(' x '.join(map(str,info['size']))), 'origin x y z: %s'%(' : '.join(map(str,info['origin']))), 'homogenization: %i'%info['homogenization'], @@ -65,7 +65,7 @@ for name in filenames: if np.any(info['grid'] < 1): errors.append('invalid grid a b c.') if np.any(info['size'] <= 0.0): errors.append('invalid size x y z.') if errors != []: - table.croak(errors) + damask.util.croak(errors) table.close(dismiss = True) continue @@ -119,22 +119,23 @@ for name in filenames: if np.any(newInfo['grid'] < 1): errors.append('invalid new grid a b c.') if np.any(newInfo['size'] <= 0.0): errors.append('invalid new size x y z.') - if remarks != []: table.croak(remarks) + if remarks != []: damask.util.croak(remarks) if errors != []: - table.croak(errors) + damask.util.croak(errors) table.close(dismiss = True) continue # --- write header --------------------------------------------------------------------------------- table.info_clear() - table.info_append(extra_header+[ + table.info_append([ scriptID + ' ' + ' '.join(sys.argv[1:]), "grid\ta {grid[0]}\tb {grid[1]}\tc {grid[2]}".format(grid=newInfo['grid']), "size\tx {size[0]}\ty {size[1]}\tz {size[2]}".format(size=newInfo['size']), "origin\tx {origin[0]}\ty {origin[1]}\tz {origin[2]}".format(origin=newInfo['origin']), "homogenization\t{homog}".format(homog=info['homogenization']), "microstructures\t{microstructures}".format(microstructures=newInfo['microstructures']), + extra_header ]) table.labels_clear() table.head_write() diff --git a/processing/pre/geom_fromVoronoiTessellation.py b/processing/pre/geom_fromVoronoiTessellation.py index 7e51f3965..4b8ac765f 100755 --- a/processing/pre/geom_fromVoronoiTessellation.py +++ b/processing/pre/geom_fromVoronoiTessellation.py @@ -310,9 +310,9 @@ for name in filenames: for ID in grainIDs: eulerID = np.nonzero(grains == ID)[0][0] # find first occurrence of this grain id config_header += ['[Grain%s]'%(str(ID).zfill(formatwidth)), - 'axes\t%s %s %s'%tuple(options.axes) if options.axes != None else '', - '(gauss)\tphi1 %g\tPhi %g\tphi2 %g\tscatter 0.0\tfraction 1.0'%tuple(eulers[eulerID]), + '(gauss)\tphi1 %g\tPhi %g\tphi2 %g\tscatter 0.0\tfraction 1.0'%tuple(eulers[eulerID]) ] + if options.axes != None: config_header.append('axes\t%s %s %s'%tuple(options.axes)) table.labels_clear() table.info_clear() diff --git a/processing/pre/geom_rescale.py b/processing/pre/geom_rescale.py index 05d615990..bf9d751c3 100755 --- a/processing/pre/geom_rescale.py +++ b/processing/pre/geom_rescale.py @@ -48,14 +48,14 @@ for name in filenames: table = damask.ASCIItable(name = name, buffered = False, labeled = False) except: continue - table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else '')) + damask.util.report(scriptName,name) # --- interpret header ---------------------------------------------------------------------------- table.head_read() info,extra_header = table.head_getGeom() - table.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), + damask.util.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), 'size x y z: %s'%(' x '.join(map(str,info['size']))), 'origin x y z: %s'%(' : '.join(map(str,info['origin']))), 'homogenization: %i'%info['homogenization'], @@ -66,7 +66,7 @@ for name in filenames: if np.any(info['grid'] < 1): errors.append('invalid grid a b c.') if np.any(info['size'] <= 0.0): errors.append('invalid size x y z.') if errors != []: - table.croak(errors) + damask.util.croak(errors) table.close(dismiss = True) continue @@ -126,22 +126,23 @@ for name in filenames: if np.any(newInfo['grid'] < 1): errors.append('invalid new grid a b c.') if np.any(newInfo['size'] <= 0.0): errors.append('invalid new size x y z.') - if remarks != []: table.croak(remarks) + if remarks != []: damask.util.croak(remarks) if errors != []: - table.croak(errors) + damask.util.croak(errors) table.close(dismiss = True) continue # --- write header --------------------------------------------------------------------------------- table.info_clear() - table.info_append(extra_header+[ + table.info_append([ scriptID + ' ' + ' '.join(sys.argv[1:]), "grid\ta {grid[0]}\tb {grid[1]}\tc {grid[2]}".format(grid=newInfo['grid']), "size\tx {size[0]}\ty {size[1]}\tz {size[2]}".format(size=newInfo['size']), "origin\tx {origin[0]}\ty {origin[1]}\tz {origin[2]}".format(origin=info['origin']), "homogenization\t{homog}".format(homog=info['homogenization']), "microstructures\t{microstructures}".format(microstructures=newInfo['microstructures']), + extra_header ]) table.labels_clear() table.head_write() diff --git a/processing/pre/geom_translate.py b/processing/pre/geom_translate.py index dccc5234e..68a9f8be4 100755 --- a/processing/pre/geom_translate.py +++ b/processing/pre/geom_translate.py @@ -51,14 +51,14 @@ for name in filenames: table = damask.ASCIItable(name = name, buffered = False, labeled = False) except: continue - table.croak(damask.util.emph(scriptName)+(': '+name if name else '')) + damask.util.report(scriptName,name) # --- interpret header ---------------------------------------------------------------------------- table.head_read() info,extra_header = table.head_getGeom() - table.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), + damask.util.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), 'size x y z: %s'%(' x '.join(map(str,info['size']))), 'origin x y z: %s'%(' : '.join(map(str,info['origin']))), 'homogenization: %i'%info['homogenization'], @@ -69,7 +69,7 @@ for name in filenames: if np.any(info['grid'] < 1): errors.append('invalid grid a b c.') if np.any(info['size'] <= 0.0): errors.append('invalid size x y z.') if errors != []: - table.croak(errors) + damask.util.croak(errors) table.close(dismiss = True) continue @@ -97,19 +97,20 @@ for name in filenames: remarks = [] if (any(newInfo['origin'] != info['origin'])): remarks.append('--> origin x y z: %s'%(' : '.join(map(str,newInfo['origin'])))) if ( newInfo['microstructures'] != info['microstructures']): remarks.append('--> microstructures: %i'%newInfo['microstructures']) - if remarks != []: table.croak(remarks) + if remarks != []: damask.util.croak(remarks) # --- write header --------------------------------------------------------------------------------- table.labels_clear() table.info_clear() - table.info_append(extra_header+[ + table.info_append([ scriptID + ' ' + ' '.join(sys.argv[1:]), "grid\ta {grid[0]}\tb {grid[1]}\tc {grid[2]}".format(grid=info['grid']), "size\tx {size[0]}\ty {size[1]}\tz {size[2]}".format(size=info['size']), "origin\tx {origin[0]}\ty {origin[1]}\tz {origin[2]}".format(origin=newInfo['origin']), "homogenization\t{homog}".format(homog=info['homogenization']), "microstructures\t{microstructures}".format(microstructures=newInfo['microstructures']), + extra_header ]) table.head_write() diff --git a/processing/pre/geom_vicinityOffset.py b/processing/pre/geom_vicinityOffset.py index 74c4377ff..c5dce7cef 100755 --- a/processing/pre/geom_vicinityOffset.py +++ b/processing/pre/geom_vicinityOffset.py @@ -45,14 +45,14 @@ for name in filenames: table = damask.ASCIItable(name = name, buffered = False, labeled = False) except: continue - table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else '')) + damask.util.report(scriptName,name) # --- interpret header ---------------------------------------------------------------------------- table.head_read() info,extra_header = table.head_getGeom() - table.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), + damask.util.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), 'size x y z: %s'%(' x '.join(map(str,info['size']))), 'origin x y z: %s'%(' : '.join(map(str,info['origin']))), 'homogenization: %i'%info['homogenization'], @@ -63,7 +63,7 @@ for name in filenames: if np.any(info['grid'] < 1): errors.append('invalid grid a b c.') if np.any(info['size'] <= 0.0): errors.append('invalid size x y z.') if errors != []: - table.croak(errors) + damask.util.croak(errors) table.close(dismiss = True) continue @@ -89,19 +89,20 @@ for name in filenames: remarks = [] if ( newInfo['microstructures'] != info['microstructures']): remarks.append('--> microstructures: %i'%newInfo['microstructures']) - if remarks != []: table.croak(remarks) + if remarks != []: damask.util.croak(remarks) # --- write header --------------------------------------------------------------------------------- table.labels_clear() table.info_clear() - table.info_append(extra_header+[ + table.info_append([ scriptID + ' ' + ' '.join(sys.argv[1:]), "grid\ta {grid[0]}\tb {grid[1]}\tc {grid[2]}".format(grid=info['grid']), "size\tx {size[0]}\ty {size[1]}\tz {size[2]}".format(size=info['size']), "origin\tx {origin[0]}\ty {origin[1]}\tz {origin[2]}".format(origin=info['origin']), "homogenization\t{homog}".format(homog=info['homogenization']), "microstructures\t{microstructures}".format(microstructures=newInfo['microstructures']), + extra_header ]) table.head_write()