simplified test scripts using msc.marc.

changed tolerance for hex test. was successfull for rev 3058, but now needs less strict tolerance, which seems to be related to the marc run script or the library, because with rev 3058 and current marc it has a slightly higher error
This commit is contained in:
Martin Diehl 2014-05-09 11:29:35 +00:00
parent ee31bb1cae
commit 3d4ef650f3
1 changed files with 7 additions and 1 deletions

View File

@ -89,7 +89,13 @@ class Marc(Solver):
damaskEnv = damask.environment.Environment(rootRelation)
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc')
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc') # might be updated if special version is found (usually symlink)
if compile:
if os.path.isfile(os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc_%s.f90'%release)):
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc_%s'%release)
else:
if os.path.isfile(os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc_%s.marc'%release)):
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc_%s'%release)
# Define options [see Marc Installation and Operation Guide, pp 23]
script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP])