conversion to float causes issues

test only current version of MSC.Marc
This commit is contained in:
Martin Diehl 2019-09-20 03:21:53 +02:00
parent f63d907119
commit 4b2263bebe
2 changed files with 6 additions and 14 deletions

View File

@ -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

View File

@ -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']
#--------------------------