From 8493d6b414314dcdf056c08f52f4f7fdf7dbd72a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 16 May 2014 06:21:50 +0000 Subject: [PATCH] now correctly detecting symbolic links for different marc versions --- lib/damask/solver/marc.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/damask/solver/marc.py b/lib/damask/solver/marc.py index 7091732c3..f413574c3 100644 --- a/lib/damask/solver/marc.py +++ b/lib/damask/solver/marc.py @@ -91,11 +91,11 @@ class Marc(Solver): 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) + 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) + 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])