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

fixed bug in material.config when do not compress the data. Thanks to Noriki for figuring out

This commit is contained in:
Martin Diehl 2014-11-14 13:53:55 +00:00
parent c66bc3983b
commit 733e85f6e6
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
processing/pre/geom_fromAng.py
View File

@ -115,29 +115,28 @@ for file in files:
texture = [] texture = []
microstructure = [] microstructure = []
otherPoint=-1 # ensure to create first microstructure otherPoint=-1 # ensure to create first microstructure
matPoints = np.zeros(info['grid'][0]*info['grid'][1],dtype='i') matPoints = np.zeros(info['grid'][0]*info['grid'][1],dtype='i') # Index of microstructure in geom file
for myPoint in xrange(info['grid'][0]*info['grid'][1]): for myPoint in xrange(info['grid'][0]*info['grid'][1]):
myTexture=-1 myTexture=-1
for otherPoint in xrange(len(microstructure)): for otherPoint in xrange(len(microstructure)):
otherEulers = eulerangles[texture[microstructure[otherPoint][0]]] otherEulers = eulerangles[texture[microstructure[otherPoint][0]]]
otherPhase = phase[[microstructure[otherPoint][1]]] otherPhase = phase[microstructure[otherPoint][1]]
if all(eulerangles[myPoint]==otherEulers) and phase[myPoint] == otherPhase: # common microstructure if all(eulerangles[myPoint]==otherEulers) and phase[myPoint] == otherPhase: # common microstructure
matPoints[myPoint] = otherPoint+1 # use other points microstructure matPoints[myPoint] = otherPoint+1 # use other points microstructure
otherPoint =-4 # in no case, create new microstructure otherPoint =-2 # never create new microstructure
break break
elif all(eulerangles[myPoint]==otherEulers): # found common texture and store it elif all(eulerangles[myPoint]==otherEulers): # found common texture and store it
myTexture = microstructure[otherPoint][0] myTexture = microstructure[otherPoint][0]
if otherPoint == len(microstructure)-1 or otherPoint == -2: # if otherPoint == len(microstructure)-1: # did not found matching microstructure
if myTexture == -1: if myTexture == -1: # did not even found matching texture
texture.append(myPoint) texture.append(myPoint)
myTexture = len(texture)-1 myTexture = myPoint
microstructure.append([myTexture,myPoint]) microstructure.append([myTexture,phase[myPoint-1]]) # here, the counter is one more than in the line above!
matPoints[myPoint] = len(microstructure) # use the new microstructure matPoints[myPoint] = len(microstructure) # use the new microstructure
print texture,microstructure
else: else:
texture = [i for i in xrange(info['grid'][0]*info['grid'][1])] texture = [i for i in xrange(info['grid'][0]*info['grid'][1])]
microstructure = [[i+1,phase[i]] for i in xrange(info['grid'][0]*info['grid'][1])] microstructure = [[i,phase[i]] for i in xrange(info['grid'][0]*info['grid'][1])]
matPoints = np.arange(info['grid'][0]*info['grid'][1],dtype='i')
formatOut = 1+int(math.log10(len(texture))) formatOut = 1+int(math.log10(len(texture)))
textureOut =['\n\n<texture>'] textureOut =['\n\n<texture>']
@ -151,7 +150,7 @@ for file in files:
for i in xrange(len(microstructure)): for i in xrange(len(microstructure)):
microstructureOut += ['[Grain%s]\n'%str(i+1).zfill(formatOut) + \ microstructureOut += ['[Grain%s]\n'%str(i+1).zfill(formatOut) + \
'crystallite\t%i\n'%options.crystallite + \ 'crystallite\t%i\n'%options.crystallite + \
'(constituent)\tphase %i\ttexture %s\tfraction 1.0\n'%(phase[microstructure[i][1]],microstructure[i][0]+1) '(constituent)\tphase %i\ttexture %s\tfraction 1.0\n'%(microstructure[i][1],microstructure[i][0]+1)
] ]
info['microstructures'] = len(microstructure) info['microstructures'] = len(microstructure)