From d7491facc3b094a06bbbcef450ab78b922537803 Mon Sep 17 00:00:00 2001
From: Gaelle Tanguy <gaelle.tanguy@meteo.fr>
Date: Mon, 2 May 2016 12:49:40 +0000
Subject: [PATCH] Gaelle 2/5/2016 upgrade to MNH-521
---
src/configure | 14 ++++++++++++++
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 +-
22 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/src/configure b/src/configure
index 571f98e04..6cc84dbb9 100755
--- a/src/configure
+++ b/src/configure
@@ -81,6 +81,20 @@ module rm intelmpi ; module load intelmpi/4.1.1.036 ;
module rm netcdf ; module load netcdf/4.3.0 ;
module rm grib_api ; module load grib_api/1.13.0_netcdf ;
export GRIBAPI_PATH=/opt/softs/libraries/ICC13.1.4.183/grib_api-1.13.0_netcdf
+"}
+ ;;
+'Linux prolix'*)
+ export ARCH=${ARCH:-LXifort}
+ export VER_MPI=${VER_MPI:-MPIINTEL}
+ export OPTLEVEL=${OPTLEVEL:-O3}
+ export MVWORK=${MVWORK:-NO}
+ export VER_CDF=${VER_CDF:-CDFBFIX}
+ export MNHENV=${MNHENV:-"
+module rm intel ; module load intel/13.1.4.183 ;
+module rm intelmpi ; module load intelmpi/5.1.2.150 ;
+module rm netcdf ; module load netcdf/4.3.0 ;
+module rm grib_api ; module load grib_api/1.13.0_netcdf ;
+export GRIBAPI_PATH=/opt/softs/libraries/ICC13.1.4.183/grib_api-1.13.0_netcdf
"}
;;
'Linux login0'*|'Linux compute'*)
diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG
index 3fd603f0e..9ac36da06 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-0-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-2-1-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 860a30b77..685ebfdf7 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-0-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-2-1-MPIAUTO-O2NAN
set -x
diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX
index d2bdb0f46..ea6a5341d 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-0-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-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 17cb1a86d..dd2ac760b 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-2-0-MPIINTEL-O2
+. ../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 "
export POSTRUN="time "
diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca
index 08fe6a6e9..7f1842d18 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-0-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-1-MPICRAY-O2
export MONORUN="aprun -n 1 "
diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada
index 8fe79d890..67746ffdc 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-0-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-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 faf300089..59c7b3bee 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-0-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64-MNH-V5-2-1-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 d70df4f6d..eba96f246 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-0-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-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 20a2ef89e..2b4a069b5 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-0-MPIAUTO-O2
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-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 a27eedd34..706d988e5 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-0-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2
ulimit -c 0 # pas de core
diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG
index aaf2a7a17..864461709 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-0-MPIAUTO-O2
+. ../conf/profile_mesonh-BGI4-MNH-V5-2-1-MPIAUTO-O2
#time gmake
time gmake -r -j8
diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ
index f59cec7c1..e213ca131 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-0-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-2-1-MPIAUTO-O2NAN
case $LOADL_STEP_NAME in
diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX
index 2abf063a1..fd375e56b 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-0-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-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 b43b9b691..77af67e2e 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-0-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-1-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 1dd844dd4..118d7dfda 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-0-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-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 1e6d79440..8c77dbacc 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-0-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-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 fbddf35d6..f939d6fba 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-0-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-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 be68eaa2d..e70939fda 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-0-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-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 15cd6c2cf..1fbebd06a 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-0-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-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 4cbf6690d..4ae34bfe4 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-0-${VER_USER}-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-${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 9c6c5d3b3..bf7c6f37b 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-0-${VER_USER}-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-${VER_USER}-MPIAUTO-O4
time gmake user
time gmake -j 1 installuser
--
GitLab