From 4a4166cda5d8e684492583be28575f876fe9376a Mon Sep 17 00:00:00 2001
From: Juan Escobar <escj@aero.obs-mip.fr>
Date: Thu, 24 Nov 2016 17:56:33 +0100
Subject: [PATCH] Juan 24/11/2016: job_{} , upgrade to MNH-5-2-2
---
src/job_make_examples_BG | 2 +-
src/job_make_examples_BGQ | 2 +-
src/job_make_examples_BullX | 2 +-
src/job_make_examples_BullX_eos | 10 +++++-----
src/job_make_examples_CRAY_cca | 2 +-
src/job_make_examples_IBM_ada | 2 +-
src/job_make_examples_IBM_sp6_vargas | 2 +-
src/job_make_examples_NEC_SX8 | 2 +-
src/job_make_examples_SX8 | 2 +-
src/job_make_examples_cxa | 2 +-
src/job_make_mesonh_BG | 2 +-
src/job_make_mesonh_BGQ | 2 +-
src/job_make_mesonh_BullX | 2 +-
src/job_make_mesonh_CRAY_cca | 2 +-
src/job_make_mesonh_IBM_ada | 2 +-
src/job_make_mesonh_IBM_sp6_vargas | 2 +-
src/job_make_mesonh_MFSX8 | 2 +-
src/job_make_mesonh_NEC_SX8 | 2 +-
src/job_make_mesonh_cxa | 2 +-
src/job_make_mesonh_user_BullX | 2 +-
src/job_make_mesonh_user_MFSX8 | 2 +-
21 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG
index 9ac36da06..9c4c9faee 100755
--- a/src/job_make_examples_BG
+++ b/src/job_make_examples_BG
@@ -18,7 +18,7 @@
set -x
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-BGI4-MNH-V5-2-1-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-2-2-MPIAUTO-O2
#001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier
diff --git a/src/job_make_examples_BGQ b/src/job_make_examples_BGQ
index 685ebfdf7..786b5a6b1 100755
--- a/src/job_make_examples_BGQ
+++ b/src/job_make_examples_BGQ
@@ -18,7 +18,7 @@
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-BGQI4-MNH-V5-2-1-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-2-2-MPIAUTO-O2NAN
set -x
diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX
index ea6a5341d..b81f2d5eb 100755
--- a/src/job_make_examples_BullX
+++ b/src/job_make_examples_BullX
@@ -19,7 +19,7 @@ set -e
# Nom de la machine
hostname
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O3
export MONORUN="mpirun -np 1 "
export MPIRUN="mpirun -np 2 "
export POSTRUN="time "
diff --git a/src/job_make_examples_BullX_eos b/src/job_make_examples_BullX_eos
index dd2ac760b..49d7de232 100755
--- a/src/job_make_examples_BullX_eos
+++ b/src/job_make_examples_BullX_eos
@@ -1,12 +1,12 @@
#!/bin/bash
#SBATCH -J Examples
-#SBATCH -N 1 # nodes number
+#SBATCH -N 2 # nodes number
#SBATCH -n 4 # CPUs number (on all nodes)
#SBATCH --exclusive
#SBATCH -o Examples.eo%j #
#SBATCH -e Examples.eo%j #
#SBATCH -t 01:00:00 # time limit
-##SBATCH --export=NONE
+#SBATCH --export=NONE
# Echo des commandes
ulimit -c 0
@@ -17,9 +17,9 @@ set -x
# Nom de la machine
hostname
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O2
-export MONORUN="mpirun -genv I_MPI_PIN_PROCESSOR_LIST=all:map=spread -prepend-rank -np 1 "
-export MPIRUN="mpirun -genv I_MPI_PIN_PROCESSOR_LIST=all:map=spread -prepend-rank -np 4 "
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O2
+export MONORUN="mpirun -prepend-rank -np 1 "
+export MPIRUN="mpirun -prepend-rank -np 4 "
export POSTRUN="time "
cd $SRC_MESONH/MY_RUN/KTEST/003_KW78
diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca
index 7f1842d18..643008d76 100755
--- a/src/job_make_examples_CRAY_cca
+++ b/src/job_make_examples_CRAY_cca
@@ -27,7 +27,7 @@ cd ${PBS_O_WORKDIR}
#ARCH=LXifort
ARCH=LXcray
-. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-1-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-2-MPICRAY-O2
export MONORUN="aprun -n 1 "
diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada
index 67746ffdc..658353f2d 100755
--- a/src/job_make_examples_IBM_ada
+++ b/src/job_make_examples_IBM_ada
@@ -19,7 +19,7 @@
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O2
# Pour avoir l'echo des commandes
set -x
diff --git a/src/job_make_examples_IBM_sp6_vargas b/src/job_make_examples_IBM_sp6_vargas
index 59c7b3bee..53f28625b 100755
--- a/src/job_make_examples_IBM_sp6_vargas
+++ b/src/job_make_examples_IBM_sp6_vargas
@@ -24,7 +24,7 @@
set -x
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-AIX64-MNH-V5-2-1-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64-MNH-V5-2-2-MPIAUTO-O2
#001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier
diff --git a/src/job_make_examples_NEC_SX8 b/src/job_make_examples_NEC_SX8
index eba96f246..79d2685e0 100755
--- a/src/job_make_examples_NEC_SX8
+++ b/src/job_make_examples_NEC_SX8
@@ -18,7 +18,7 @@ hostname
[ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR
#
-. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-MPIAUTO-O4
export MONORUN="Mpirun -np 1 "
export MPIRUN="Mpirun -np 2 "
diff --git a/src/job_make_examples_SX8 b/src/job_make_examples_SX8
index 2b4a069b5..270a09450 100755
--- a/src/job_make_examples_SX8
+++ b/src/job_make_examples_SX8
@@ -19,7 +19,7 @@ hostname
[ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR
#
-. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O2
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-MPIAUTO-O2
export MONORUN="Mpirun -np 1 "
export MPIRUN="Mpirun -np 2 "
diff --git a/src/job_make_examples_cxa b/src/job_make_examples_cxa
index 706d988e5..913e2cab0 100755
--- a/src/job_make_examples_cxa
+++ b/src/job_make_examples_cxa
@@ -34,7 +34,7 @@ echo SHELL=$SHELL
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-2-MPIAUTO-O2
ulimit -c 0 # pas de core
diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG
index 864461709..ae0cb1ec3 100755
--- a/src/job_make_mesonh_BG
+++ b/src/job_make_mesonh_BG
@@ -18,7 +18,7 @@
set -x
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-BGI4-MNH-V5-2-1-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-2-2-MPIAUTO-O2
#time gmake
time gmake -r -j8
diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ
index e213ca131..7e1686962 100755
--- a/src/job_make_mesonh_BGQ
+++ b/src/job_make_mesonh_BGQ
@@ -34,7 +34,7 @@ set -x
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-BGQI4-MNH-V5-2-1-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-2-2-MPIAUTO-O2NAN
case $LOADL_STEP_NAME in
diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX
index fd375e56b..cbd22bab8 100755
--- a/src/job_make_mesonh_BullX
+++ b/src/job_make_mesonh_BullX
@@ -19,7 +19,7 @@ set -x
# On va lancer la compilation dans le répertoire de lancement du job
pwd
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O3
time gmake -j 4
time gmake -j 1 installmaster
diff --git a/src/job_make_mesonh_CRAY_cca b/src/job_make_mesonh_CRAY_cca
index 77af67e2e..f37bccce1 100755
--- a/src/job_make_mesonh_CRAY_cca
+++ b/src/job_make_mesonh_CRAY_cca
@@ -21,7 +21,7 @@ pwd
#ARCH=LXifort
ARCH=LXcray
-. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-1-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-2-MPICRAY-O2
time gmake -j 4 2>&1 | tee sortie_compile_cray.$$
diff --git a/src/job_make_mesonh_IBM_ada b/src/job_make_mesonh_IBM_ada
index 118d7dfda..51c678ff9 100755
--- a/src/job_make_mesonh_IBM_ada
+++ b/src/job_make_mesonh_IBM_ada
@@ -16,7 +16,7 @@
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O2
# Pour avoir l'echo des commandes
set -x
diff --git a/src/job_make_mesonh_IBM_sp6_vargas b/src/job_make_mesonh_IBM_sp6_vargas
index 8c77dbacc..4b7d25ed3 100755
--- a/src/job_make_mesonh_IBM_sp6_vargas
+++ b/src/job_make_mesonh_IBM_sp6_vargas
@@ -24,7 +24,7 @@
set -x
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-2-MPIAUTO-O2
time gmake -j1 gribapi
time gmake -r -j8
diff --git a/src/job_make_mesonh_MFSX8 b/src/job_make_mesonh_MFSX8
index f939d6fba..8728a6d5e 100644
--- a/src/job_make_mesonh_MFSX8
+++ b/src/job_make_mesonh_MFSX8
@@ -12,7 +12,7 @@ set -x
# On va lancer la compilation dans le répertoire de lancement du job
[ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR}
-. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-MPIAUTO-O4
time gmake -j 4 ########## compile on four processors to speedup the compilation
time gmake -j 1 installmaster
diff --git a/src/job_make_mesonh_NEC_SX8 b/src/job_make_mesonh_NEC_SX8
index e70939fda..72a8dcfb2 100755
--- a/src/job_make_mesonh_NEC_SX8
+++ b/src/job_make_mesonh_NEC_SX8
@@ -11,7 +11,7 @@ set -x
# On va lancer la compilation dans le répertoire de lancement du job
[ $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR
-. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-MPIAUTO-O4
time gmake -j 4
time gmake -j 4 # some time problem with first pass in parallel compilation
diff --git a/src/job_make_mesonh_cxa b/src/job_make_mesonh_cxa
index 1fbebd06a..71c545f3f 100755
--- a/src/job_make_mesonh_cxa
+++ b/src/job_make_mesonh_cxa
@@ -27,7 +27,7 @@
set -x
cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-2-MPIAUTO-O2
time gmake -r -j1
time gmake installmaster
diff --git a/src/job_make_mesonh_user_BullX b/src/job_make_mesonh_user_BullX
index 4ae34bfe4..903ddaf8c 100755
--- a/src/job_make_mesonh_user_BullX
+++ b/src/job_make_mesonh_user_BullX
@@ -19,7 +19,7 @@ export VER_USER= ########## Your own USER Directory
set -x
# On va lancer la compilation dans le répertoire de lancement du job
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-${VER_USER}-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-${VER_USER}-MPIINTEL-O3
time gmake user
time gmake -j 1 installuser
diff --git a/src/job_make_mesonh_user_MFSX8 b/src/job_make_mesonh_user_MFSX8
index bf7c6f37b..604d91a1b 100644
--- a/src/job_make_mesonh_user_MFSX8
+++ b/src/job_make_mesonh_user_MFSX8
@@ -14,7 +14,7 @@ set -x
[ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR}
-. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-${VER_USER}-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-${VER_USER}-MPIAUTO-O4
time gmake user
time gmake -j 1 installuser
--
GitLab