Skip to content
Snippets Groups Projects
Commit 9ae55378 authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

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
parent 90e81fb2
No related branches found
No related tags found
No related merge requests found
...@@ -351,7 +351,7 @@ $(CDF_MOD) : ...@@ -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" && \ 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 $(MAKE) && $(MAKE) install && $(MAKE) clean
cd ${DIR_CDFF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 \ 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" && \ CPPFLAGS="${INC_NETCDF}" ${CDF_CONF} LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lnetcdf -lhdf5_hl -lhdf5 -lsz -laec -lz" && \
$(MAKE) && $(MAKE) install && $(MAKE) clean $(MAKE) && $(MAKE) install && $(MAKE) clean
......
...@@ -48,6 +48,11 @@ OPT0 = $(OPT_BASE) $(OPT_PERF0) $(OPT_CHECK) ...@@ -48,6 +48,11 @@ OPT0 = $(OPT_BASE) $(OPT_PERF0) $(OPT_CHECK)
OPT_NOCB = $(OPT_BASE) $(OPT_PERF0) OPT_NOCB = $(OPT_BASE) $(OPT_PERF0)
CFLAGS += -g CFLAGS += -g
endif endif
ifeq "$(OPTLEVEL)" "O2"
OPT = $(OPT_BASE) $(OPT_PERF2)
OPT0 = $(OPT_BASE) $(OPT_PERF0)
OPT_NOCB = $(OPT_BASE) $(OPT_PERF2)
endif
ifeq "$(OPTLEVEL)" "O2PAR" ifeq "$(OPTLEVEL)" "O2PAR"
PAR= -parallel -diag-file -par-report2 PAR= -parallel -diag-file -par-report2
OPT = $(OPT_BASE) $(OPT_PERF2) $(PAR) OPT = $(OPT_BASE) $(OPT_PERF2) $(PAR)
...@@ -66,6 +71,7 @@ OPT_NOCB = $(OPT_BASE) $(OPT_PERF3) ...@@ -66,6 +71,7 @@ OPT_NOCB = $(OPT_BASE) $(OPT_PERF3)
endif endif
# #
# #
CC = gcc
FC = ifort FC = ifort
ifeq "$(VER_MPI)" "MPIAUTO" ifeq "$(VER_MPI)" "MPIAUTO"
ifneq "$(findstring TAU,$(XYZ))" "" ifneq "$(findstring TAU,$(XYZ))" ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment