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

adopted "MSC_ROOT" instead of "msc" for pathinfo

This commit is contained in:
Philip Eisenlohr 2014-01-16 21:35:51 +00:00
parent 50b682db4c
commit c402d848f7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ class Marc(Solver):
#--------------------------
import os,damask.environment
MSCpath = damask.environment.Environment(rootRelation).pathInfo['msc']
MSCpath = damask.environment.Environment(rootRelation).pathInfo['MSC_ROOT']
for release,subdirs in sorted(self.releases.items(),reverse=True):
for subdir in subdirs:
@ -41,7 +41,7 @@ class Marc(Solver):
#--------------------------
import os,damask.environment
MSCpath = damask.environment.Environment(rootRelation).pathInfo['msc']
MSCpath = damask.environment.Environment(rootRelation).pathInfo['MSC_ROOT']
if len(releases) == 0: releases = self.releases.keys()
if type(releases) is not list: releases = [releases]
@ -60,7 +60,7 @@ class Marc(Solver):
#--------------------------
import os,damask.environment
MSCpath = damask.environment.Environment(rootRelation).pathInfo['msc']
MSCpath = damask.environment.Environment(rootRelation).pathInfo['MSC_ROOT']
if len(release) == 0: release = self.version(rootRelation)
path = '%s/marc%s/tools'%(MSCpath,release)
@ -91,7 +91,7 @@ class Marc(Solver):
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc')
# Define options [see Marc Installation and Operation Guide, pp 23]
if int(release)>=2013:
if int(release) >= 2013:
script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP])
script = script+'%s%s'%({False:'',True:optimization}[optimization!=''],{False:'',True:'mp'}[openMP])
else:
@ -125,5 +125,5 @@ class Marc(Solver):
substr = ln[string.find(ln,'Exit number'):len(ln)]
exitnumber = int(substr[12:16])
fid_out.close()
fid_out.close()
return exitnumber