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

improved updating of reference results

This commit is contained in:
Martin Diehl 2012-02-09 14:41:18 +00:00
parent a329a9b91d
commit 7960600dbe
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/damask/test/test.py
View File

@ -17,11 +17,11 @@ class Test():
self.dirBase = os.path.dirname(os.path.realpath(sys.argv[0])) self.dirBase = os.path.dirname(os.path.realpath(sys.argv[0]))
def execute(self,variants = [],update = []): def execute(self,variants = [],update = []):
''' '''
Run all variants and report first failure. Run all variants and report first failure.
''' '''
if len(variants) == 0: variants = xrange(len(self.variants)) # iterate over all variants if len(variants) == 0: variants = xrange(len(self.variants)) # iterate over all variants
self.clean() self.clean()
for variant in variants: for variant in variants:
try: try:
@ -35,11 +35,11 @@ class Test():
except: except:
return variant return variant
return -1 return -1
# for variant in variants: # for self.current_variant_index,variant in enumerate(variants):
# self.prepare(variant) # self.prepare(variant)
# self.run(variant) # self.run(variant)
# self.postprocess(variant) # self.postprocess(variant)
# if variant in update: # if self.current_variant_index in update:
# self.update(variant) # self.update(variant)
# elif not self.compare(variant): # elif not self.compare(variant):
# return variant # return variant
@ -144,10 +144,13 @@ class Test():
table = damask.ASCIItable(refFile) table = damask.ASCIItable(refFile)
table.head_read() table.head_read()
refFile.close() refFile.close()
refArray = numpy.loadtxt(refName,skiprows = table.headerLen) refArray = numpy.genfromtxt(refName,missing_values='n/a',skip_header = table.headerLen)
curArray = numpy.loadtxt(curName,skiprows = table.headerLen) curArray = numpy.genfromtxt(curName,missing_values='n/a',skip_header = table.headerLen)
err = abs((refArray/curArray)-1.) # relative tolerance err = abs((refArray/curArray)-1.) # relative tolerance
refNaN=len(numpy.isnan(refArray))
curNaN=len(numpy.isnan(curArray))
if curNaN == refNaN:
err[numpy.isnan(err)]=0.0
max_err = numpy.max(err) max_err = numpy.max(err)
print 'maximum relative error',max_err print 'maximum relative error',max_err
return max_err return max_err