From 4e1dc73fc9275956cc6b7d785f46655d362bd858 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Wed, 14 Nov 2018 23:43:08 +0100
Subject: [PATCH] MSC.Marc 2018.x requires python3

---
 .gitlab-ci.yml | 5 ++---
 CONFIG         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

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