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

support for Marc 2018.x 

dropped (not working) support for non-openMP simulations
This commit is contained in:
Martin Diehl 2018-11-14 12:25:31 +01:00
parent 5a6783e5ad
commit 8102eff1e5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,8 @@ class Marc(Solver):
def __init__(self): def __init__(self):
self.solver = 'Marc' self.solver = 'Marc'
self.releases = { \ self.releases = { \
'2018.1': ['linux64',''],
'2018': ['linux64',''],
'2017': ['linux64',''], '2017': ['linux64',''],
'2016': ['linux64',''], '2016': ['linux64',''],
} }
@ -67,7 +69,6 @@ class Marc(Solver):
logfile = None, logfile = None,
compile = False, compile = False,
optimization ='', optimization ='',
openMP = False
): ):
import os,damask.environment import os,damask.environment
@ -90,8 +91,7 @@ class Marc(Solver):
user = os.path.join(damaskEnv.relPath('src/'),'DAMASK_marc%s'%release) user = os.path.join(damaskEnv.relPath('src/'),'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_%smp'%({False:'',True:optimization}[optimization!=''])
script = script+'%s%s'%({False:'',True:optimization}[optimization!=''],{False:'',True:'mp'}[openMP])
cmd = os.path.join(self.toolsPath(release),script) + \ cmd = os.path.join(self.toolsPath(release),script) + \
' -jid ' + model + '_' + job + \ ' -jid ' + model + '_' + job + \