From 27205b9265801e229ddd2ca8dfff8c2d7e1d5083 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Tue, 5 Feb 2019 16:57:25 +0100
Subject: [PATCH] Philippe 05/02/2019: ada: use intel/2018.2 (intel/2013.1 has
problems with newunit) and Intel MPI environment (POE not compatible with
Intel from intel/2015.2)
---
src/configure | 5 ++---
src/job_make_examples_IBM_ada | 16 ++++++----------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/configure b/src/configure
index ad0fab6be..4dfbf2c9a 100755
--- a/src/configure
+++ b/src/configure
@@ -186,10 +186,9 @@ module load ga/\${VER_GA}
export MVWORK=${MVWORK:-YES}
export VER_CDF=${VER_CDF:-CDFAUTO}
export MNHENV=${MNHENV:-"
-#export OBJDIR_PATH=$WORKDIR/DIR_OBJ_ADA
-export MP_MPILIB=pempi
+#export MP_MPILIB=pempi
module purge
-module load intel/2013.1
+module load intel/2018.2
"}
;;
AIX*)
diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada
index 1dda93499..d21cac773 100755
--- a/src/job_make_examples_IBM_ada
+++ b/src/job_make_examples_IBM_ada
@@ -1,11 +1,11 @@
-#MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+#MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
# Nom arbitraire du travail LoadLeveler
# @ job_name = Sortie_examples_ada
# Type de travail
-# @ job_type = parallel
+# @ job_type = mpich
# Fichier de sortie standard du travail
# @ output = $(job_name).$(jobid)
# Fichier de sortie d'erreur du travail
@@ -14,7 +14,7 @@
# @ wall_clock_limit = 3600
# Nombre de processus demande (ici 1)
# @ total_tasks = 4
-# @ environment = $DISPLAY
+# @ environment = NB_TASKS=$(total_tasks)
# @ queue
cd $LOADL_STEP_INITDIR
@@ -26,13 +26,10 @@ set -x
#001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier
-export MONORUN="Poe -world_sizes 1 "
-export MPIRUN="Poe -world_sizes 4 "
+export MONORUN="Mpirun -np 1 "
+export MPIRUN="Mpirun -prepend-rank -np $NB_TASKS "
export POSTRUN=" echo "
-export MP_MPILIB=pempi
-export MP_LABELIO=yes
-
time make -k 001_2Drelief
time make -k 002_3Drelief
time make -k 003_KW78
@@ -48,4 +45,3 @@ make -k << EOF
EOF
#
-
--
GitLab