From 31b72f310b8d15d19bea9bde107765dc7cd6b67d Mon Sep 17 00:00:00 2001
From: Juan Escobar <escj@aero.obs-mip.fr>
Date: Mon, 12 Dec 2016 14:16:19 +0000
Subject: [PATCH] Juan 12/12/2016: configure, for ECMWF , switch by default to
 new ifort compiler, old cray cdt/1.15_8.2.7 in 2nd choose

---
 src/configure | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/configure b/src/configure
index 71b5c3b52..bcfd3654f 100755
--- a/src/configure
+++ b/src/configure
@@ -193,7 +193,7 @@ export LIB_GRIBAPI='${GRIB_API_LIB}'
               ;;
 'Linux cc'*) # ECMWF Cray plateforme
                 export MNH_ARCH=`echo $ARCH | grep LX`
-                export     ARCH=${MNH_ARCH:-LXcray}
+                export     ARCH=${MNH_ARCH:-LXifort}
                 export  VER_MPI=${VER_MPI:-MPICRAY}
                 export OPTLEVEL=${OPTLEVEL:-O2}
                 export MVWORK=${MVWORK:-NO}
@@ -203,14 +203,20 @@ export LIB_GRIBAPI='${GRIB_API_LIB}'
                 export MNHENV=${MNHENV:-"
 . /opt/modules/default/init/bash
 module rm grib_api
+module rm craype-broadwell
+export CRAY_CPU_TARGET=ivybridge
+module swap cdt/1.15_8.2.7
+module use /opt/cray/craype/default/modulefiles
 "}
                 else
                 if [ "${ARCH}" == "LXifort" ]
                 then
                 export MNHENV=${MNHENV:-"
 . /opt/modules/default/init/bash
-module switch PrgEnv-cray PrgEnv-intel
 module rm grib_api
+prgenvswitchto intel
+module rm intel
+module load intel/16.0.3.210
 "}
                 fi
                 fi
-- 
GitLab