From 3ce8d9530668fa476c10556019ba4794b620fa33 Mon Sep 17 00:00:00 2001
From: Juan Escobar <juan.escobar@aero.obs-mip.fr>
Date: Fri, 3 Feb 2017 15:07:22 +0100
Subject: [PATCH] Juan 3/02/2017:configure, for CINES/OCCIGEN upgrade to
intel+intelmpi/17.0
---
src/configure | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/configure b/src/configure
index 8f6ce9317..307287196 100755
--- a/src/configure
+++ b/src/configure
@@ -36,6 +36,19 @@ cd ${LOCAL}/conf
TARG=$(uname -s -n)
#
case "$TARG" in
+'Linux'*'occigen'*)
+ export ARCH=${ARCH:-LXifort}
+ export VER_MPI=${VER_MPI:-MPIINTEL}
+ export OPTLEVEL=${OPTLEVEL:-O2}
+ export VER_CDF=${VER_CDF:-CDFAUTO}
+ export MNHENV=${MNHENV:-"
+ulimit -s unlimited
+module purge
+module load intel/17.0 intelmpi/2017.0.098
+export SLURM_CPU_BIND=none
+export I_MPI_PIN_PROCESSOR_LIST=all:map=spread
+"}
+ ;;
'Linux service'*)
export ARCH=${ARCH:-LXifort}
export VER_MPI=${VER_MPI:-MPIICE}
@@ -267,20 +280,6 @@ export I_MPI_PIN_PROCESSOR_LIST=all:map=spread
"}
;;
-'Linux occigen'*)
- export ARCH=${ARCH:-LXifort}
- export VER_MPI=${VER_MPI:-MPIINTEL}
- export OPTLEVEL=${OPTLEVEL:-O2}
- export VER_CDF=${VER_CDF:-CDFAUTO}
- export MNHENV=${MNHENV:-"
-ulimit -s unlimited
-module load intel/15.0.3.187
-module load intelmpi/5.0.1.035
-export SLURM_CPU_BIND=none
-export I_MPI_PIN_PROCESSOR_LIST=all:map=spread
-"}
- ;;
-
Linux*)
export ARCH=${ARCH:-LXgfortran}
export VER_MPI=${VER_MPI:-MPIVIDE}
--
GitLab