diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 969bf98ce..661a96495 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,6 @@ stages: - prepareSpectral - spectral - compileMarc2017 - - compileMarc2018_1 - marc - compileAbaqus2017 - example @@ -78,8 +77,8 @@ variables: MSC2017: "FEM/MSC/2017" # ------------ Defaults ---------------------------------------------- Abaqus: "$Abaqus2017" - MSC: "$MSC2018_1" - IntelMarc: "IntelCompiler17_0" + MSC: "$MSC2017" + IntelMarc: "IntelCompiler16_4" # ++++++++++++ Documentation +++++++++++++++++++++++++++++++++++++++++ Doxygen1_8_13: "Documentation/Doxygen/1.8.13" # ------------ Defaults ---------------------------------------------- diff --git a/CONFIG b/CONFIG index e2d81a9a7..13b75a768 100644 --- a/CONFIG +++ b/CONFIG @@ -8,6 +8,6 @@ set DAMASK_NUM_THREADS = 4 set MSC_ROOT = /opt/msc set MARC_VERSION = 2018.1 -set ABAQUS_VERSION = 2018.1 +set ABAQUS_VERSION = 2017 set DAMASK_HDF5 = OFF