use consistent pre processor macro

installation/mods_Abaqus/abaqus_v6.env

@@ -16,7 +16,7 @@ if False:
   # use hdf5 compiler wrapper in $PATH
   fortCmd   = os.popen('h5fc -shlib -show').read().replace('\n','')                                 # complicated way needed to pass in DAMASKVERSION string
   link_sl  += fortCmd.split()[1:]
-  fortCmd  +=" -DDAMASKHDF5"
+  fortCmd  +=" -DDAMASK_HDF5"
 else:
   # Use the version in $PATH
   fortCmd = "ifort"

installation/mods_Abaqus/abaqus_v6_debug.env

@@ -16,7 +16,7 @@ if False:
   # use hdf5 compiler wrapper in $PATH
   fortCmd   = os.popen('h5fc -shlib -show').read().replace('\n','')                                 # complicated way needed to pass in DAMASKVERSION string
   link_sl  += fortCmd.split()[1:]
-  fortCmd  +=" -DDAMASKHDF5"
+  fortCmd  +=" -DDAMASK_HDF5"
 else:
   # Use the version in $PATH
   fortCmd = "ifort"

installation/mods_MarcMentat/2018.1/Marc_tools/include_linux64

@@ -102,7 +102,7 @@ fi
 if test "$DAMASK_HDF5" = "ON";then
   H5FC="$(h5fc -shlib -show)"
   HDF5_LIB=${H5FC//ifort/}
-  FCOMP="$H5FC -DDAMASKHDF5"
+  FCOMP="$H5FC -DDAMASK_HDF5"
   echo $FCOMP
 else
   FCOMP=ifort

installation/mods_MarcMentat/2018/Marc_tools/include_linux64

@@ -63,7 +63,6 @@ else
  INTEGER_PATH=/$MARC_INTEGER_SIZE
 fi
 
-FCOMP=ifort
 INTELPATH="/opt/intel/compilers_and_libraries_2017/linux"
 
 # find the root directory of the compiler installation:
@@ -99,6 +98,16 @@ else
  FCOMPROOT=
 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
+
 # AEM
 if test "$MARCDLLOUTDIR" = ""; then
  DLLOUTDIR="$MARC_LIB"
@@ -535,6 +544,7 @@ else
   DAMASKVERSION="'N/A'"
 fi
 
+
 # DAMASK compiler calls: additional flags are in line 2 OpenMP flags in line 3
 DFORTLOWMP="$FCOMP -c -implicitnone -stand f08 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB  -O0 $I8FFLAGS -I$MARC_SOURCE/common \
  -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2018 -DDAMASKVERSION=$DAMASKVERSION \
@@ -737,7 +747,7 @@ SECLIBS="-L$MARC_LIB -llapi"
 
 SOLVERLIBS="${BCSSOLVERLIBS} ${VKISOLVERLIBS} ${CASISOLVERLIBS} ${MF2SOLVERLIBS} \
   $MKLLIB -L$MARC_MKL -liomp5 \
-  $MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/kdtree2.a "
+  $MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/kdtree2.a $HDF5_LIB "
 
 SOLVERLIBS_DLL=${SOLVERLIBS}
 if test "$AEM_DLL" -eq 1

src/commercialFEM_fileList.f90

@@ -9,7 +9,7 @@
 #include "list.f90"
 #include "future.f90"
 #include "config.f90"
-#ifdef DAMASKHDF5
+#ifdef DAMASK_HDF5
 #include "HDF5_utilities.f90"
 #include "results.f90"
 #endif