diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e216346a..7809f9eeb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -391,22 +391,14 @@ Phenopowerlaw_singleSlip: - master - release + ################################################################################################### -Marc_compileIfort2018_1: +Marc_compileIfort: stage: compileMarc script: - - module load $IntelMarc $HDF5Marc $MSC2018_1 + - module load $IntelMarc $HDF5Marc $MSC - export DAMASK_HDF5=ON - - Marc_compileIfort/test.py -m 2018.1 - except: - - master - - release -Marc_compileIfort2019: - stage: compileMarc - script: - - module load $IntelMarc $HDF5Marc $MSC2019 - - export DAMASK_HDF5=ON - - Marc_compileIfort/test.py -m 2019 + - Marc_compileIfort/test.py except: - master - release diff --git a/python/damask/solver/marc.py b/python/damask/solver/marc.py index ca4ed3461..778294d0a 100644 --- a/python/damask/solver/marc.py +++ b/python/damask/solver/marc.py @@ -8,7 +8,7 @@ import damask class Marc(Solver): """Wrapper to run DAMASK with MSCMarc.""" - def __init__(self,version=float(damask.Environment().options['MARC_VERSION'])): + def __init__(self,version=damask.Environment().options['MARC_VERSION']): """ Create a Marc solver object. @@ -19,7 +19,7 @@ class Marc(Solver): """ self.solver ='Marc' - self.version = float(damask.environment.Environment().options['MARC_VERSION']) + self.version = damask.environment.Environment().options['MARC_VERSION'] #--------------------------