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

now correctly detecting symbolic links for different marc versions

This commit is contained in:
Martin Diehl 2014-05-16 06:21:50 +00:00
parent ac1aa94a58
commit 8493d6b414
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/damask/solver/marc.py
View File

@ -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])