Marc 2019 is there and installed

This commit is contained in:
Martin Diehl 2019-09-19 10:53:52 -07:00
parent bf7db26680
commit 698b28ff80
2 changed files with 14 additions and 3 deletions

View File

@ -71,9 +71,10 @@ variables:
# ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Abaqus2019: "FEM/Abaqus/2019" Abaqus2019: "FEM/Abaqus/2019"
MSC2018_1: "FEM/MSC/2018.1" MSC2018_1: "FEM/MSC/2018.1"
MSC2019: "FEM/MSC/2019"
# ------------ Defaults ---------------------------------------------- # ------------ Defaults ----------------------------------------------
Abaqus: "$Abaqus2019" Abaqus: "$Abaqus2019"
MSC: "$MSC2018_1" MSC: "$MSC2019"
IntelMarc: "$IntelCompiler17_8" IntelMarc: "$IntelCompiler17_8"
IntelAbaqus: "$IntelCompiler16_4" IntelAbaqus: "$IntelCompiler16_4"
HDF5Marc: "HDF5/1.10.4/Intel-17.8" HDF5Marc: "HDF5/1.10.4/Intel-17.8"
@ -394,12 +395,22 @@ Phenopowerlaw_singleSlip:
Marc_compileIfort2018_1: Marc_compileIfort2018_1:
stage: compileMarc stage: compileMarc
script: script:
- module load $IntelMarc $HDF5Marc $MSC - module load $IntelMarc $HDF5Marc $MSC_2018_1
- export DAMASK_HDF5=ON - export DAMASK_HDF5=ON
- Marc_compileIfort/test.py -m 2018.1 - Marc_compileIfort/test.py -m 2018.1
except: except:
- master - master
- release - release
Marc_compileIfort2019:
stage: compileMarc
script:
- module load $IntelMarc $HDF5Marc $MSC_2019
- export DAMASK_HDF5=ON
- Marc_compileIfort/test.py -m 2019
except:
- master
- release
################################################################################################### ###################################################################################################
Hex_elastic: Hex_elastic:

2
CONFIG
View File

@ -4,7 +4,7 @@
set DAMASK_NUM_THREADS = 4 set DAMASK_NUM_THREADS = 4
set MSC_ROOT = /opt/msc set MSC_ROOT = /opt/msc
set MARC_VERSION = 2018.1 set MARC_VERSION = 2019
set ABAQUS_VERSION = 2019 set ABAQUS_VERSION = 2019