From 7f94b3f26752018b0aec783f9d9ff1d3ed5de0b1 Mon Sep 17 00:00:00 2001 From: Christoph Kords Date: Tue, 17 Jan 2012 09:28:52 +0000 Subject: [PATCH] subroutine path was not correct --- lib/damask/solver/marc.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/damask/solver/marc.py b/lib/damask/solver/marc.py index f855aac2c..adab0c070 100644 --- a/lib/damask/solver/marc.py +++ b/lib/damask/solver/marc.py @@ -69,14 +69,14 @@ class Marc(Solver): import shutil 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 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] run_marc = os.path.join(run_marc_path,'run_marc') 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' cmd=run_marc+jid+options @@ -84,8 +84,8 @@ class Marc(Solver): cmd += compilation print 'job submission with compilation.' else: - shutil.copy2(subroutine_dir+subroutine_name+'.f90','./'+subroutine_name+'.f90') - shutil.copy2(compiled_dir+subroutine_name+'.marc','./'+subroutine_name+'.marc') + shutil.copy2(os.path.join(subroutine_dir,subroutine_name+'.f90'),os.path.join('.',subroutine_name+'.f90')) + shutil.copy2(os.path.join(compiled_dir,subroutine_name+'.marc'),os.path.join('.',subroutine_name+'.marc')) prog = ' -prog ' + subroutine_name cmd += prog print 'Job submission without compilation, using %s'%prog