From 9478f0693196dd79c5c7a01df78d8be49fad5028 Mon Sep 17 00:00:00 2001
From: Gaelle Tanguy <gaelle.tanguy@meteo.fr>
Date: Thu, 20 Nov 2014 10:23:48 +0000
Subject: [PATCH] G.Delautier 20/11/2014 : passage version 5-1-3
---
src/MNH/version.f90 | 2 +-
src/configure | 2 +-
src/job_make_examples_BG | 2 +-
src/job_make_examples_BGQ | 2 +-
src/job_make_examples_BullX | 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_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 +-
20 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/MNH/version.f90 b/src/MNH/version.f90
index 3fc34e772..e2a61ef58 100644
--- a/src/MNH/version.f90
+++ b/src/MNH/version.f90
@@ -43,7 +43,7 @@ USE MODD_CONF, ONLY : NMASDEV,NBUGFIX,CBIBUSER
IMPLICIT NONE
!
NMASDEV=51
-NBUGFIX=2
+NBUGFIX=3
CBIBUSER=''
!
END SUBROUTINE VERSION
diff --git a/src/configure b/src/configure
index 6c058ce86..bddd13801 100755
--- a/src/configure
+++ b/src/configure
@@ -11,7 +11,7 @@ then
export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-1}
export VERSION_BUG=${VERSION_BUG:-3}
export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}}
-export VERSION_DATE=${VERSION_DATE:-"22/05/2014"}
+export VERSION_DATE=${VERSION_DATE:-"20/11/2014"}
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 4c5430b84..cccadd749 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-1-3-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 3a44a3058..49e55e053 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-2-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-1-3-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 0d2b8c870..b8b4914fc 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-2-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-MPIINTEL-O3
export MONORUN="mpirun -np 1 "
export MPIRUN="mpirun -np 2 "
export POSTRUN="time "
diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada
index 97e3e689b..4b9bc0838 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-2-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-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 68cc94e8b..69a2b5b63 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64-MNH-V5-1-3-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 650dd94b8..82db44127 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-2-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-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 b4a82a654..39675242b 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-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 e8ab2ef60..69ea510ec 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-3-MPIAUTO-O2
ulimit -c 0 # pas de core
diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG
index 531dab03f..c29c6fd12 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-1-3-MPIAUTO-O2
#time gmake
time gmake -r -j8
diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ
index 6a3729707..f9d5c1570 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-2-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-1-3-MPIAUTO-O2NAN
case $LOADL_STEP_NAME in
diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX
index b010777e8..62b67f611 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-2-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-MPIINTEL-O3
time gmake -j 4
time gmake -j 1 installmaster
diff --git a/src/job_make_mesonh_IBM_ada b/src/job_make_mesonh_IBM_ada
index 9988db6ae..92e830889 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-2-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-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 bf47949d5..c132d8e40 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-3-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 9d048e1a3..e3ad9d065 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-2-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-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 0dbb30fcc..ae124aaff 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-2-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-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 6b22c4e6b..b16768573 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-3-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 757dbcaf8..e81a205d2 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-2-${VER_USER}-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-${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 6ba85423d..d589fde45 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-2-${VER_USER}-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-${VER_USER}-MPIAUTO-O4
time gmake user
time gmake -j 1 installuser
--
GitLab