From eb13e30718cfc735df3ae78adc6ee6d61fcd0e65 Mon Sep 17 00:00:00 2001
From: Emeline Noel <emeline.noel@ifpen.fr>
Date: Mon, 16 Oct 2023 10:56:06 +0200
Subject: [PATCH] Compilation on ENER with MNH IFPEN env
* Update the wckey
* Remove set -x
* Use Slurm environement variable instead pwd
---
src/configure | 6 +++---
src/job_make_mesonh_ener440 | 14 ++++++++------
src/job_make_mesonh_pc_ifpen | 1 -
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/configure b/src/configure
index 045ada82c..f9b48ae32 100755
--- a/src/configure
+++ b/src/configure
@@ -519,9 +519,9 @@ export I_MPI_PIN_PROCESSOR_LIST=all:map=spread
export VER_CDF=${VER_CDF:-CDFAUTO}
export MNHENV=${MNHENV:-"
module purge
-module load iompi/2020a
-module load GCCcore/10.3.0
-module load CMake/3.20.1
+source /soft/irsrvsoft1/expl/eb/r17/$(echo el_`lsb_release -r | awk -F ":" ' {print $2}' | awk -F "." '{print $1}' | tr -d '\t'`-`uname -i`)/envs/mesonh.sh
+module load intel-compilers/2021.4.0
+export OMPI_FC=ifort
"}
;;
diff --git a/src/job_make_mesonh_ener440 b/src/job_make_mesonh_ener440
index 1c7843983..ad168e5d6 100755
--- a/src/job_make_mesonh_ener440
+++ b/src/job_make_mesonh_ener440
@@ -11,12 +11,14 @@
#SBATCH -p standard
#SBATCH -q debug
#SBATCH -J "MesoNH-compile"
-#SBATCH --wckey MPX13001 # Numero du projet
+#SBATCH --wckey MRS02001 # Numero du projet
#SBATCH -t 02:00:00
-set -x
# On va lancer la compilation dans le répertoire de lancement du job
-pwd
-#
-# Lancement du script :
-./job_make_mesonh_dev_pc_ifpen
+cd ${SLURM_SUBMIT_DIR}
+
+# Chargement du profil (qui contient le source vers l'env ifpen-mesonh)
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIAUTO-O2
+
+time gmake -j 10
+time gmake -j 1 installmaster
diff --git a/src/job_make_mesonh_pc_ifpen b/src/job_make_mesonh_pc_ifpen
index 1e77e5fd2..559c64dd8 100755
--- a/src/job_make_mesonh_pc_ifpen
+++ b/src/job_make_mesonh_pc_ifpen
@@ -4,7 +4,6 @@
#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
-set -x
# On va lancer la compilation dans le répertoire de lancement du job
pwd
--
GitLab