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

fixed wrong periodicity treatment

This commit is contained in:
Martin Diehl 2014-12-05 10:35:56 +00:00
parent 55c2b729a0
commit c067d0dc69
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
processing/pre/seeds_fromDistribution.py
View File

@ -94,7 +94,7 @@ class myThread (threading.Thread):
direction+=direction direction+=direction
newCoords=np.array(tuple(map(float,perturbedSeedsTable.data[0:3]))+direction) newCoords=np.array(tuple(map(float,perturbedSeedsTable.data[0:3]))+direction)
newCoords=np.where(newCoords>=1.0,newCoords-1.0,newCoords) newCoords=np.where(newCoords>=1.0,newCoords-1.0,newCoords)
newCoords=np.where(newCoords <1.0,newCoords+1.0,newCoords) newCoords=np.where(newCoords <0.0,newCoords+1.0,newCoords)
perturbedSeedsTable.data[0:3]=[format(f, '8.6f') for f in newCoords] perturbedSeedsTable.data[0:3]=[format(f, '8.6f') for f in newCoords]
ms+=1 ms+=1
perturbedSeedsTable.data_write() perturbedSeedsTable.data_write()
@ -251,9 +251,6 @@ initialData = np.bincount(initialGeomTable.data.astype(int).ravel())[1:]/points
for i in xrange(nMicrostructures): for i in xrange(nMicrostructures):
initialHist = np.histogram(initialData,bins=target[i]['bins'])[0] initialHist = np.histogram(initialData,bins=target[i]['bins'])[0]
target[i]['error']=np.sqrt(np.square(np.array(target[i]['histogram']-initialHist)).sum()) target[i]['error']=np.sqrt(np.square(np.array(target[i]['histogram']-initialHist)).sum())
#print target[i]['histogram']
#print initialHist
#print target[i]['error'],'\n-----------------------------------'
match=0 match=0
for i in xrange(nMicrostructures): for i in xrange(nMicrostructures):
@ -264,8 +261,7 @@ print 'Stage %i cleared'%match
initialGeomVFile.close() initialGeomVFile.close()
# start mulithreaded monte carlo simulation
# strart mulithreaded monte carlo simulation
threads=[] threads=[]
s=threading.Semaphore(1) s=threading.Semaphore(1)