From f51aafabdd832b4e01b8a8dad19d4662488a7686 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Wed, 21 Nov 2018 00:00:18 +0100
Subject: [PATCH] using hdf5 wrapper for compilation of subroutines

---
 installation/mods_Abaqus/abaqus_v6.env       | 10 +++++++---
 installation/mods_Abaqus/abaqus_v6_debug.env | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/installation/mods_Abaqus/abaqus_v6.env b/installation/mods_Abaqus/abaqus_v6.env
index 33c13c2ee..0b4a7fd43 100644
--- a/installation/mods_Abaqus/abaqus_v6.env
+++ b/installation/mods_Abaqus/abaqus_v6.env
@@ -13,12 +13,14 @@
 import os, re, glob, driverUtils
 from damask import version as DAMASKVERSION
 from damask import Environment
-myEnv = damask.Environment()
+myEnv = Environment()
 
 if myEnv.options['DAMASK_HDF5'] == 'ON':
   # use hdf5 compiler wrapper in $PATH
-  fortCmd = os.popen('h5fc -shlib -show').read().replace('\n','')
-else
+  fortCmd   = os.popen('h5fc -shlib -show').read().replace('\n','')                                 # complicated way needed to pass in DAMASKVERSION string
+  link_sl  += fortCmd.split()[1:]
+  fortCmd  +=" -DDAMASKHDF5"
+else:
   # Use the version in $PATH
   fortCmd = "ifort"
 
@@ -56,4 +58,6 @@ ask_delete=OFF
 
 # Remove the temporary names from the namespace
 del fortCmd
+del Environment
+del myEnv
 del DAMASKVERSION
diff --git a/installation/mods_Abaqus/abaqus_v6_debug.env b/installation/mods_Abaqus/abaqus_v6_debug.env
index de5189a52..c967c1e65 100644
--- a/installation/mods_Abaqus/abaqus_v6_debug.env
+++ b/installation/mods_Abaqus/abaqus_v6_debug.env
@@ -12,9 +12,17 @@
 #
 import os, re, glob, driverUtils
 from damask import version as DAMASKVERSION
+from damask import Environment
+myEnv = Environment()
 
-# Use the version in $PATH
-fortCmd = "ifort"
+if myEnv.options['DAMASK_HDF5'] == 'ON':
+  # 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"
+else:
+  # Use the version in $PATH
+  fortCmd = "ifort"
 
 # -free                           to use free-format FORTRAN 90 syntax
 # -O <0-3>                        optimization level
@@ -55,4 +63,6 @@ ask_delete=OFF
 
 # Remove the temporary names from the namespace
 del fortCmd
+del Environment
+del myEnv
 del DAMASKVERSION