using ASCII table

This commit is contained in:
Martin Diehl 2015-09-18 16:12:27 +00:00
parent 6a3a0f3859
commit 666b438e6a
1 changed files with 6 additions and 6 deletions

View File

@ -268,11 +268,11 @@ initialGeomVFile.write(execute('geom_fromVoronoiTessellation '+
initialGeomVFile.reset() initialGeomVFile.reset()
initialGeomTable = damask.ASCIItable(initialGeomVFile,labeled=False,readonly=True) initialGeomTable = damask.ASCIItable(initialGeomVFile,labeled=False,readonly=True)
initialGeomTable.head_read() initialGeomTable.head_read()
for i in initialGeomTable.info: info,devNull = initialGeomTable.head_getGeom()
if i.startswith('microstructures'): initialMicrostructures = int(i.split('\t')[1])
if initialMicrostructures != nMicrostructures: print 'error. Microstructure count mismatch' if info['microstructures'] != nMicrostructures: print 'error. Microstructure count mismatch'
initialGeomTable.data_readArray()
initialData = np.bincount(initialGeomTable.data.astype(int).ravel())[1:]/points initialData = np.bincount(initialGeomTable.microstructure_read(info['grid']))/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())
@ -288,7 +288,7 @@ for i in xrange(nMicrostructures):
if options.maxseeds < 1: if options.maxseeds < 1:
maxSeeds = initialMicrostructures maxSeeds = info['microstructures']
else: else:
maxSeeds = options.maxseeds maxSeeds = options.maxseeds