Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
This commit is contained in:
commit
45b2d15ee0
|
@ -158,12 +158,12 @@ Post_AverageDown:
|
|||
- master
|
||||
- release
|
||||
|
||||
Post_General:
|
||||
stage: postprocessing
|
||||
script: PostProcessing/test.py
|
||||
except:
|
||||
- master
|
||||
- release
|
||||
#Post_General:
|
||||
# stage: postprocessing
|
||||
# script: PostProcessing/test.py
|
||||
# except:
|
||||
# - master
|
||||
# - release
|
||||
|
||||
Post_GeometryReconstruction:
|
||||
stage: postprocessing
|
||||
|
|
|
@ -244,7 +244,7 @@ for name in filenames:
|
|||
continue
|
||||
damask.util.report(scriptName,name)
|
||||
|
||||
randomSeed = int(os.urandom(4).encode('hex'), 16) if options.randomSeed is None else options.randomSeed # random seed per file for second phase
|
||||
randomSeed = int(os.urandom(4).hex(), 16) if options.randomSeed is None else options.randomSeed # random seed per file for second phase
|
||||
random.seed(randomSeed)
|
||||
|
||||
# ------------------------------------------ read header and data ---------------------------------
|
||||
|
|
Loading…
Reference in New Issue