From f14218a15ce8a337272d94d60f9aa081e9479aaa Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Tue, 31 Oct 2017 14:01:10 +0100
Subject: [PATCH] Philippe 31/10/2017: change version number to 5.4.0
(cherry picked from commit 4691b211ccefc9cf2a58c37986a1f76c25526cdb)
---
src/MNH/version.f90 | 6 +++---
src/configure | 6 +++---
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_BullX_occigen | 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 +-
24 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/MNH/version.f90 b/src/MNH/version.f90
index e481c29b4..1d0e9fd6f 100644
--- a/src/MNH/version.f90
+++ b/src/MNH/version.f90
@@ -43,10 +43,10 @@ USE MODD_CONF, ONLY : NMNHVERSION,NMASDEV,NBUGFIX,CBIBUSER
IMPLICIT NONE
!
NMNHVERSION(1)=5
-NMNHVERSION(2)=3
+NMNHVERSION(2)=4
NMNHVERSION(3)=0
-NMASDEV=53
-NBUGFIX=1
+NMASDEV=54
+NBUGFIX=0
CBIBUSER=''
!
END SUBROUTINE VERSION
diff --git a/src/configure b/src/configure
index 573a10979..651f447c2 100755
--- a/src/configure
+++ b/src/configure
@@ -8,10 +8,10 @@
if [ "x$XYZ" = "x" ]
then
#
-export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-3}
-export VERSION_BUG=${VERSION_BUG:-1}
+export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-4}
+export VERSION_BUG=${VERSION_BUG:-0}
export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}}
-export VERSION_DATE=${VERSION_DATE:-"25/09/2017"}
+export VERSION_DATE=${VERSION_DATE:-"dd/mm/yyyy"}
export VERSION_CDF=${VERSION_CDF:-"4.1.3"}
export VERSION_HDF=${VERSION_HDF:-"1.8.9"}
export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.13.1"}
diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG
index 087160994..b1dd036a5 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-3-1-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-4-0-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 b13b19fce..a3fe0a241 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-3-1-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-4-0-MPIAUTO-O2NAN
set -x
diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX
index 55ff4e051..020a5202b 100755
--- a/src/job_make_examples_BullX
+++ b/src/job_make_examples_BullX
@@ -19,7 +19,7 @@ set -e
hostname
# Echo des commandes
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-0-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 3245993d4..07b292505 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-3-1-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-0-MPIINTEL-O2
export MONORUN="mpirun -prepend-rank -np 1 "
export MPIRUN="mpirun -prepend-rank -np 4 "
export POSTRUN="time "
diff --git a/src/job_make_examples_BullX_occigen b/src/job_make_examples_BullX_occigen
index 4450321fa..90d743b65 100755
--- a/src/job_make_examples_BullX_occigen
+++ b/src/job_make_examples_BullX_occigen
@@ -18,7 +18,7 @@ set -x
# Nom de la machine
hostname
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-0-MPIINTEL-O2
export MONORUN="Mpirun -prepend-rank -np 1 "
export MPIRUN="Mpirun -prepend-rank -np 4 "
export POSTRUN="time "
diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca
index e0f0f624a..f114d0752 100755
--- a/src/job_make_examples_CRAY_cca
+++ b/src/job_make_examples_CRAY_cca
@@ -28,7 +28,7 @@ cd ${PBS_O_WORKDIR}
ARCH=LXifort
#ARCH=LXcray
-. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-3-1-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-4-0-MPICRAY-O2
export MONORUN="aprun -n 1 "
diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada
index cf6307fbf..c3b055a84 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-3-1-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-0-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 68ff3bf5f..5d1a72e84 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-3-1-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64-MNH-V5-4-0-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 1d346f595..f64cf52f4 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-3-1-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-4-0-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 9285303aa..0e2278a9e 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-3-1-MPIAUTO-O2
+. ../conf/profile_mesonh-SX8I4-MNH-V5-4-0-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 598e3bb48..9ffbadb55 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-3-1-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-4-0-MPIAUTO-O2
ulimit -c 0 # pas de core
diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG
index e36de00b4..bbdcab851 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-3-1-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-4-0-MPIAUTO-O2
#time gmake
time gmake -r -j8
diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ
index 858fcd81f..673816492 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-3-1-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-4-0-MPIAUTO-O2NAN
case $LOADL_STEP_NAME in
diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX
index ebd24bd43..dce35637e 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-3-1-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-0-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 b09164a21..f713d6d32 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-3-1-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-4-0-MPICRAY-O2
time gmake -j 4 2>&1 | tee sortie_compile_${ARCH}.$$
time gmake -j 4 2>&1 | tee sortie_compile_${ARCH}2.$$
diff --git a/src/job_make_mesonh_IBM_ada b/src/job_make_mesonh_IBM_ada
index 6877a607f..3bb178192 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-3-1-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-0-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 5564f5e7b..578a0dd5d 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-3-1-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-4-0-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 3b46451a0..7d218bfa1 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-3-1-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-4-0-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 bf37d27e7..92dce58f1 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-3-1-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-4-0-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 e7ef6e99d..f23c58451 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-3-1-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-4-0-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 2614c0dfa..c029ce2f7 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-3-1-${VER_USER}-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-0-${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 f1bcda4a7..00186c347 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-3-1-${VER_USER}-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-4-0-${VER_USER}-MPIAUTO-O4
time gmake user
time gmake -j 1 installuser
--
GitLab