From 6e16f9016e782499d0e81e501bfa9d5eb8210b0c Mon Sep 17 00:00:00 2001
From: melaniel <melanie.lipp@iws.uni-stuttgart.de>
Date: Thu, 30 Aug 2018 15:43:32 +0200
Subject: [PATCH] Remove warnings Wfloat-equal from dumux.
---
dumux/common/math.hh | 3 ++-
dumux/common/splinecommon_.hh | 10 +++++-----
dumux/discretization/box/maxwellstefanslaw.hh | 2 +-
.../cellcentered/tpfa/maxwellstefanslaw.hh | 4 ++--
dumux/linear/amgparallelhelpers.hh | 2 +-
dumux/material/constraintsolvers/immiscibleflash.hh | 1 -
dumux/material/constraintsolvers/ncpflash.hh | 1 -
dumux/material/fluidsystems/h2oair.hh | 2 +-
dumux/porousmediumflow/2p2c/sequential/fvpressure.hh | 2 +-
9 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/dumux/common/math.hh b/dumux/common/math.hh
index a2ebd0f91a..95a329a207 100644
--- a/dumux/common/math.hh
+++ b/dumux/common/math.hh
@@ -32,6 +32,7 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/dynmatrix.hh>
+#include <dune/common/float_cmp.hh>
namespace Dumux
{
@@ -110,7 +111,7 @@ void harmonicMeanMatrix(Dune::FieldMatrix<Scalar, m, n> &K,
{
for (int rowIdx=0; rowIdx < m; rowIdx++){
for (int colIdx=0; colIdx< n; colIdx++){
- if (Ki[rowIdx][colIdx] != Kj[rowIdx][colIdx]) {
+ if (Dune::FloatCmp::ne<Scalar>(Ki[rowIdx][colIdx], Kj[rowIdx][colIdx])) {
K[rowIdx][colIdx] =
harmonicMean(Ki[rowIdx][colIdx],
Kj[rowIdx][colIdx]);
diff --git a/dumux/common/splinecommon_.hh b/dumux/common/splinecommon_.hh
index fd9a8ff038..722c19a63d 100644
--- a/dumux/common/splinecommon_.hh
+++ b/dumux/common/splinecommon_.hh
@@ -251,9 +251,9 @@ public:
}
// corner case where the whole spline is a constant
- if (moment_(0) == 0 &&
- moment_(1) == 0 &&
- y_(0) == y_(1))
+ if (Dune::FloatCmp::eq<Scalar>(moment_(0), 0) &&
+ Dune::FloatCmp::eq<Scalar>(moment_(1), 0) &&
+ Dune::FloatCmp::eq<Scalar>(y_(0), y_(1)))
{
// actually the is monotonically increasing as well as
// monotonously decreasing
@@ -562,9 +562,9 @@ protected:
Scalar xE1 = (-2*b + disc)/(6*a);
Scalar xE2 = (-2*b - disc)/(6*a);
- if (disc == 0) {
+ if (Dune::FloatCmp::eq<Scalar>(disc, 0)) {
// saddle point -> no extrema
- if (xE1 == x0)
+ if (Dune::FloatCmp::eq<Scalar>(xE1, x0))
// make sure that we're not picking the saddle point
// to determine whether we're monotonically increasing
// or decreasing
diff --git a/dumux/discretization/box/maxwellstefanslaw.hh b/dumux/discretization/box/maxwellstefanslaw.hh
index b1b5c5a3db..4dd4449c79 100644
--- a/dumux/discretization/box/maxwellstefanslaw.hh
+++ b/dumux/discretization/box/maxwellstefanslaw.hh
@@ -153,7 +153,7 @@ private:
const auto outsideScvIdx = scvf.outsideScvIdx();
//this is to not devide by 0 if the saturation in 0 and the effectiveDiffusivity becomes zero due to that
- if(insideVolVars.saturation(phaseIdx) == 0 || outsideVolVars.saturation(phaseIdx) == 0)
+ if(Dune::FloatCmp::eq<Scalar>(insideVolVars.saturation(phaseIdx), 0) || Dune::FloatCmp::eq<Scalar>(outsideVolVars.saturation(phaseIdx), 0))
return reducedDiffusionMatrix;
for (int compIIdx = 0; compIIdx < numComponents-1; compIIdx++)
diff --git a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh b/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
index 2f704d49be..4378fd2a74 100644
--- a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
@@ -115,7 +115,7 @@ public:
}
//we cannot solve that if the matrix is 0 everywhere
- if(!(insideVolVars.saturation(phaseIdx) == 0 || outsideVolVars.saturation(phaseIdx) == 0))
+ if(!(Dune::FloatCmp::eq<Scalar>(insideVolVars.saturation(phaseIdx), 0) || Dune::FloatCmp::eq<Scalar>(outsideVolVars.saturation(phaseIdx), 0)))
{
const auto insideScvIdx = scvf.insideScvIdx();
const auto& insideScv = fvGeometry.scv(insideScvIdx);
@@ -211,7 +211,7 @@ private:
ReducedComponentMatrix reducedDiffusionMatrix(0.0);
//this is to not devide by 0 if the saturation in 0 and the effectiveDiffusivity becomes zero due to that
- if(volVars.saturation(phaseIdx) == 0)
+ if(Dune::FloatCmp::eq<Scalar>(volVars.saturation(phaseIdx), 0))
return reducedDiffusionMatrix;
for (int compIIdx = 0; compIIdx < numComponents-1; compIIdx++)
diff --git a/dumux/linear/amgparallelhelpers.hh b/dumux/linear/amgparallelhelpers.hh
index aac602d731..31900bc39f 100644
--- a/dumux/linear/amgparallelhelpers.hh
+++ b/dumux/linear/amgparallelhelpers.hh
@@ -424,7 +424,7 @@ public:
}
// access to ghost vector
- double ghost (std::size_t i) const
+ std::size_t ghost (std::size_t i) const
{
return isGhost_[i];
}
diff --git a/dumux/material/constraintsolvers/immiscibleflash.hh b/dumux/material/constraintsolvers/immiscibleflash.hh
index ff4a71dd4e..c8cf66acd2 100644
--- a/dumux/material/constraintsolvers/immiscibleflash.hh
+++ b/dumux/material/constraintsolvers/immiscibleflash.hh
@@ -295,7 +295,6 @@ protected:
Scalar x_i = getQuantity_(fluidState, pvIdx);
const Scalar eps = 1e-10/quantityWeight_(fluidState, pvIdx);
setQuantity_<MaterialLaw>(fluidState, paramCache, matParams, pvIdx, x_i + eps);
- assert(getQuantity_(fluidState, pvIdx) == x_i + eps);
// compute derivative of the defect
calculateDefect_(tmp, origFluidState, fluidState, globalMolarities);
diff --git a/dumux/material/constraintsolvers/ncpflash.hh b/dumux/material/constraintsolvers/ncpflash.hh
index f07b278b25..a10c2c3959 100644
--- a/dumux/material/constraintsolvers/ncpflash.hh
+++ b/dumux/material/constraintsolvers/ncpflash.hh
@@ -345,7 +345,6 @@ protected:
Scalar x_i = getQuantity_(fluidState, pvIdx);
const Scalar eps = 1e-8/quantityWeight_(fluidState, pvIdx);
setQuantity_<MaterialLaw>(fluidState, paramCache, matParams, pvIdx, x_i + eps);
- assert(getQuantity_(fluidState, pvIdx) == x_i + eps);
// compute derivative of the defect
calculateDefect_(tmp, origFluidState, fluidState, globalMolarities);
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index c1ea24d39d..0efa87856c 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -266,7 +266,7 @@ public:
return H2O::vaporPressure(t);
else
{
- const auto pc = (fluidState.wettingPhase() == H2OIdx)
+ const auto pc = (fluidState.wettingPhase() == (int) H2OIdx)
? fluidState.pressure(AirIdx)-fluidState.pressure(H2OIdx)
: fluidState.pressure(H2OIdx)-fluidState.pressure(AirIdx);
return H2O::vaporPressure(t)*exp( -pc * molarMass(H2OIdx)
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh
index df84a9c1ba..74e58630e2 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh
@@ -1026,7 +1026,7 @@ void FVPressure2P2C<TypeTag>::updateMaterialLawsInElement(const Element& element
Scalar massw = sumConc * fluidState.phaseMassFraction(wPhaseIdx);
Scalar massn = sumConc * fluidState.phaseMassFraction(nPhaseIdx);
- if ((cellData.density(wPhaseIdx)*cellData.density(nPhaseIdx)) == 0)
+ if (Dune::FloatCmp::eq<Scalar>((cellData.density(wPhaseIdx)*cellData.density(nPhaseIdx)), 0))
DUNE_THROW(Dune::MathError, "Sequential2p2c::postProcessUpdate: try to divide by 0 density");
Scalar vol = massw / cellData.density(wPhaseIdx) + massn / cellData.density(nPhaseIdx);
if (Dune::FloatCmp::ne<Scalar, Dune::FloatCmp::absolute>(problem().timeManager().timeStepSize(), 0.0, 1.0e-30))
--
GitLab