don't disturb the search routines of MSC.Marc
This commit is contained in:
parent
32b62da84f
commit
aea5730c94
|
@ -63,14 +63,6 @@ else
|
||||||
INTEGER_PATH=/$MARC_INTEGER_SIZE
|
INTEGER_PATH=/$MARC_INTEGER_SIZE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$DAMASK_HDF5" = "ON";then
|
|
||||||
H5FC="$(h5fc -show)"
|
|
||||||
HDF5_LIB=${$H5FC//ifort/}
|
|
||||||
FCOMP=$H5FC
|
|
||||||
else
|
|
||||||
FCOMP=ifort
|
|
||||||
fi
|
|
||||||
|
|
||||||
INTELPATH="/opt/intel/compilers_and_libraries_2017/linux"
|
INTELPATH="/opt/intel/compilers_and_libraries_2017/linux"
|
||||||
|
|
||||||
# find the root directory of the compiler installation:
|
# find the root directory of the compiler installation:
|
||||||
|
@ -106,6 +98,16 @@ else
|
||||||
FCOMPROOT=
|
FCOMPROOT=
|
||||||
fi
|
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 -DDAMASKHDF5"
|
||||||
|
echo $FCOMP
|
||||||
|
else
|
||||||
|
FCOMP=ifort
|
||||||
|
fi
|
||||||
|
|
||||||
# AEM
|
# AEM
|
||||||
if test "$MARCDLLOUTDIR" = ""; then
|
if test "$MARCDLLOUTDIR" = ""; then
|
||||||
DLLOUTDIR="$MARC_LIB"
|
DLLOUTDIR="$MARC_LIB"
|
||||||
|
|
Loading…
Reference in New Issue