Commit c06f50f3 by Chris Cantwell

Merge branch 'fix/cwipi-compile' into 'master'

cwipi: fix compile with clang 6.0.0

See merge request !931
parents 797af628 42217f55
......@@ -50,6 +50,8 @@ v5.0.0
alignment (!921)
- Fix naming issue of duplicate Unit tests (!924)
- Fix warnings about missing virtual destructors in abstract classes (!932)
- Added a coupling interface to exchange data between solvers at run time
and a DummySolver to test the implementations (!853 !931)
**NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731)
......
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
diff -ur src/coupling.cxx src/coupling.cxx
--- src/coupling.cxx 2014-12-10 16:16:36.000000000 +0100
+++ src/coupling.cxx 2018-04-18 10:02:35.907208312 +0200
@@ -1221,7 +1221,7 @@
#ifdef NAN
if (receivingField != NULL && nInteriorList > 0) {
const int idx = 0;
- if (isnan(receivingField[idx]))
+ if (std::isnan(receivingField[idx]))
status = CWIPI_EXCHANGE_BAD_RECEIVING;
}
#endif
diff -ur src/cwipi_cf.cxx src/cwipi_cf.cxx
--- src/cwipi_cf.cxx 2014-12-10 16:16:36.000000000 +0100
+++ src/cwipi_cf.cxx 2018-04-18 10:03:02.423007880 +0200
@@ -234,7 +234,7 @@
char *application_name_c = _cwipi_fortran_to_c_string(application_name_f,
*l_application_name);
- bftc_printf("\ncwipi "CWIPI_VERSION" initializing\n");
+ bftc_printf("\ncwipi " CWIPI_VERSION " initializing\n");
bftc_printf("------------------------\n\n");
cwipi::ApplicationPropertiesDataBase & properties =
diff -ur src/cwipi.cxx src/cwipi.cxx
--- src/cwipi.cxx 2014-12-10 16:16:36.000000000 +0100
+++ src/cwipi.cxx 2018-04-18 10:02:50.031101550 +0200
@@ -134,7 +134,7 @@
cwipi::ApplicationPropertiesDataBase & properties =
cwipi::ApplicationPropertiesDataBase::getInstance();
- bftc_printf("\ncwipi "CWIPI_VERSION" initializing\n");
+ bftc_printf("\ncwipi " CWIPI_VERSION " initializing\n");
bftc_printf("------------------------\n\n");
*application_comm = properties.init(application_name,
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