diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk index ed7d4b9e6f471cf0145bd82a06284134c0b037f3..1fbd6578c079a9edf04324e5b4e2c00132417628 100644 --- a/src/Rules.LXcray.mk +++ b/src/Rules.LXcray.mk @@ -63,7 +63,7 @@ OPT_NOCB = $(OPT_BASE) $(OPT_PERF1) endif # # -FC = ftn +FC = ftn -em -ef FCFLAGS = -em -ef CC=gcc export FC CC FCFLAGS @@ -98,6 +98,11 @@ endif # TARGET_GRIBEX=linux CNAME_GRIBEX=_gfortran +# +# GRIB_API +# +GRIBAPI_CONF="FCFLAGS= -em -ef " + # # LIBTOOLS flags # diff --git a/src/configure b/src/configure index 71b5c3b52f0941b7ac0b5e38fcc3db30a7fe0fe4..8f6ce93178628910eadcf35b96eef86b1879b564 100755 --- a/src/configure +++ b/src/configure @@ -11,7 +11,7 @@ then export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-3} export VERSION_BUG=${VERSION_BUG:-0} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} -export VERSION_DATE=${VERSION_DATE:-"23/06/2016"} +export VERSION_DATE=${VERSION_DATE:-"15/12/2016"} export VERSION_CDF=${VERSION_CDF:-"4.1.3"} export VERSION_HDF=${VERSION_HDF:-"1.8.9"} export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.13.1"} @@ -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 diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca index 923f453fcd9a623bb1634de4c9f393fd4db9aa6b..e4419e39232e058c4c03ad716065218ac18f009e 100755 --- a/src/job_make_examples_CRAY_cca +++ b/src/job_make_examples_CRAY_cca @@ -25,8 +25,8 @@ hostname cd ${PBS_O_WORKDIR} -#ARCH=LXifort -ARCH=LXcray +ARCH=LXifort +#ARCH=LXcray . ../conf/profile_mesonh-${ARCH}I4-MNH-V5-3-0-MPICRAY-O2 diff --git a/src/job_make_mesonh_CRAY_cca b/src/job_make_mesonh_CRAY_cca index a308dc3ddf2a192e3f1e3f2d7464b45fb299e204..f990b49859156d7b8d93784bf42f6bc9e20bf44c 100755 --- a/src/job_make_mesonh_CRAY_cca +++ b/src/job_make_mesonh_CRAY_cca @@ -19,12 +19,11 @@ set -x cd ${PBS_O_WORKDIR} pwd -#ARCH=LXifort -ARCH=LXcray +ARCH=LXifort +#ARCH=LXcray . ../conf/profile_mesonh-${ARCH}I4-MNH-V5-3-0-MPICRAY-O2 - -time gmake -j 4 2>&1 | tee sortie_compile_cray.$$ -time gmake -j 4 2>&1 | tee sortie_compile_cray2.$$ -time gmake -j 1 installmaster 2>&1 | tee sortie_install_cray.$$ +time gmake -j 4 2>&1 | tee sortie_compile_${ARCH}.$$ +time gmake -j 4 2>&1 | tee sortie_compile_${ARCH}2.$$ +time gmake -j 1 installmaster 2>&1 | tee sortie_install_${ARCH}2.$$