use own HDF5 libraries
requires compilation with openMP (and Intel compiler)
This commit is contained in:
parent
004abc2d4e
commit
bbc2ed90a2
|
@ -63,6 +63,7 @@ else
|
||||||
INTEGER_PATH=/$MARC_INTEGER_SIZE
|
INTEGER_PATH=/$MARC_INTEGER_SIZE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
FCOMP=ifort
|
||||||
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:
|
||||||
|
@ -103,9 +104,6 @@ if test "$DAMASK_HDF5" = "ON";then
|
||||||
H5FC="$(h5fc -shlib -show)"
|
H5FC="$(h5fc -shlib -show)"
|
||||||
HDF5_LIB=${H5FC//ifort/}
|
HDF5_LIB=${H5FC//ifort/}
|
||||||
FCOMP="$H5FC -DDAMASK_HDF5"
|
FCOMP="$H5FC -DDAMASK_HDF5"
|
||||||
echo $FCOMP
|
|
||||||
else
|
|
||||||
FCOMP=ifort
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# AEM
|
# AEM
|
||||||
|
@ -531,7 +529,7 @@ else
|
||||||
FORT_OPT=" $FORT_OPT -save -zero"
|
FORT_OPT=" $FORT_OPT -save -zero"
|
||||||
fi
|
fi
|
||||||
if test "$MARCHDF" = "HDF"; then
|
if test "$MARCHDF" = "HDF"; then
|
||||||
FORT_OPT="$FORT_OPT -DMARCHDF=$MARCHDF $HDF_INCLUDE"
|
FORT_OPT="$FORT_OPT -DMARCHDF=$MARCHDF"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $I8FFLAGS -I$MARC_SOURCE/common \
|
FORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $I8FFLAGS -I$MARC_SOURCE/common \
|
||||||
|
@ -757,7 +755,7 @@ SECLIBS="-L$MARC_LIB -llapi"
|
||||||
|
|
||||||
SOLVERLIBS="${BCSSOLVERLIBS} ${VKISOLVERLIBS} ${CASISOLVERLIBS} ${MF2SOLVERLIBS} \
|
SOLVERLIBS="${BCSSOLVERLIBS} ${VKISOLVERLIBS} ${CASISOLVERLIBS} ${MF2SOLVERLIBS} \
|
||||||
$MKLLIB -L$MARC_MKL -liomp5 \
|
$MKLLIB -L$MARC_MKL -liomp5 \
|
||||||
$MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/kdtree2.a $HDF_LIBS $HDF_LIB"
|
$MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/kdtree2.a $HDF5_LIB"
|
||||||
|
|
||||||
SOLVERLIBS_DLL=${SOLVERLIBS}
|
SOLVERLIBS_DLL=${SOLVERLIBS}
|
||||||
if test "$AEM_DLL" -eq 1
|
if test "$AEM_DLL" -eq 1
|
||||||
|
|
Loading…
Reference in New Issue