diff --git a/lib/damask/asciitable.py b/lib/damask/asciitable.py index 08cb6b3a7..9ebc3bf71 100644 --- a/lib/damask/asciitable.py +++ b/lib/damask/asciitable.py @@ -131,8 +131,10 @@ class ASCIItable(): if self.__IO__['out'] != sys.stdout: self.__IO__['out'].close() except: pass - if dismiss and os.path.isfile(self.__IO__['out'].name): os.remove(self.__IO__['out'].name) - if self.__IO__['inPlace']: os.rename(self.__IO__['out'].name, self.__IO__['out'].name[:-len(self.tmpext)]) + if dismiss and os.path.isfile(self.__IO__['out'].name): + os.remove(self.__IO__['out'].name) + elif self.__IO__['inPlace']: + os.rename(self.__IO__['out'].name, self.__IO__['out'].name[:-len(self.tmpext)]) # ------------------------------------------------------------------ def head_read(self): diff --git a/processing/pre/geom_canvas.py b/processing/pre/geom_canvas.py index cbbd42006..2a7d1985b 100755 --- a/processing/pre/geom_canvas.py +++ b/processing/pre/geom_canvas.py @@ -95,6 +95,10 @@ for name in filenames: translate_x = [i - options.offset[0] for i in xindex] translate_y = [i - options.offset[1] for i in yindex] translate_z = [i - options.offset[2] for i in zindex] + if 0 in map(len,[xindex,yindex,zindex,translate_x,translate_y,translate_z]): + damask.util.croak('Invaldid grid-offset comination') + table.close(dismiss = True) + continue microstructure_cropped[min(translate_x):(max(translate_x)+1),\ min(translate_y):(max(translate_y)+1),\ min(translate_z):(max(translate_z)+1)] \ @@ -111,10 +115,14 @@ for name in filenames: remarks = [] errors = [] - if (any(newInfo['grid'] != info['grid'])): remarks.append('--> grid a b c: %s'%(' x '.join(map(str,newInfo['grid'])))) - if (any(newInfo['size'] != info['size'])): remarks.append('--> size x y z: %s'%(' x '.join(map(str,newInfo['size'])))) - 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 (any(newInfo['grid'] != info['grid'])): + remarks.append('--> grid a b c: %s'%(' x '.join(map(str,newInfo['grid'])))) + if (any(newInfo['size'] != info['size'])): + remarks.append('--> size x y z: %s'%(' x '.join(map(str,newInfo['size'])))) + 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 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.')