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

Merge branch 'development' of magit1.mpie.de:damask/DAMASK into miscImprovements

This commit is contained in:
Martin Diehl 2016-09-04 19:07:15 +02:00
parent c05307a273 6ea7eeee08
commit 221d3753f0
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/math.f90
View File

@ -179,7 +179,6 @@ subroutine math_init
use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
use prec, only: tol_math_check use prec, only: tol_math_check
use numerics, only: & use numerics, only: &
worldrank, &
fixedSeed fixedSeed
use IO, only: IO_error, IO_timeStamp use IO, only: IO_error, IO_timeStamp

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

@ -41,6 +41,7 @@ class Test():
self.parser = OptionParser(description = '{} (using class: {})'.format(description,damask.version), self.parser = OptionParser(description = '{} (using class: {})'.format(description,damask.version),
usage = './test.py [options]') usage = './test.py [options]')
self.updateRequested = False
self.parser.add_option("-d", "--debug", self.parser.add_option("-d", "--debug",
action = "store_true", action = "store_true",
dest = "debug", dest = "debug",
@ -49,14 +50,8 @@ class Test():
action = "store_true", action = "store_true",
dest = "accept", dest = "accept",
help = "calculate results but always consider test as successfull") help = "calculate results but always consider test as successfull")
self.parser.add_option("-u", "--update",
action = "store_true",
dest = "update",
help = "use current test results as new reference"
)
self.parser.set_defaults(debug = False, self.parser.set_defaults(debug = False,
accept = False, accept = False,
update = False,
) )
def execute(self): def execute(self):
@ -82,7 +77,7 @@ class Test():
self.prepare(variant) self.prepare(variant)
self.run(variant) self.run(variant)
self.postprocess(variant) self.postprocess(variant)
if self.options.update: # update requested if self.updateRequested: # update requested
self.update(variant) self.update(variant)
elif not (self.options.accept or self.compare(variant)): # no update, do comparison elif not (self.options.accept or self.compare(variant)): # no update, do comparison
return variant+1 # return culprit return variant+1 # return culprit