simplified

This commit is contained in:
Martin Diehl 2020-03-17 10:49:30 +01:00
parent ba8eab646b
commit f46d79ec87
1 changed files with 8 additions and 17 deletions

View File

@ -58,9 +58,6 @@ parser.add_option('-r',
'--rnd',
dest = 'randomSeed', type = 'int', metavar = 'int',
help = 'seed of random number generator [%default]')
parser.add_option('--format',
dest = 'format', type = 'string', metavar = 'string',
help = 'output number format [auto]')
group = OptionGroup(parser, "Laguerre Tessellation",
"Parameters determining shape of weight distribution of seed points"
@ -114,10 +111,10 @@ parser.set_defaults(randomSeed = None,
selective = False,
distance = 0.2,
numCandidates = 10,
format = None,
)
(options,filenames) = parser.parse_args()
if filenames == []: filenames = [None]
options.fraction = np.array(options.fraction)
options.grid = np.array(options.grid)
@ -127,11 +124,6 @@ if options.randomSeed is None: options.randomSeed = int(os.urandom(4).hex(), 16)
np.random.seed(options.randomSeed) # init random generators
random.seed(options.randomSeed)
# --- loop over output files -------------------------------------------------------------------------
if filenames == []: filenames = [None]
for name in filenames:
try:
table = damask.ASCIItable(outname = name)
@ -208,7 +200,6 @@ for name in filenames:
table.info_append([
scriptID + ' ' + ' '.join(sys.argv[1:]),
"grid\ta {}\tb {}\tc {}".format(*options.grid),
"microstructures\t{}".format(options.N),
"randomSeed\t{}".format(options.randomSeed),
])
table.labels_clear()
@ -222,7 +213,7 @@ for name in filenames:
# --- write seeds information ------------------------------------------------------------
table.data = seeds
table.data_writeArray(fmt = options.format)
table.data_writeArray()
# --- output finalization --------------------------------------------------------------------------