diff --git a/lib/damask/solver/marc.py b/lib/damask/solver/marc.py index 873d08cdb..16f3c8451 100644 --- a/lib/damask/solver/marc.py +++ b/lib/damask/solver/marc.py @@ -13,9 +13,6 @@ class Marc(Solver): '2015': ['linux64',''], '2014.2':['linux64',''], '2014' :['linux64',''], - '2013.1':['linux64',''], - '2013': ['linux64',''], - '2012': ['linux64',''], } @@ -86,13 +83,13 @@ class Marc(Solver): damaskEnv = damask.environment.Environment() - user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc') # might be updated if special version (symlink) is found + user = os.path.join(damaskEnv.relPath('src/'),'DAMASK_marc') # might be updated if special version (symlink) is found 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('src/'),'DAMASK_marc%s.f90'%release)): + user = os.path.join(damaskEnv.relPath('src/'),'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('src/'),'DAMASK_marc%s.marc'%release)): + user = os.path.join(damaskEnv.relPath('src/'),'DAMASK_marc%s'%release) # Define options [see Marc Installation and Operation Guide, pp 23] script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP])