From b08f8f83a73e54ce8cae30beb6772b91ee4b7815 Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Wed, 4 May 2016 13:04:40 +0200 Subject: [PATCH] Add explicit std namespace specifier to std::isnan --- dumux/geomechanics/el1p2c/model.hh | 2 +- dumux/geomechanics/el2p/model.hh | 2 +- .../mpfa/lmethod/3dtransmissibilitycalculator.hh | 8 ++++---- .../2p/sequential/diffusion/mpfa/omethod/2dpressure.hh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dumux/geomechanics/el1p2c/model.hh b/dumux/geomechanics/el1p2c/model.hh index add0dbf576..9998cc7fcf 100644 --- a/dumux/geomechanics/el1p2c/model.hh +++ b/dumux/geomechanics/el1p2c/model.hh @@ -398,7 +398,7 @@ public: for (int i = 0; i < dim; i++) { - if (isnan(eigenValues[i])) + if (std::isnan(eigenValues[i])) eigenValues[i] = 0.0; } diff --git a/dumux/geomechanics/el2p/model.hh b/dumux/geomechanics/el2p/model.hh index fd71aec134..7cca7f6ca6 100644 --- a/dumux/geomechanics/el2p/model.hh +++ b/dumux/geomechanics/el2p/model.hh @@ -550,7 +550,7 @@ public: for (int i = 0; i < dim; i++) { - if (isnan(eigenValues[i])) + if (std::isnan(eigenValues[i])) eigenValues[i] = 0.0; } diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh index 01240bbaf5..ca1f97f6fe 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh @@ -957,7 +957,7 @@ int FvMpfaL3dTransmissibilityCalculator::transmissibilityCaseOne( transmissibility = D; - if (isnan(transmissibility.frobenius_norm())) + if (std::isnan(transmissibility.frobenius_norm())) { std::cout<<"idx: "<::transmissibilityCaseTwo( transmissibility = D; - if (isnan(transmissibility.frobenius_norm())) + if (std::isnan(transmissibility.frobenius_norm())) { std::cout<<"idx: "<::transmissibilityCaseThree( transmissibility = D; - if (isnan(transmissibility.frobenius_norm())) + if (std::isnan(transmissibility.frobenius_norm())) { std::cout<<"case 3: transmissibility = "<::transmissibilityCaseFour( transmissibility = D; - if (isnan(transmissibility.frobenius_norm())) + if (std::isnan(transmissibility.frobenius_norm())) { std::cout<<"case 4: transmissibility = "<::assemble() pcFluxReal[2] *= fracFlow34; pcFluxReal[3] *= fracFlow14; -// if (isnan(pcFluxReal.two_norm())) +// if (std::isnan(pcFluxReal.two_norm())) // std::cout<<"pcFlux = "<