From 3d4ef650f330f2821ff4c622579cafb800b14492 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 9 May 2014 11:29:35 +0000 Subject: [PATCH] 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 --- lib/damask/solver/marc.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/damask/solver/marc.py b/lib/damask/solver/marc.py index a35ac36a4..7091732c3 100644 --- a/lib/damask/solver/marc.py +++ b/lib/damask/solver/marc.py @@ -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])