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

new test for Marc 2013.1 + small changes on marc solver class to run with intermediate release (20xx.1)

This commit is contained in:
Martin Diehl 2014-04-14 16:18:08 +00:00
parent eca211588e
commit 86cec35799
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ 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]
if int(release) >= 2013: if int(release[0:4]) >= 2013:
script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP]) script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP])
script = script+'%s%s'%({False:'',True:optimization}[optimization!=''],{False:'',True:'mp'}[openMP]) script = script+'%s%s'%({False:'',True:optimization}[optimization!=''],{False:'',True:'mp'}[openMP])
else: else: