diff --git a/code/Makefile b/code/Makefile index 885e65c69..d9c51453b 100644 --- a/code/Makefile +++ b/code/Makefile @@ -80,7 +80,7 @@ OPTIMIZATION_OFF_ifort :=-O0 -no-ip OPTIMIZATION_OFF_gfortran :=-O0 OPTIMIZATION_DEFENSIVE_ifort :=-O2 OPTIMIZATION_DEFENSIVE_gfortran :=-O2 -OPTIMIZATION_AGGRESSIVE_ifort :=-fast #-ipo, -O3, -no-prec-div, -static, -fp-model fast=2, and -xHost +OPTIMIZATION_AGGRESSIVE_ifort :=-ipo -O3 -no-prec-div -fp-model fast=2 -xHost #-fast = -ipo, -O3, -no-prec-div, -static, -fp-model fast=2, and -xHost OPTIMIZATION_AGGRESSIVE_gfortran :=-O3 -ffast-math -funroll-loops -ftree-vectorize diff --git a/processing/pre/mentat_spectralBox.py b/processing/pre/mentat_spectralBox.py index bee1006b9..ba97525b3 100755 --- a/processing/pre/mentat_spectralBox.py +++ b/processing/pre/mentat_spectralBox.py @@ -218,7 +218,7 @@ for name in filenames: outname = os.path.splitext(name)[0]+'.proc' if name else 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 ---------------------------------------------------------------------------- @@ -226,18 +226,18 @@ for name in filenames: info,extra_header = table.head_getGeom() if options.homogenization: info['homogenization'] = options.homogenization - 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