From 2cfcac67ce3a47873b56209b4e7d84ce9fca9eaf Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 20 Oct 2023 23:29:09 +0200 Subject: [PATCH] updated to 2023.3 --- install/MarcMentat/2023.3/Marc_tools/include_linux64.patch | 6 +++--- install/MarcMentat/2023.3/Marc_tools/run_damask_hmp.patch | 2 +- install/MarcMentat/2023.3/Marc_tools/run_damask_lmp.patch | 2 +- install/MarcMentat/2023.3/Marc_tools/run_damask_mp.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/MarcMentat/2023.3/Marc_tools/include_linux64.patch b/install/MarcMentat/2023.3/Marc_tools/include_linux64.patch index f9646b240..de6d9b609 100644 --- a/install/MarcMentat/2023.3/Marc_tools/include_linux64.patch +++ b/install/MarcMentat/2023.3/Marc_tools/include_linux64.patch @@ -49,15 +49,15 @@ + +# 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=2023.2 -DDAMASKVERSION=$DAMASKVERSION \ ++ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMARC4DAMASK=2023.3 -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=2023.2 -DDAMASKVERSION=$DAMASKVERSION \ ++ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMARC4DAMASK=2023.3 -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=2023.2 -DDAMASKVERSION=$DAMASKVERSION \ ++ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMARC4DAMASK=2023.3 -DDAMASKVERSION=$DAMASKVERSION \ + -qopenmp -qopenmp-threadprivate=compat\ + $MUMPS_INCLUDE $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS -I$KDTREE2_MOD -I$MARC_MOD" + diff --git a/install/MarcMentat/2023.3/Marc_tools/run_damask_hmp.patch b/install/MarcMentat/2023.3/Marc_tools/run_damask_hmp.patch index f05c41969..9e6e17d6d 100644 --- a/install/MarcMentat/2023.3/Marc_tools/run_damask_hmp.patch +++ b/install/MarcMentat/2023.3/Marc_tools/run_damask_hmp.patch @@ -6,7 +6,7 @@ ############################################################################## +# remove all Mentat paths from LD_LIBRARY_PATH +LD_LIBRARY_PATH=:$LD_LIBRARY_PATH: -+LD_LIBRARY_PATH=${LD_LIBRARY_PATH//+([!(:)])mentat2023.2+([!(:)])/:} ++LD_LIBRARY_PATH=${LD_LIBRARY_PATH//+([!(:)])mentat2023.3+([!(:)])/:} +LD_LIBRARY_PATH=${LD_LIBRARY_PATH//+([(:)])/:} +LD_LIBRARY_PATH=${LD_LIBRARY_PATH#:}; LD_LIBRARY_PATH=${LD_LIBRARY_PATH%:} # set DIR to the directory in which this script is diff --git a/install/MarcMentat/2023.3/Marc_tools/run_damask_lmp.patch b/install/MarcMentat/2023.3/Marc_tools/run_damask_lmp.patch index 5ff268524..f2c03a921 100644 --- a/install/MarcMentat/2023.3/Marc_tools/run_damask_lmp.patch +++ b/install/MarcMentat/2023.3/Marc_tools/run_damask_lmp.patch @@ -6,7 +6,7 @@ ############################################################################## +# remove all Mentat paths from LD_LIBRARY_PATH +LD_LIBRARY_PATH=:$LD_LIBRARY_PATH: -+LD_LIBRARY_PATH=${LD_LIBRARY_PATH//+([!(:)])mentat2023.2+([!(:)])/:} ++LD_LIBRARY_PATH=${LD_LIBRARY_PATH//+([!(:)])mentat2023.3+([!(:)])/:} +LD_LIBRARY_PATH=${LD_LIBRARY_PATH//+([(:)])/:} +LD_LIBRARY_PATH=${LD_LIBRARY_PATH#:}; LD_LIBRARY_PATH=${LD_LIBRARY_PATH%:} # set DIR to the directory in which this script is diff --git a/install/MarcMentat/2023.3/Marc_tools/run_damask_mp.patch b/install/MarcMentat/2023.3/Marc_tools/run_damask_mp.patch index 579952b1f..6cf3c9ac8 100644 --- a/install/MarcMentat/2023.3/Marc_tools/run_damask_mp.patch +++ b/install/MarcMentat/2023.3/Marc_tools/run_damask_mp.patch @@ -6,7 +6,7 @@ ############################################################################## +# remove all Mentat paths from LD_LIBRARY_PATH +LD_LIBRARY_PATH=:$LD_LIBRARY_PATH: -+LD_LIBRARY_PATH=${LD_LIBRARY_PATH//+([!(:)])mentat2023.2+([!(:)])/:} ++LD_LIBRARY_PATH=${LD_LIBRARY_PATH//+([!(:)])mentat2023.3+([!(:)])/:} +LD_LIBRARY_PATH=${LD_LIBRARY_PATH//+([(:)])/:} +LD_LIBRARY_PATH=${LD_LIBRARY_PATH#:}; LD_LIBRARY_PATH=${LD_LIBRARY_PATH%:} # set DIR to the directory in which this script is