Commit 294da2e9 authored by Kilian Lackhove's avatar Kilian Lackhove

cwipi: fix compile on gcc 7

# Conflicts:
#	cmake/ThirdPartyCwipi.cmake
parent 0eaac97a
......@@ -51,6 +51,7 @@ IF (NEKTAR_USE_CWIPI)
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/cwipi-0.8.2
PATCH_COMMAND patch -p 0 < ${PROJECT_SOURCE_DIR}/cmake/thirdparty-patches/cwipi_fix-compile.patch
BINARY_DIR ${TPBUILD}/cwipi-0.8.2
TMP_DIR ${TPBUILD}/cwipi-0.8.2-tmp
INSTALL_DIR ${TPDIST}
......@@ -58,6 +59,8 @@ IF (NEKTAR_USE_CWIPI)
OMPI_FC=${CMAKE_Fortran_COMPILER}
OMPI_CC=${CMAKE_C_COMPILER}
OMPI_CXX=${CMAKE_CXX_COMPILER}
CFLAGS=-std=c99
CXXFLAGS=-std=c++11
${TPSRC}/cwipi-0.8.2/configure
CC=${MPI_C_COMPILER}
CXX=${MPI_CXX_COMPILER}
......
diff -crB cwipi-0.8.2/src/coupling.cxx cwipi-0.8.2.patched/src/coupling.cxx
*** src/coupling.cxx 2014-12-10 16:16:36.000000000 +0100
--- src/coupling.cxx 2017-06-15 12:42:35.919177812 +0200
***************
*** 1221,1227 ****
#ifdef NAN
if (receivingField != NULL && nInteriorList > 0) {
const int idx = 0;
! if (isnan(receivingField[idx]))
status = CWIPI_EXCHANGE_BAD_RECEIVING;
}
#endif
--- 1221,1227 ----
#ifdef NAN
if (receivingField != NULL && nInteriorList > 0) {
const int idx = 0;
! if (std::isnan(receivingField[idx]))
status = CWIPI_EXCHANGE_BAD_RECEIVING;
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment