Philippe 31/10/2017: change version number to 5.4.0

(cherry picked from commit 4691b211)

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

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"}

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

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
 

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 "

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 "

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 "

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 "

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

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

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 "

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 "

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
 

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

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
 

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

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.$$

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

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

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