crystallite not needed anymore
This commit is contained in:
parent
d1fa2a14dc
commit
82c741d6bb
|
@ -145,7 +145,6 @@ for name in filenames:
|
||||||
config_header += ['<microstructure>']
|
config_header += ['<microstructure>']
|
||||||
for i in range(np.nanmax(microstructure)):
|
for i in range(np.nanmax(microstructure)):
|
||||||
config_header += ['[{}{}]'.format(label,i+1),
|
config_header += ['[{}{}]'.format(label,i+1),
|
||||||
'crystallite 1',
|
|
||||||
'(constituent)\tphase {}\ttexture {}\tfraction 1.0'.format(phase[i],i+1),
|
'(constituent)\tphase {}\ttexture {}\tfraction 1.0'.format(phase[i],i+1),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -126,15 +126,12 @@ for i in range(3,np.max(microstructure)):
|
||||||
|
|
||||||
config_header = ['<microstructure>',
|
config_header = ['<microstructure>',
|
||||||
'[canal]',
|
'[canal]',
|
||||||
'crystallite 1',
|
|
||||||
'(constituent)\tphase 1\ttexture 1\tfraction 1.0',
|
'(constituent)\tphase 1\ttexture 1\tfraction 1.0',
|
||||||
'[interstitial]',
|
'[interstitial]',
|
||||||
'crystallite 1',
|
|
||||||
'(constituent)\tphase 2\ttexture 2\tfraction 1.0'
|
'(constituent)\tphase 2\ttexture 2\tfraction 1.0'
|
||||||
]
|
]
|
||||||
for i in range(3,np.max(microstructure)):
|
for i in range(3,np.max(microstructure)):
|
||||||
config_header += ['[Point{}]'.format(i-2),
|
config_header += ['[Point{}]'.format(i-2),
|
||||||
'crystallite 1',
|
|
||||||
'(constituent)\tphase 3\ttexture {}\tfraction 1.0'.format(i)
|
'(constituent)\tphase 3\ttexture {}\tfraction 1.0'.format(i)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -290,7 +290,6 @@ for name in filenames:
|
||||||
config_header += ['<microstructure>']
|
config_header += ['<microstructure>']
|
||||||
for ID in grainIDs:
|
for ID in grainIDs:
|
||||||
config_header += ['[Grain{}]'.format(ID),
|
config_header += ['[Grain{}]'.format(ID),
|
||||||
'crystallite 1',
|
|
||||||
'(constituent)\tphase {}\ttexture {}\tfraction 1.0'.format(options.phase,ID)
|
'(constituent)\tphase {}\ttexture {}\tfraction 1.0'.format(options.phase,ID)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -211,10 +211,6 @@ parser.add_option('-p','--phase',
|
||||||
dest = 'phase',
|
dest = 'phase',
|
||||||
type = 'int', metavar = 'int',
|
type = 'int', metavar = 'int',
|
||||||
help = 'phase index to be used [%default]')
|
help = 'phase index to be used [%default]')
|
||||||
parser.add_option('--crystallite',
|
|
||||||
dest = 'crystallite',
|
|
||||||
type = 'int', metavar = 'int',
|
|
||||||
help = 'crystallite index to be used [%default]')
|
|
||||||
parser.add_option('-r', '--rnd',
|
parser.add_option('-r', '--rnd',
|
||||||
dest = 'randomSeed',
|
dest = 'randomSeed',
|
||||||
type = 'int', metavar = 'int', \
|
type = 'int', metavar = 'int', \
|
||||||
|
@ -223,7 +219,6 @@ parser.set_defaults(randomSeed = None,
|
||||||
number = 500,
|
number = 500,
|
||||||
algorithm = 'IA',
|
algorithm = 'IA',
|
||||||
phase = 1,
|
phase = 1,
|
||||||
crystallite = 1,
|
|
||||||
ang = True,
|
ang = True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -351,7 +346,6 @@ for name in filenames:
|
||||||
|
|
||||||
for i,ID in enumerate(range(nSamples)):
|
for i,ID in enumerate(range(nSamples)):
|
||||||
materialConfig += ['[Grain%s]'%(str(ID+1).zfill(formatwidth)),
|
materialConfig += ['[Grain%s]'%(str(ID+1).zfill(formatwidth)),
|
||||||
'crystallite %i'%options.crystallite,
|
|
||||||
'(constituent) phase %i texture %s fraction 1.0'%(options.phase,str(ID+1).rjust(formatwidth)),
|
'(constituent) phase %i texture %s fraction 1.0'%(options.phase,str(ID+1).rjust(formatwidth)),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -941,19 +941,15 @@ if any(output in options.output for output in ['spectral','mentat']):
|
||||||
|
|
||||||
for i,grain in enumerate(rcData['grainMapping']):
|
for i,grain in enumerate(rcData['grainMapping']):
|
||||||
config+=['[grain{}]'.format(grain),
|
config+=['[grain{}]'.format(grain),
|
||||||
'crystallite\t1',
|
|
||||||
'(constituent)\tphase 1\ttexture {}\tfraction 1.0'.format(i+1)]
|
'(constituent)\tphase 1\ttexture {}\tfraction 1.0'.format(i+1)]
|
||||||
if (options.xmargin > 0.0):
|
if (options.xmargin > 0.0):
|
||||||
config+=['[x-margin]',
|
config+=['[x-margin]',
|
||||||
'crystallite\t1',
|
|
||||||
'(constituent)\tphase 2\ttexture {}\tfraction 1.0\n'.format(len(rcData['grainMapping'])+1)]
|
'(constituent)\tphase 2\ttexture {}\tfraction 1.0\n'.format(len(rcData['grainMapping'])+1)]
|
||||||
if (options.ymargin > 0.0):
|
if (options.ymargin > 0.0):
|
||||||
config+=['[y-margin]',
|
config+=['[y-margin]',
|
||||||
'crystallite\t1',
|
|
||||||
'(constituent)\tphase 2\ttexture {}\tfraction 1.0\n'.format(len(rcData['grainMapping'])+1)]
|
'(constituent)\tphase 2\ttexture {}\tfraction 1.0\n'.format(len(rcData['grainMapping'])+1)]
|
||||||
if (options.xmargin > 0.0 and options.ymargin > 0.0):
|
if (options.xmargin > 0.0 and options.ymargin > 0.0):
|
||||||
config+=['[xy-margin]',
|
config+=['[xy-margin]',
|
||||||
'crystallite\t1',
|
|
||||||
'(constituent)\tphase 2\ttexture {}\tfraction 1.0\n'.format(len(rcData['grainMapping'])+1)]
|
'(constituent)\tphase 2\ttexture {}\tfraction 1.0\n'.format(len(rcData['grainMapping'])+1)]
|
||||||
|
|
||||||
if (options.xmargin > 0.0 or options.ymargin > 0.0):
|
if (options.xmargin > 0.0 or options.ymargin > 0.0):
|
||||||
|
|
Loading…
Reference in New Issue