From 6ed08db0acc684867b7ecac49925eb2ceeacae0f Mon Sep 17 00:00:00 2001
From: Juan Escobar <escj@aero.obs-mip.fr>
Date: Wed, 20 Sep 2023 15:03:57 +0200
Subject: [PATCH] Juan 20/09/2023: profile_mesonh.ihm/configure, Irene/TGCC ,
manage problem with eccode quota excedeed & muli-group -> add new XYZM=XYZ
master version
---
conf/profile_mesonh.ihm | 1 +
src/configure | 14 ++++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/conf/profile_mesonh.ihm b/conf/profile_mesonh.ihm
index 5dd42a093..2dd85d9d8 100755
--- a/conf/profile_mesonh.ihm
+++ b/conf/profile_mesonh.ihm
@@ -148,6 +148,7 @@ fi
##########################################################
#
export XYZ="-\${ARCH}-R\${MNH_REAL}I\${MNH_INT}-\${VERSION_XYZ}\${MNH_ECRAD:+-ECRAD${VER_ECRAD}}\${MNH_FOREFIRE:+-FF}\${VER_USER:+-\${VER_USER}}-\${VER_MPI}-\${OPTLEVEL}"
+export XYZM="-\${ARCH}-R\${MNH_REAL}I\${MNH_INT}-\${VERSION_XYZ}\${MNH_ECRAD:+-ECRAD${VER_ECRAD}}\${MNH_FOREFIRE:+-FF}-\${VER_MPI}-\${OPTLEVEL}"
#[ "x\${VER_USER}" != "x" ] && export XYZ="\${XYZ}-\${VER_USER}"
# PATH to find tools like "makegen, etc ..."
export BIN_TOOLS=${BIN_TOOLS}
diff --git a/src/configure b/src/configure
index da1adb309..9b2e87269 100755
--- a/src/configure
+++ b/src/configure
@@ -218,10 +218,13 @@ export MPI_DSM_CPULIST=0-7:allhosts
export VER_CDF=${VER_CDF:-CDFAUTO}
export MNHENV=${MNHENV:-"
module purge
-module load cmake/3.18.1
-module load inteloneapi/21.4.0
+module load cmake/3.26.4
+module load inteloneapi/23.1.0
module load mpi/openmpi/4.1.4
export SLURM_CPU_BIND=none
+
+export DIR_ECCODES_INSTALL=\${CCCWORKDIR}/ECCODES-2.18.0\${XYZM}
+
"}
;;
*AMD*) # Irene AMD core
@@ -234,10 +237,13 @@ export SLURM_CPU_BIND=none
export VERSION_XYZ="${VERSION_XYZ}-AMD"
export MNHENV=${MNHENV:-"
module purge
-module load cmake/3.18.1
-module load inteloneapi/21.4.0
+module load cmake/3.26.4
+module load inteloneapi/23.1.0
module load mpi/openmpi/4.1.4
export SLURM_CPU_BIND=none
+
+export DIR_ECCODES_INSTALL=\${CCCWORKDIR}/ECCODES-2.18.0\${XYZM}
+
# Set some openmpi variable for pb with nb of cores >> 1024
export OMPI_MCA_coll_hcoll_enable=0
export HCOLL_ENABLE_MCAST_ALL=0
--
GitLab