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

symlinks always exists 

was not the case when using svn
This commit is contained in:
Martin Diehl 2018-11-16 06:15:23 +01:00
parent 250dac08c7
commit 75c3b89345
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,11 +55,8 @@ class Marc(Solver):
import subprocess,shlex import subprocess,shlex
if len(release) == 0: release = self.version() if len(release) == 0: release = self.version()
damaskEnv = damask.environment.Environment() damaskEnv = damask.environment.Environment()
user = os.path.join(damaskEnv.relPath('src/'),'DAMASK_marc') # first guess, might be updated in the following lines
if compile: if compile:
if os.path.isfile(os.path.join(damaskEnv.relPath('src/'),'DAMASK_marc%s.f90'%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) user = os.path.join(damaskEnv.relPath('src/'),'DAMASK_marc%s'%release)
@ -83,18 +80,18 @@ class Marc(Solver):
print(cmd) print(cmd)
self.p = subprocess.Popen(shlex.split(cmd),stdout = log,stderr = subprocess.STDOUT) self.p = subprocess.Popen(shlex.split(cmd),stdout = log,stderr = subprocess.STDOUT)
log.close() log.close()
self.p.wait() line.p.wait()
#-------------------------- #--------------------------
def exit_number_from_outFile(self,outFile=None): def exit_number_from_outFile(self,outFile=None):
import string import string
exitnumber = -1 exitnumber = -1
fid_out = open(outFile,'r') fid_out = open(outFile,'r')
for ln in fid_out: for line in fid_out:
if (string.find(ln,'tress iteration') is not -1): if (string.find(line,'tress iteration') is not -1):
print(ln) print(line)
elif (string.find(ln,'Exit number') is not -1): elif (string.find(line,'Exit number') is not -1):
substr = ln[string.find(ln,'Exit number'):len(ln)] substr = line[string.find(line,'Exit number'):len(line)]
exitnumber = int(substr[12:16]) exitnumber = int(substr[12:16])
fid_out.close() fid_out.close()