From 4d3affe6a575800172d14a5823fc95acbd88b4ef Mon Sep 17 00:00:00 2001
From: Gaelle Tanguy <gaelle.tanguy@meteo.fr>
Date: Mon, 29 Jun 2015 14:19:39 +0000
Subject: [PATCH] Gaelle 29/06/2015 : update to MNH-5-1-4
---
A-INSTALL | 6 +++---
src/configure | 4 ++--
src/job_make_examples_BG | 2 +-
src/job_make_examples_BGQ | 2 +-
src/job_make_examples_BullX | 2 +-
src/job_make_examples_BullX_eos | 2 +-
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 +-
23 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/A-INSTALL b/A-INSTALL
index f2c81c06a..a4035afcd 100644
--- a/A-INSTALL
+++ b/A-INSTALL
@@ -1,8 +1,8 @@
#
# Version of PACKAGE MESONH "Open distribution"
-# PACK-MNH-V5-1-3
-# DATE : 20/11/2014
-# VERSION : MESONH MASDEV5_1 + BUG-3
+# PACK-MNH-V5-1-4
+# DATE : 29/06/2015
+# VERSION : MESONH MASDEV5_1 + BUG-4
#
# MAP
#
diff --git a/src/configure b/src/configure
index f9af3ee10..3221ea81e 100755
--- a/src/configure
+++ b/src/configure
@@ -9,9 +9,9 @@ if [ "x$XYZ" = "x" ]
then
#
export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-1}
-export VERSION_BUG=${VERSION_BUG:-3}
+export VERSION_BUG=${VERSION_BUG:-4}
export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}}
-export VERSION_DATE=${VERSION_DATE:-"20/11/2014"}
+export VERSION_DATE=${VERSION_DATE:-"29/06/2015"}
export VERSION_CDF=${VERSION_CDF-"3.6.3"}
export VERSION_GRIBAPI=${VERSION_GRIBAPI-"1.9.9"}
export MNH_INT=${MNH_INT-"I4"}
diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG
index cccadd749..359ac6d9a 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-1-3-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-1-4-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 49e55e053..35c54005f 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-1-3-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-1-4-MPIAUTO-O2NAN
#. ../conf/profile_mesonh-BGQI4-MNH-V4-10-1-MPIAUTO-O2
set -x
diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX
index b8b4914fc..380dd3f6c 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-1-3-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 8d47c2f11..087efbf43 100755
--- a/src/job_make_examples_BullX_eos
+++ b/src/job_make_examples_BullX_eos
@@ -17,7 +17,7 @@ set -x
# Nom de la machine
hostname
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 "
export POSTRUN="time "
diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca
index ad8fda341..71c274ee5 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-1-3-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-1-4-MPICRAY-O2
export MONORUN="aprun -n 1 "
diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada
index 4b9bc0838..ae30bf4c0 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-1-3-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 69a2b5b63..cc2a07039 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-1-3-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64-MNH-V5-1-4-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 82db44127..0ab6654a0 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-1-3-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-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 39675242b..1b6962ad3 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-1-3-MPIAUTO-O2
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-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 69ea510ec..817689d1d 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-1-3-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-4-MPIAUTO-O2
ulimit -c 0 # pas de core
diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG
index c29c6fd12..177a1a513 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-1-3-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-1-4-MPIAUTO-O2
#time gmake
time gmake -r -j8
diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ
index 3e310f06a..34f3d56ae 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-1-3-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-1-4-MPIAUTO-O2NAN
case $LOADL_STEP_NAME in
diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX
index 62b67f611..7923416e7 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-1-3-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 3cf2b0769..a1c17faa8 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-1-3-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-1-4-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 92e830889..113a64428 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-1-3-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 c132d8e40..a9533fd92 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-1-3-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-4-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 e3ad9d065..5bca938b6 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-1-3-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-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 ae124aaff..7fb453b71 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-1-3-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-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 b16768573..e6eeca5f1 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-1-3-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-4-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 e81a205d2..b46512acc 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-1-3-${VER_USER}-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-${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 d589fde45..eb327fc7a 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-1-3-${VER_USER}-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-${VER_USER}-MPIAUTO-O4
time gmake user
time gmake -j 1 installuser
--
GitLab