From 86cec357993b07360cb9e9401f43ee7cfa38f51a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 14 Apr 2014 16:18:08 +0000 Subject: [PATCH] new test for Marc 2013.1 + small changes on marc solver class to run with intermediate release (20xx.1) --- lib/damask/solver/marc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/damask/solver/marc.py b/lib/damask/solver/marc.py index a8ee33ac1..1845cdc39 100644 --- a/lib/damask/solver/marc.py +++ b/lib/damask/solver/marc.py @@ -95,7 +95,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[0:4]) >= 2013: script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP]) script = script+'%s%s'%({False:'',True:optimization}[optimization!=''],{False:'',True:'mp'}[openMP]) else: