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

added support for MSC.Marc>2013 to tools (execution with option for optimization (h/l/-) and OpenMP (True/False) 

added test for MSC.Marc2013
removed automated test run for MSC.Marc 2010, hast to run on a different machine and is deprecated anyway
This commit is contained in:
Martin Diehl 2013-08-08 09:12:44 +00:00
parent 23e8fcbc51
commit 4cb6c0a706
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,8 @@ class Marc(Solver):
job = 'job1', job = 'job1',
logfile = None, logfile = None,
compile = False, compile = False,
optimization ='',
openMP = False
): ):
import os,damask.environment import os,damask.environment
@ -89,7 +91,13 @@ class Marc(Solver):
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc') user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc')
# Define options [see Marc Installation and Operation Guide, pp 23] # Define options [see Marc Installation and Operation Guide, pp 23]
cmd = os.path.join(self.toolsPath(rootRelation,release),'run_marc') + \ if int(release)>=2013:
script = 'run_damask%s'%({False:'',True:'_'}[len(optimization)>0 or openMP])
script = 'run_damask%s%s'%({False:'',True:optimization}[len(optimization)>0],{False:'',True:'mp'}[openMP])
else:
script = 'run_marc'
cmd = os.path.join(self.toolsPath(rootRelation,release),script) + \
' -jid ' + model + '_' + job + \ ' -jid ' + model + '_' + job + \
' -nprocd 1 -autorst 0 -ci n -cr n -dcoup 0 -b no -v no' ' -nprocd 1 -autorst 0 -ci n -cr n -dcoup 0 -b no -v no'