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 averageDown.py and added test to check its features

This commit is contained in:
Martin Diehl 2012-10-17 15:05:26 +00:00
parent dcff640926
commit 573c4702eb
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
processing/post/averageDown.py
View File

@ -105,7 +105,7 @@ for file in files:
locationCol = table.labels.index('%s.x'%options.coords) # columns containing location data locationCol = table.labels.index('%s.x'%options.coords) # columns containing location data
elemCol = table.labels.index('elem') # columns containing location data elemCol = table.labels.index('elem') # columns containing location data
except ValueError: except ValueError:
print 'no coordinate data element data found...' print 'no coordinate data or element data found...'
continue continue
if (any(options.resolution)==0 or any(options.dimension)==0.0): if (any(options.resolution)==0 or any(options.dimension)==0.0):
@ -153,20 +153,18 @@ for file in files:
sum = numpy.zeros(numpy.shape(data)) sum = numpy.zeros(numpy.shape(data))
data = numpy.roll(data,axis=2,shift=-options.shift[2]) data = numpy.roll(data,axis=2,shift=-options.shift[2])
data = numpy.roll(data,axis=1,shift=-options.shift[1]) data = numpy.roll(data,axis=1,shift=-options.shift[1])
data = numpy.roll(data,axis=0,shift=-options.shift[0]) data = numpy.roll(data,axis=0,shift=-options.shift[0])
for axis3 in xrange(options.packing[2]): for axis2 in xrange(options.packing[2]):
shiftedZ = numpy.roll(data,shift=axis3,axis=2) shiftedZ = numpy.roll(data,shift=-axis2,axis=2)
for axis2 in xrange(options.packing[1]): for axis1 in xrange(options.packing[1]):
shiftedZY = numpy.roll(shiftedZ,shift=axis2,axis=1) shiftedZY = numpy.roll(shiftedZ,shift=-axis1,axis=1)
for axis1 in xrange(options.packing[0]): for axis0 in xrange(options.packing[0]):
sum += numpy.roll(shiftedZY,shift=axis1,axis=0) sum += numpy.roll(shiftedZY,shift=-axis0,axis=0)
averagedDown = sum[::options.packing[0],::options.packing[1],::options.packing[2]] / options.packing.prod() # normalize data by element count
averagedDown = sum[::options.packing[0],::options.packing[1],::options.packing[2],::] / options.packing.prod() # normalize data by element count
posOffset = (options.shift+[0.5,0.5,0.5])*dimension/resolution posOffset = (options.shift+[0.5,0.5,0.5])*dimension/resolution
elementSize = dimension/resolution*options.packing elementSize = dimension/resolution*options.packing
elem = 1 elem = 1