now correctly detecting symbolic links for different marc versions
This commit is contained in:
parent
ac1aa94a58
commit
8493d6b414
|
@ -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)
|
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc') # might be updated if special version is found (usually symlink)
|
||||||
if compile:
|
if compile:
|
||||||
if os.path.isfile(os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc_%s.f90'%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)
|
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc%s'%release)
|
||||||
else:
|
else:
|
||||||
if os.path.isfile(os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc_%s.marc'%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)
|
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc%s'%release)
|
||||||
|
|
||||||
# Define options [see Marc Installation and Operation Guide, pp 23]
|
# Define options [see Marc Installation and Operation Guide, pp 23]
|
||||||
script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP])
|
script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP])
|
||||||
|
|
Loading…
Reference in New Issue