102 lines
4.7 KiB
Diff
102 lines
4.7 KiB
Diff
---
|
|
+++
|
|
@@ -119,6 +119,11 @@ if test "$MSCCOSIM_VERSION" = ""; then
|
|
MSCCOSIM_VERSION="2020"
|
|
fi
|
|
|
|
+# DAMASK uses the HDF5 compiler wrapper around the Intel compiler
|
|
+H5FC="$(h5fc -shlib -show)"
|
|
+HDF5_LIB=${H5FC//ifort/}
|
|
+FCOMP="$H5FC -DDAMASK_HDF5"
|
|
+
|
|
# AEM
|
|
if test "$MARCDLLOUTDIR" = ""; then
|
|
DLLOUTDIR="$MARC_LIB"
|
|
@@ -439,8 +444,8 @@ if test "$MARC_INTEGER_SIZE" = "i4" ; then
|
|
I8DEFINES=
|
|
I8CDEFINES=
|
|
else
|
|
- I8FFLAGS="-i8"
|
|
- I8DEFINES="-DI64"
|
|
+ I8FFLAGS="-i8 -integer-size 64"
|
|
+ I8DEFINES="-DI64 -DINT=8"
|
|
I8CDEFINES="-U_DOUBLE -D_SINGLE"
|
|
fi
|
|
|
|
@@ -556,7 +561,7 @@ then
|
|
PROFILE=" $PROFILE -pg"
|
|
fi
|
|
|
|
-FORT_OPT="-c -assume byterecl -safe_cray_ptr -mp1 -WB -fp-model source"
|
|
+FORT_OPT="-c -implicitnone -stand f18 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr -mp1 -WB -fp-model source"
|
|
if test "$MTHREAD" = "OPENMP"
|
|
then
|
|
FORT_OPT=" $FORT_OPT -qopenmp"
|
|
@@ -569,7 +574,7 @@ else
|
|
FORT_OPT=" $FORT_OPT -save -zero"
|
|
fi
|
|
if test "$MARCHDF_HDF" = "HDF"; then
|
|
- FORT_OPT="$FORT_OPT -DMARCHDF_HDF=$MARCHDF_HDF $HDF_INCLUDE"
|
|
+ FORT_OPT="$FORT_OPT -DMARCHDF=$MARCHDF_HDF"
|
|
fi
|
|
|
|
FORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $I8FFLAGS -I$MARC_SOURCE/common \
|
|
@@ -583,6 +588,30 @@ FORTNA="$FCOMP $FORT_OPT -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
|
|
# for compiling free form f90 files. high opt, integer(4)
|
|
FORTF90="$FCOMP -c -O3"
|
|
|
|
+# determine DAMASK version
|
|
+if test -n "$DAMASK_USER"; then
|
|
+ DAMASKROOT=`dirname $DAMASK_USER`/..
|
|
+ read DAMASKVERSION < $DAMASKROOT/VERSION
|
|
+ DAMASKVERSION="'"$DAMASKVERSION"'"
|
|
+else
|
|
+ DAMASKVERSION="'N/A'"
|
|
+fi
|
|
+
|
|
+
|
|
+# DAMASK compiler calls
|
|
+DFORTLOWMP="$FCOMP -c -O0 -qno-offload -implicitnone -stand f18 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
|
|
+ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2020 -DDAMASKVERSION=$DAMASKVERSION \
|
|
+ -qopenmp -qopenmp-threadprivate=compat\
|
|
+ $MUMPS_INCLUDE $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS -I$KDTREE2_MOD -I$MARC_MOD"
|
|
+DFORTRANMP="$FCOMP -c -O1 -qno-offload -implicitnone -stand f18 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
|
|
+ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2020 -DDAMASKVERSION=$DAMASKVERSION \
|
|
+ -qopenmp -qopenmp-threadprivate=compat\
|
|
+ $MUMPS_INCLUDE $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS -I$KDTREE2_MOD -I$MARC_MOD"
|
|
+DFORTHIGHMP="$FCOMP -c -O3 -qno-offload -implicitnone -stand f18 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
|
|
+ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2020 -DDAMASKVERSION=$DAMASKVERSION \
|
|
+ -qopenmp -qopenmp-threadprivate=compat\
|
|
+ $MUMPS_INCLUDE $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS -I$KDTREE2_MOD -I$MARC_MOD"
|
|
+
|
|
if test "$MARCDEBUG" = "ON"
|
|
then
|
|
FORTLOW="$FCOMP $FORT_OPT $PROFILE $I8FFLAGS -I$MARC_SOURCE/common \
|
|
@@ -739,7 +768,7 @@ SECLIBS="-L$MARC_LIB -llapi"
|
|
|
|
SOLVERLIBS="${BCSSOLVERLIBS} ${VKISOLVERLIBS} ${CASISOLVERLIBS} ${MF2SOLVERLIBS} \
|
|
-L$MARC_MKL \
|
|
- $MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/libkdtree2.a $MARC_LIB/libtetmeshinterface.a $MARC_LIB/libcaefatigueinterface.a -L$MARC_LIB -lmkl_blacs_intelmpi_ilp64 -lmkl_scalapack_ilp64 -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core -liomp5 -ltetmesh -lmeshgems -lmg-tetra -lmeshgems_stubs $HDF_LIBS $SOLVER2LIBS"
|
|
+ $MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/libkdtree2.a $MARC_LIB/libtetmeshinterface.a $MARC_LIB/libcaefatigueinterface.a -L$MARC_LIB -lmkl_blacs_intelmpi_ilp64 -lmkl_scalapack_ilp64 -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core -liomp5 -ltetmesh -lmeshgems -lmg-tetra -lmeshgems_stubs $HDF5_LIB $SOLVER2LIBS"
|
|
|
|
SOLVERLIBS_DLL=${SOLVERLIBS}
|
|
if test "$AEM_DLL" -eq 1
|
|
@@ -762,7 +791,7 @@ then
|
|
OPENSSL=NONE
|
|
fi
|
|
|
|
-SYSLIBS=" $OPENMP -lpthread -shared-intel -cxxlib"
|
|
+SYSLIBS=" $OPENMP -lpthread -cxxlib"
|
|
|
|
# Uncomment the following lines to turn on the trace and comment out the next 4 lines
|
|
# if test $MPITYPE = intelmpi
|
|
@@ -772,7 +801,7 @@ SYSLIBS=" $OPENMP -lpthread -shared-intel -cxxlib"
|
|
# fi
|
|
if test $MPITYPE = intelmpi
|
|
then
|
|
- SYSLIBS="-L${MPI_ROOT}/lib/release -lmpi -L${MPI_ROOT}/lib -lmpifort -lrt $OPENMP -threads -lpthread -shared-intel -cxxlib"
|
|
+ SYSLIBS="-L${MPI_ROOT}/lib/release -lmpi -L${MPI_ROOT}/lib -lmpifort -lrt $OPENMP -threads -lpthread -cxxlib"
|
|
fi
|
|
|
|
if test "$ZLIB" = "ZLIB"; then
|