From 961e6acf6e3d746d71a646fde746dd2b2dc251cd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 12 May 2022 16:56:12 +0200 Subject: [PATCH] not needed anymore --- install/MarcMentat/2021.3.1/Marc_tools/include_linux64.patch | 1 + install/MarcMentat/2022.1/Marc_tools/include_linux64.patch | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/MarcMentat/2021.3.1/Marc_tools/include_linux64.patch b/install/MarcMentat/2021.3.1/Marc_tools/include_linux64.patch index f0276bb62..5d78b22f8 100644 --- a/install/MarcMentat/2021.3.1/Marc_tools/include_linux64.patch +++ b/install/MarcMentat/2021.3.1/Marc_tools/include_linux64.patch @@ -21,6 +21,7 @@ I8DEFINES="-DI64" I8CDEFINES="-U_DOUBLE -D_SINGLE" fi + @@ -556,7 +561,7 @@ then PROFILE=" $PROFILE -pg" fi diff --git a/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch b/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch index d16e21403..8cf6d2113 100644 --- a/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch +++ b/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch @@ -7,7 +7,7 @@ +# DAMASK uses the HDF5 compiler wrapper around the Intel compiler +H5FC="$(h5fc -shlib -show)" +HDF5_LIB=${H5FC//ifort/} -+FCOMP="$H5FC -DDAMASK_HDF5" ++FCOMP="$H5FC" + # AEM if test "$MARCDLLOUTDIR" = ""; then @@ -17,9 +17,8 @@ I8CDEFINES= else - I8FFLAGS="-i8" -- I8DEFINES="-DI64" + I8FFLAGS="-i8 -integer-size 64" -+ I8DEFINES="-DI64 -DINT=8" + I8DEFINES="-DI64" I8CDEFINES="-U_DOUBLE -D_SINGLE" fi