From 698b28ff80fa3cbd09b4378d79cf61fdf9bfae48 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Thu, 19 Sep 2019 10:53:52 -0700
Subject: [PATCH] Marc 2019 is there and installed

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73b6abd58..b1b03600e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,9 +71,10 @@ variables:
   # ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   Abaqus2019:                      "FEM/Abaqus/2019"
   MSC2018_1:                       "FEM/MSC/2018.1"
+  MSC2019:                         "FEM/MSC/2019"
   # ------------ Defaults ----------------------------------------------
   Abaqus:                          "$Abaqus2019"
-  MSC:                             "$MSC2018_1"
+  MSC:                             "$MSC2019"
   IntelMarc:                       "$IntelCompiler17_8"
   IntelAbaqus:                     "$IntelCompiler16_4"
   HDF5Marc:                        "HDF5/1.10.4/Intel-17.8"
@@ -394,12 +395,22 @@ Phenopowerlaw_singleSlip:
 Marc_compileIfort2018_1:
   stage: compileMarc
   script:
-    - module load $IntelMarc $HDF5Marc $MSC
+    - module load $IntelMarc $HDF5Marc $MSC_2018_1
     - export DAMASK_HDF5=ON
     - Marc_compileIfort/test.py -m 2018.1
   except:
     - master
     - 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:
diff --git a/CONFIG b/CONFIG
index 6d5226c89..a505e4888 100644
--- a/CONFIG
+++ b/CONFIG
@@ -4,7 +4,7 @@
 set DAMASK_NUM_THREADS    = 4
 
 set MSC_ROOT              = /opt/msc
-set MARC_VERSION          = 2018.1
+set MARC_VERSION          = 2019
 
 set ABAQUS_VERSION        = 2019