From c75609f8f0984358940287c3dec647df93be71e2 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Fri, 20 Sep 2019 14:21:49 +0200
Subject: [PATCH] Marc 2019 does not work with HDF5

Seems that Marc 2019 brings its own HDF5. Basically good news, but
should be resolved in a separate branch
---
 .gitlab-ci.yml          | 12 ++++++------
 CONFIG                  |  2 +-
 src/DAMASK_marc2019.f90 |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 120000 src/DAMASK_marc2019.f90

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7809f9eeb..914dcb1d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,12 +69,10 @@ variables:
   PETSc_MPICH_Intel:               "$PETSc3_10_3IMPI2018Intel18_4"
   PETSc_MPICH_GNU:                 "$PETSc3_10_3MPICH3_3GNU8_2"
   # ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  Abaqus2019:                      "FEM/Abaqus/2019"
-  MSC2018_1:                       "FEM/MSC/2018.1"
+  MSC2018:                         "FEM/MSC/2018"
   MSC2019:                         "FEM/MSC/2019"
   # ------------ Defaults ----------------------------------------------
-  Abaqus:                          "$Abaqus2019"
-  MSC:                             "$MSC2019"
+  MSC:                             "$MSC2018"
   IntelMarc:                       "$IntelCompiler17_8"
   IntelAbaqus:                     "$IntelCompiler16_4"
   HDF5Marc:                        "HDF5/1.10.4/Intel-17.8"
@@ -391,7 +389,6 @@ Phenopowerlaw_singleSlip:
     - master
     - release
 
-
 ###################################################################################################
 Marc_compileIfort:
   stage: compileMarc
@@ -403,12 +400,12 @@ Marc_compileIfort:
     - master
     - release
 
-
 ###################################################################################################
 Hex_elastic:
   stage: marc
   script:
     - module load $IntelMarc $HDF5Marc $MSC
+    - export DAMASK_HDF5=ON
     - Hex_elastic/test.py
   except:
     - master
@@ -418,6 +415,7 @@ CubicFCC_elastic:
   stage: marc
   script:
     - module load $IntelMarc $HDF5Marc $MSC
+    - export DAMASK_HDF5=ON
     - CubicFCC_elastic/test.py
   except:
     - master
@@ -427,6 +425,7 @@ CubicBCC_elastic:
   stage: marc
   script:
     - module load $IntelMarc $HDF5Marc $MSC
+    - export DAMASK_HDF5=ON
     - CubicBCC_elastic/test.py
   except:
     - master
@@ -436,6 +435,7 @@ J2_plasticBehavior:
   stage: marc
   script:
     - module load $IntelMarc $HDF5Marc $MSC
+    - export DAMASK_HDF5=ON
     - J2_plasticBehavior/test.py
   except:
     - master
diff --git a/CONFIG b/CONFIG
index a505e4888..d5257b89b 100644
--- a/CONFIG
+++ b/CONFIG
@@ -4,7 +4,7 @@
 set DAMASK_NUM_THREADS    = 4
 
 set MSC_ROOT              = /opt/msc
-set MARC_VERSION          = 2019
+set MARC_VERSION          = 2018
 
 set ABAQUS_VERSION        = 2019
 
diff --git a/src/DAMASK_marc2019.f90 b/src/DAMASK_marc2019.f90
deleted file mode 120000
index 2c5bec706..000000000
--- a/src/DAMASK_marc2019.f90
+++ /dev/null
@@ -1 +0,0 @@
-DAMASK_marc.f90
\ No newline at end of file