From 1037aa98d3358ab2787b26c7e019c7cbdb171e24 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sat, 21 Dec 2019 12:28:41 +0100
Subject: [PATCH] DADF5 is now the only output

---
 .gitlab-ci.yml                                        |  5 -----
 CONFIG                                                |  4 ----
 .../mods_MarcMentat/2018.1/Marc_tools/include_linux64 | 11 +++--------
 .../mods_MarcMentat/2018/Marc_tools/include_linux64   | 11 +++--------
 .../mods_MarcMentat/2019/Marc_tools/include_linux64   |  8 +++-----
 5 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36d723db4..7958db9b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -391,7 +391,6 @@ Marc_compileIfort:
   stage: compileMarc
   script:
     - module load $IntelMarc $HDF5Marc $MSC
-    - export DAMASK_HDF5=ON
     - Marc_compileIfort/test.py
   except:
     - master
@@ -402,7 +401,6 @@ Hex_elastic:
   stage: marc
   script:
     - module load $IntelMarc $HDF5Marc $MSC
-    - export DAMASK_HDF5=ON
     - Hex_elastic/test.py
   except:
     - master
@@ -412,7 +410,6 @@ CubicFCC_elastic:
   stage: marc
   script:
     - module load $IntelMarc $HDF5Marc $MSC
-    - export DAMASK_HDF5=ON
     - CubicFCC_elastic/test.py
   except:
     - master
@@ -422,7 +419,6 @@ CubicBCC_elastic:
   stage: marc
   script:
     - module load $IntelMarc $HDF5Marc $MSC
-    - export DAMASK_HDF5=ON
     - CubicBCC_elastic/test.py
   except:
     - master
@@ -432,7 +428,6 @@ 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 53e87b647..8da4d5b96 100644
--- a/CONFIG
+++ b/CONFIG
@@ -1,11 +1,7 @@
 # "set"-syntax needed only for tcsh (but works with bash and zsh)
-# DAMASK_ROOT will be expanded
-
 set DAMASK_NUM_THREADS    = 4
 
 set MSC_ROOT              = /opt/msc
 set MARC_VERSION          = 2019
 
 set ABAQUS_VERSION        = 2019
-
-set DAMASK_HDF5           = ON
diff --git a/installation/mods_MarcMentat/2018.1/Marc_tools/include_linux64 b/installation/mods_MarcMentat/2018.1/Marc_tools/include_linux64
index 10a796e47..8adabaff1 100644
--- a/installation/mods_MarcMentat/2018.1/Marc_tools/include_linux64
+++ b/installation/mods_MarcMentat/2018.1/Marc_tools/include_linux64
@@ -99,14 +99,9 @@ else
 fi
 
 # DAMASK uses the HDF5 compiler wrapper around the Intel compiler
-if test "$DAMASK_HDF5" = "ON";then
-  H5FC="$(h5fc -shlib -show)"
-  HDF5_LIB=${H5FC//ifort/}
-  FCOMP="$H5FC -DDAMASK_HDF5"
-  echo $FCOMP
-else
-  FCOMP=ifort
-fi
+H5FC="$(h5fc -shlib -show)"
+HDF5_LIB=${H5FC//ifort/}
+FCOMP="$H5FC -DDAMASK_HDF5"
 
 # AEM
 if test "$MARCDLLOUTDIR" = ""; then
diff --git a/installation/mods_MarcMentat/2018/Marc_tools/include_linux64 b/installation/mods_MarcMentat/2018/Marc_tools/include_linux64
index 694dccee3..c99313a30 100644
--- a/installation/mods_MarcMentat/2018/Marc_tools/include_linux64
+++ b/installation/mods_MarcMentat/2018/Marc_tools/include_linux64
@@ -99,14 +99,9 @@ else
 fi
 
 # DAMASK uses the HDF5 compiler wrapper around the Intel compiler
-if test "$DAMASK_HDF5" = "ON";then
-  H5FC="$(h5fc -shlib -show)"
-  HDF5_LIB=${H5FC//ifort/}
-  FCOMP="$H5FC -DDAMASK_HDF5"
-  echo $FCOMP
-else
-  FCOMP=ifort
-fi
+H5FC="$(h5fc -shlib -show)"
+HDF5_LIB=${H5FC//ifort/}
+FCOMP="$H5FC -DDAMASK_HDF5"
 
 # AEM
 if test "$MARCDLLOUTDIR" = ""; then
diff --git a/installation/mods_MarcMentat/2019/Marc_tools/include_linux64 b/installation/mods_MarcMentat/2019/Marc_tools/include_linux64
index 6d630bd1d..2dba03961 100644
--- a/installation/mods_MarcMentat/2019/Marc_tools/include_linux64
+++ b/installation/mods_MarcMentat/2019/Marc_tools/include_linux64
@@ -100,11 +100,9 @@ else
 fi
 
 # DAMASK uses the HDF5 compiler wrapper around the Intel compiler
-if test "$DAMASK_HDF5" = "ON";then
-  H5FC="$(h5fc -shlib -show)"
-  HDF5_LIB=${H5FC//ifort/}
-  FCOMP="$H5FC -DDAMASK_HDF5"
-fi
+H5FC="$(h5fc -shlib -show)"
+HDF5_LIB=${H5FC//ifort/}
+FCOMP="$H5FC -DDAMASK_HDF5"
 
 # AEM
 if test "$MARCDLLOUTDIR" = ""; then