From 4cb6c0a7062fc99e80015dffce89153cccc9a8e6 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 8 Aug 2013 09:12:44 +0000 Subject: [PATCH] added support for MSC.Marc>2013 to tools (execution with option for optimization (h/l/-) and OpenMP (True/False) added test for MSC.Marc2013 removed automated test run for MSC.Marc 2010, hast to run on a different machine and is deprecated anyway --- lib/damask/solver/marc.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/damask/solver/marc.py b/lib/damask/solver/marc.py index d63365a69..cfb88f75b 100644 --- a/lib/damask/solver/marc.py +++ b/lib/damask/solver/marc.py @@ -77,6 +77,8 @@ class Marc(Solver): job = 'job1', logfile = None, compile = False, + optimization ='', + openMP = False ): import os,damask.environment @@ -89,7 +91,13 @@ class Marc(Solver): user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc') # Define options [see Marc Installation and Operation Guide, pp 23] - cmd = os.path.join(self.toolsPath(rootRelation,release),'run_marc') + \ + if int(release)>=2013: + script = 'run_damask%s'%({False:'',True:'_'}[len(optimization)>0 or openMP]) + script = 'run_damask%s%s'%({False:'',True:optimization}[len(optimization)>0],{False:'',True:'mp'}[openMP]) + else: + script = 'run_marc' + + cmd = os.path.join(self.toolsPath(rootRelation,release),script) + \ ' -jid ' + model + '_' + job + \ ' -nprocd 1 -autorst 0 -ci n -cr n -dcoup 0 -b no -v no'