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

subroutine path was not correct

This commit is contained in:
Christoph Kords 2012-01-17 09:28:52 +00:00
parent 5562c31031
commit 7f94b3f267
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,14 +69,14 @@ class Marc(Solver):
import shutil import shutil
damaskEnv = damask.environment.Environment(rootRelation) damaskEnv = damask.environment.Environment(rootRelation)
if subroutine_dir is None: subroutine_dir = damaskEnv.binDir() if subroutine_dir is None: subroutine_dir = damaskEnv.relPath('code/')
if subroutine_name is None: subroutine_name = 'DAMASK_marc' + self.version(rootRelation) if subroutine_name is None: subroutine_name = 'DAMASK_marc' + self.version(rootRelation)
if run_marc_path is None: run_marc_path = os.path.join(damaskEnv.pathInfo['msc'],self.version(rootRelation),'tools/') if run_marc_path is None: run_marc_path = os.path.join(damaskEnv.pathInfo['msc'],self.version(rootRelation),'tools/')
# Define all options [see Marc Installation and Operation Guide, pp 23] # Define all options [see Marc Installation and Operation Guide, pp 23]
run_marc = os.path.join(run_marc_path,'run_marc') run_marc = os.path.join(run_marc_path,'run_marc')
jid = ' -jid ' + modelname + '_' + jobname jid = ' -jid ' + modelname + '_' + jobname
compilation=' -u ' + subroutine_dir + subroutine_name + '.f90'+' -save y' compilation=' -u ' + os.path.join(subroutine_dir,subroutine_name+'.f90') + ' -save y'
options=' -nprocd 1 -autorst 0 -ci n -cr n -dcoup 0 -b no -v no' options=' -nprocd 1 -autorst 0 -ci n -cr n -dcoup 0 -b no -v no'
cmd=run_marc+jid+options cmd=run_marc+jid+options
@ -84,8 +84,8 @@ class Marc(Solver):
cmd += compilation cmd += compilation
print 'job submission with compilation.' print 'job submission with compilation.'
else: else:
shutil.copy2(subroutine_dir+subroutine_name+'.f90','./'+subroutine_name+'.f90') shutil.copy2(os.path.join(subroutine_dir,subroutine_name+'.f90'),os.path.join('.',subroutine_name+'.f90'))
shutil.copy2(compiled_dir+subroutine_name+'.marc','./'+subroutine_name+'.marc') shutil.copy2(os.path.join(compiled_dir,subroutine_name+'.marc'),os.path.join('.',subroutine_name+'.marc'))
prog = ' -prog ' + subroutine_name prog = ' -prog ' + subroutine_name
cmd += prog cmd += prog
print 'Job submission without compilation, using %s'%prog print 'Job submission without compilation, using %s'%prog