223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added possibility to specify number of bins to be sorted in advance to current cleared stage

This commit is contained in:
Martin Diehl 2014-12-18 18:03:36 +00:00
parent 10384555f6
commit 9ac62e42df
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
processing/pre/seeds_fromDistribution.py
View File

@ -129,7 +129,7 @@ class myThread (threading.Thread):
myMatch = i+1 myMatch = i+1
if myNmicrostructures == nMicrostructures: if myNmicrostructures == nMicrostructures:
for i in xrange(nMicrostructures): for i in xrange(min(nMicrostructures,myMatch+options.bins)):
if currentError[i] > target[i]['error']: if currentError[i] > target[i]['error']:
randReset = True randReset = True
break break
@ -154,8 +154,16 @@ class myThread (threading.Thread):
match=myMatch match=myMatch
sys.stdout.flush() sys.stdout.flush()
break break
if i == nMicrostructures-1: if i == min(nMicrostructures,myMatch+options.bins)-1:
print 'Thread %i: Continue along trajectory'%(self.threadID) bestSeedsUpdate = time.time()
perturbedSeedsVFile.reset()
bestSeedsVFile.close()
bestSeedsVFile = StringIO()
for line in perturbedSeedsVFile:
bestSeedsVFile.write(line)
for j in xrange(nMicrostructures):
target[j]['error'] = currentError[j]
randReset = True
else: #--- not all grains are tessellated else: #--- not all grains are tessellated
print 'Thread %i: Microstructure mismatch (%i microstructures mapped)'%(self.threadID,myNmicrostructures) print 'Thread %i: Microstructure mismatch (%i microstructures mapped)'%(self.threadID,myNmicrostructures)
randReset = True randReset = True
@ -187,7 +195,8 @@ parser.add_option('--tolerance', dest='threshold', type='int', metavar='int'
help='stopping criterion (bin number) [%default]') help='stopping criterion (bin number) [%default]')
parser.add_option('--scale', dest='scale',type='float', metavar='float', parser.add_option('--scale', dest='scale',type='float', metavar='float',
help='maximum moving distance of perturbed seed in pixel [%default]') help='maximum moving distance of perturbed seed in pixel [%default]')
parser.add_option('--bins', dest='bins', type='int', metavar='int',
help='bins to sort beyond current best fit [%default]')
parser.set_defaults(seedFile = 'seeds') parser.set_defaults(seedFile = 'seeds')
parser.set_defaults(grid = (64,64,64)) parser.set_defaults(grid = (64,64,64))
@ -195,6 +204,7 @@ parser.set_defaults(threads = 2)
parser.set_defaults(randomSeed = None) parser.set_defaults(randomSeed = None)
parser.set_defaults(target = 'geom') parser.set_defaults(target = 'geom')
parser.set_defaults(threshold = 20) parser.set_defaults(threshold = 20)
parser.set_defaults(bins = 15)
parser.set_defaults(scale = 1.0) parser.set_defaults(scale = 1.0)
@ -258,6 +268,7 @@ for i in xrange(nMicrostructures):
match = i+1 match = i+1
print 'Stage %i cleared'%match print 'Stage %i cleared'%match
sys.stdout.flush()
initialGeomVFile.close() initialGeomVFile.close()