From 6c540ccd31136943faf767c3bcd1374f45da030e Mon Sep 17 00:00:00 2001
From: Gaelle TANGUY <gaelle.tanguy@meteo.fr>
Date: Tue, 15 Nov 2016 12:00:04 +0100
Subject: [PATCH] G.Delautier 15/11/2016 : compilateur beaufix
---
src/Makefile.MESONH.mk | 2 +-
src/configure | 29 +++++++----------------------
2 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index a573c493a..b86951ce0 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -443,7 +443,7 @@ endif
#
# NetCDF in beaufix (bull meteo-france)
ifeq "$(VER_CDF)" "CDFBFIX"
-CDF_PATH?=/opt/softs/libraries/ICC13.1.4.183/netcdf-4.3.0
+CDF_PATH?=/opt/softs/libraries/ICC16.1.150/netcdf-4.4.0
INC_NETCDF ?= -I${CDF_PATH}/include
LIB_NETCDF ?= -L${CDF_PATH}/lib -lnetcdf -lnetcdff
INC += $(INC_NETCDF)
diff --git a/src/configure b/src/configure
index 3114711fc..30a4c4b53 100755
--- a/src/configure
+++ b/src/configure
@@ -10,7 +10,6 @@ then
#
export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-3}
export VERSION_BUG=${VERSION_BUG:-0}
-export VER_OASIS=${VER_OASIS:-""}
export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}}
export VERSION_DATE=${VERSION_DATE:-"23/06/2016"}
export VERSION_CDF=${VERSION_CDF:-"4.1.3"}
@@ -22,7 +21,6 @@ export MNH_IOCDF4=${MNH_IOCDF4:-1}
export VERSION_OASIS=${VERSION_OASIS:-"mct_v3"}
export VERSION_TOY=${VERSION_TOY:-"v1-0"}
-
export VERSION_NCL=${VERSION_NCL:-"ncl-6.3.0"}
#
@@ -75,33 +73,20 @@ export MPI_DSM_CPULIST=0-7:allhosts
export MVWORK=${MVWORK:-NO}
export VER_CDF=${VER_CDF:-CDFAUTO}
;;
-'Linux beaufix'*|'Linux compute'*)
- 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 NEED_TOOLS=NO
- export MNHENV=${MNHENV:-"
-module rm intel ; module load intel/13.1.4.183 ;
-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'*)
+'Linux beaufix'*|'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 NEED_NCARG=${NEED_NCARG:-NO}
+ export NEED_TOOLS=NO
export MNHENV=${MNHENV:-"
-module rm intel ; module load intel/13.1.4.183 ;
+module rm intel ; module load intel/16.1.150 ;
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
+module rm netcdf ; module load netcdf/4.4.0 ;
+module rm grib_api ; module load grib_api/1.14.5 ;
+export GRIBAPI_PATH=/opt/softs/libraries/ICC16.1.150/grib_api-1.14.5
"}
;;
'Linux login0'*|'Linux compute'*)
--
GitLab