From 9ae5537817ac66b69484915c5a147938473e412b Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Tue, 10 Jul 2018 14:37:15 +0200
Subject: [PATCH] Philippe 10/07/2018: correct compilation for ECMWF *
Rules.LXifort.mk: use gcc for C compilation + add O2 OPTLEVEL * Makefile: add
FFLAGS to netCDF configure
---
src/Makefile | 2 +-
src/Rules.LXifort.mk | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/Makefile b/src/Makefile
index 07c304217..be3b124ff 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -351,7 +351,7 @@ $(CDF_MOD) :
CC="$(CC)" CFLAGS="$(NETCDF_OPT)" CPPFLAGS="${INC_NETCDF}" ${CDF_CONF} LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lhdf5_hl -lhdf5 -lsz -laec -lz" && \
$(MAKE) && $(MAKE) install && $(MAKE) clean
cd ${DIR_CDFF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 \
- CC="$(CC)" CFLAGS="$(NETCDF_OPT)" FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" \
+ CC="$(CC)" CFLAGS="$(NETCDF_OPT)" FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" FFLAGS="$(NETCDF_OPT)" \
CPPFLAGS="${INC_NETCDF}" ${CDF_CONF} LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lnetcdf -lhdf5_hl -lhdf5 -lsz -laec -lz" && \
$(MAKE) && $(MAKE) install && $(MAKE) clean
diff --git a/src/Rules.LXifort.mk b/src/Rules.LXifort.mk
index 0ded924d2..e4c14811a 100644
--- a/src/Rules.LXifort.mk
+++ b/src/Rules.LXifort.mk
@@ -48,6 +48,11 @@ OPT0 = $(OPT_BASE) $(OPT_PERF0) $(OPT_CHECK)
OPT_NOCB = $(OPT_BASE) $(OPT_PERF0)
CFLAGS += -g
endif
+ifeq "$(OPTLEVEL)" "O2"
+OPT = $(OPT_BASE) $(OPT_PERF2)
+OPT0 = $(OPT_BASE) $(OPT_PERF0)
+OPT_NOCB = $(OPT_BASE) $(OPT_PERF2)
+endif
ifeq "$(OPTLEVEL)" "O2PAR"
PAR= -parallel -diag-file -par-report2
OPT = $(OPT_BASE) $(OPT_PERF2) $(PAR)
@@ -66,6 +71,7 @@ OPT_NOCB = $(OPT_BASE) $(OPT_PERF3)
endif
#
#
+CC = gcc
FC = ifort
ifeq "$(VER_MPI)" "MPIAUTO"
ifneq "$(findstring TAU,$(XYZ))" ""
--
GitLab