diff --git a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
index 8c28cf4268ebabc4bc1752d73dbe7ad9905a1b01..630e089c638f6b2f07bf52998e48656b3d4c60e1 100644
--- a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
@@ -135,7 +135,9 @@ public:
*/
static Scalar krw(const Params ¶ms, Scalar swe)
{
- return std::max(std::min(swe,1.0),0.0);
+ using std::max;
+ using std::min;
+ return max(min(swe,1.0),0.0);
}
/*!
@@ -150,7 +152,9 @@ public:
static Scalar krn(const Params ¶ms, Scalar swe)
{
Scalar sne = 1 - swe;
- return std::max(std::min(sne,1.0),0.0);
+ using std::max;
+ using std::min;
+ return max(min(sne,1.0),0.0);
}
};
}
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
index 3434a8f68a4379b7103dee42db2e8797ee4088f0..c0be8ad95fbbe70545bea790b5aff46eb1546994 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
@@ -124,12 +124,15 @@ public:
const Scalar porosity,
const Scalar rhoSolid)
{
- const Scalar satW = std::max<Scalar>(0.0, Sw);
+ using std::max;
+ const Scalar satW = max<Scalar>(0.0, Sw);
const Scalar kappa = 15.6; // fitted to medium quartz sand
const Scalar rhoBulk = rhoSolid*porosity;
// lambdaSolid^(1-porosity) * lambdaW^porosity =
- const Scalar lSat = lambdaSolid * std::pow(lambdaW / lambdaSolid, porosity);
+
+ using std::pow;
+ const Scalar lSat = lambdaSolid * pow(lambdaW / lambdaSolid, porosity);
const Scalar lDry = (0.135*rhoBulk + 64.7)/(rhoSolid - 0.947*rhoBulk);
const Scalar Ke = (kappa*satW)/(1+(kappa-1)*satW);// Kersten number, equation 13
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh
index 660c44b96f1317bb6b60098014affd68e050a59e..bcea89c8944b421c0740128fe097e9c239a6a72c 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh
@@ -92,7 +92,8 @@ public:
assert(numEnergyEquations != 3) ;
// Franz Lindner / Shi & Wang 2011
- const Scalar satW = std::max<Scalar>(0.0, sw);
+ using std::max;
+ const Scalar satW = max<Scalar>(0.0, sw);
const Scalar kfeff = porosity *((1.-satW)*lambdaN + satW*lambdaW) ; // arithmetic
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
index 9bebe3b2596a0455116c86d606370bca01f9732b..f12b84be8d0c4b9289cd1fab38f1724efcc63ce4 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
@@ -118,12 +118,15 @@ public:
const Scalar porosity,
const Scalar rhoSolid = 0.0 /*unused*/)
{
- const Scalar satW = std::max<Scalar>(0.0, sw);
+ using std::max;
+ using std::pow;
+ using std::sqrt;
+ const Scalar satW = max<Scalar>(0.0, sw);
// geometric mean, using ls^(1-p)*l^p = ls*(l/ls)^p
- const Scalar lSat = lambdaSolid * std::pow(lambdaW / lambdaSolid, porosity);
- const Scalar lDry = lambdaSolid * std::pow(lambdaN / lambdaSolid, porosity);
+ const Scalar lSat = lambdaSolid * pow(lambdaW / lambdaSolid, porosity);
+ const Scalar lDry = lambdaSolid * pow(lambdaN / lambdaSolid, porosity);
- return lDry + std::sqrt(satW) * (lSat - lDry);
+ return lDry + sqrt(satW) * (lSat - lDry);
}
};
}
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh
index 81158e1fe5a2f11f43752e37de79c5afb1764358..cbde4ec2ff0d0e288ed4b70d4da41947de604450 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh
@@ -65,7 +65,8 @@ public:
const Scalar a2 = params.a2();
const Scalar a3 = params.a3();
const Scalar Swr = params.Swr();
- const Scalar aAlphaBeta = a1 * (Swr-Sw) * (1-Sw) + a2 * (Swr-Sw) * (1-Sw) * std::exp( a3 * pc) ;
+ using std::exp;
+ const Scalar aAlphaBeta = a1 * (Swr-Sw) * (1-Sw) + a2 * (Swr-Sw) * (1-Sw) * exp( a3 * pc) ;
return aAlphaBeta;
}
@@ -80,7 +81,8 @@ public:
const Scalar a2 = params.a2();
const Scalar a3 = params.a3();
const Scalar Swr = params.Swr();
- const Scalar value = a2 * a3 * (Swr-Sw) * (1-Sw) * std::exp(a3*pc);
+ using std::exp;
+ const Scalar value = a2 * a3 * (Swr-Sw) * (1-Sw) * exp(a3*pc);
return value;
}
@@ -97,7 +99,8 @@ public:
Scalar a2 = params.a2();
Scalar a3 = params.a3();
Scalar Swr = params.Swr();
- value = - a1 *( 1+Swr-2*Sw ) - a2 * std::exp(a3*pc) * ( 1+Swr-2*Sw );
+ using std::exp;
+ value = - a1 *( 1+Swr-2*Sw ) - a2 * exp(a3*pc) * ( 1+Swr-2*Sw );
return value;
}
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3.hh
index 2a15ee31efe1d1541a0ff25b2a7b8a54771bbcc2..363c5eaf3cebbf92899f7da6b6909fd114b2e30f 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3.hh
@@ -66,7 +66,8 @@ public:
const Scalar a2 = params.a2();
const Scalar a3 = params.a3();
- const Scalar aAlphaBeta = a1 * std::exp( a2 * Sw) + a3 * pc * pc * pc ;
+ using std::exp;
+ const Scalar aAlphaBeta = a1 * exp( a2 * Sw) + a3 * pc * pc * pc ;
return aAlphaBeta;
}
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh
index bb5ac86a1b94cc3ceb19409b1f2a1825ba657298..03d1fad2abe8663cecefd7f8ad290e00efcc0c3a 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh
@@ -68,7 +68,9 @@ public:
const Scalar a11 = params.a11();
const Scalar a01 = params.a01();
const Scalar a02 = params.a02();
- const Scalar aAlphaBeta = a00 + a10 * Sw + a20 * std::pow(Sw,2) + a11*Sw*pc + a01*pc + a02*std::pow(pc,2);
+
+ using std::pow;
+ const Scalar aAlphaBeta = a00 + a10 * Sw + a20 * pow(Sw,2) + a11*Sw*pc + a01*pc + a02*pow(pc,2);
return aAlphaBeta;
}
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
index b74926f3f1d3316e651a5107c579ae10016b1351..62b3b04a240af50ccc84d8f8cae81f886664dd59 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
@@ -148,6 +148,7 @@ public:
*/
static Scalar dpcgw_dswe(const Params ¶ms, const Scalar seRegu)
{
+ using std::pow;
const Scalar powSeRegu = pow(seRegu, -1/params.vgm());
return - 1.0/params.vgAlpha() * pow(powSeRegu - 1, 1.0/params.vgn() - 1)/params.vgn()
* powSeRegu/seRegu/params.vgm()/params.betaGw();
@@ -161,6 +162,7 @@ public:
*/
static Scalar dpcnw_dswe(const Params ¶ms, const Scalar seRegu)
{
+ using std::pow;
const Scalar powSeRegu = pow(seRegu, -1/params.vgm());
return - 1.0/params.vgAlpha() * pow(powSeRegu - 1, 1.0/params.vgn() - 1)/params.vgn()
* powSeRegu/seRegu/params.vgm()/params.betaNw();
@@ -174,6 +176,7 @@ public:
*/
static Scalar dpcgn_dste(const Params ¶ms, const Scalar seRegu)
{
+ using std::pow;
const Scalar powSeRegu = pow(seRegu, -1/params.vgm());
return - 1.0/params.vgAlpha() * pow(powSeRegu - 1, 1.0/params.vgn() - 1)/params.vgn()
* powSeRegu/seRegu/params.vgm()/params.betaGn();
@@ -204,8 +207,10 @@ public:
*/
static Scalar krw(const Params ¶ms, const Scalar swe)
{
- const Scalar r = 1.0 - std::pow(1 - std::pow(swe, 1/params.vgm()), params.vgm());
- return std::sqrt(swe)*r*r;
+ using std::pow;
+ using std::sqrt;
+ const Scalar r = 1.0 - pow(1 - pow(swe, 1/params.vgm()), params.vgm());
+ return sqrt(swe)*r*r;
}
/*!
@@ -228,18 +233,22 @@ public:
static Scalar krn(const Params ¶ms, const Scalar swe, const Scalar sn, const Scalar ste)
{
Scalar krn;
- krn = std::pow(1 - std::pow(swe, 1/params.vgm()), params.vgm());
- krn -= std::pow(1 - std::pow(ste, 1/params.vgm()), params.vgm());
+ using std::pow;
+ krn = pow(1 - pow(swe, 1/params.vgm()), params.vgm());
+ krn -= pow(1 - pow(ste, 1/params.vgm()), params.vgm());
krn *= krn;
+ using std::max;
+ using std::min;
+ using std::sqrt;
if (params.krRegardsSnr())
{
// regard Snr in the permeability of the n-phase, see Helmig1997
- Scalar resIncluded = std::max(std::min((sn - params.snr()/ (1-params.swr())), 1.0), 0.0);
- krn *= std::sqrt(resIncluded );
+ Scalar resIncluded = max(min((sn - params.snr()/ (1-params.swr())), 1.0), 0.0);
+ krn *= sqrt(resIncluded );
}
else
- krn *= std::sqrt(sn / (1 - params.swr())); // Hint: (ste - swe) = sn / (1-Srw)
+ krn *= sqrt(sn / (1 - params.swr())); // Hint: (ste - swe) = sn / (1-Srw)
return krn;
}
@@ -259,7 +268,9 @@ public:
static Scalar krg(const Params ¶ms, const Scalar ste)
{
assert(0 <= ste && ste <= 1);
- return std::cbrt(1 - ste) * std::pow(1 - std::pow(ste, 1/params.vgm()), 2*params.vgm());
+ using std::cbrt;
+ using std::pow;
+ return cbrt(1 - ste) * pow(1 - pow(ste, 1/params.vgm()), 2*params.vgm());
}
/*!
@@ -277,10 +288,11 @@ public:
{
assert(0 < ste && ste <= 1);
- const Scalar x = std::pow(ste, 1.0/params.vgm());
+ using std::pow;
+ const Scalar x = pow(ste, 1.0/params.vgm());
return
- -std::pow(1.0 - x, 2*params.vgm())
- *std::pow(1.0 - ste, -2.0/3)
+ -pow(1.0 - x, 2*params.vgm())
+ *pow(1.0 - ste, -2.0/3)
*(1.0/3 + 2*x/ste);
}
@@ -326,7 +338,8 @@ private:
*/
const static Scalar pc_(const Params ¶ms, const Scalar se)
{
- return std::pow(std::pow(se, -1/params.vgm()) - 1, 1/params.vgn())/params.vgAlpha();
+ using std::pow;
+ return pow(pow(se, -1/params.vgm()) - 1, 1/params.vgn())/params.vgAlpha();
}
};
diff --git a/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh b/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh
index 4dd787b017ed367320b31a421a009e28378dcbdd..d1ccf338296c7a9cdca175b9ed0904df00593ece 100644
--- a/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh
@@ -332,8 +332,10 @@ public:
*/
static Scalar krn(const Params ¶ms, Scalar swe, Scalar sn, Scalar ste)
{
- swe = std::max(std::min(swe, 1.0), 0.0);
- ste = std::max(std::min(ste, 1.0), 0.0);
+ using std::max;
+ using std::min;
+ swe = max(min(swe, 1.0), 0.0);
+ ste = max(min(ste, 1.0), 0.0);
if(ste - swe <= 0.0)
return 0.0;
@@ -381,8 +383,9 @@ public:
//get the absolute gas phase saturation
const Scalar st = ste*(1 - params.swr()) + params.swr();
const Scalar sg = 1.0 - st;
- const Scalar scalFact = (sg > 0.1) ? 1.0 : std::max(0.0,
- (sg - params.sgr())/(0.1 - params.sgr()));
+ using std::max;
+ const Scalar scalFact = (sg > 0.1) ? 1.0 : max(0.0,
+ (sg - params.sgr())/(0.1 - params.sgr()));
//or use actual material law
return scalFact * ParkerVanGen3P::krg(params, ste);
diff --git a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
index f95a666e97ab4f7cda9f998702f5d63e2c83fde3..12a39c1c6d9c91f9b5b6410cf85fbd92a9296390 100644
--- a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
@@ -127,17 +127,20 @@ public:
const Scalar lambdaSolid,
const Scalar porosity)
{
- const Scalar satW = std::max<Scalar>(0.0, sw);
- const Scalar satN = std::max<Scalar>(0.0, sn);
+ using std::max;
+ using std::pow;
+ using std::sqrt;
+ const Scalar satW = max<Scalar>(0.0, sw);
+ const Scalar satN = max<Scalar>(0.0, sn);
-// const Scalar lSw = 1.8; //std::pow(lambdaSolid, (1.0 - porosity)) * std::pow(lambdaW, porosity);
-// const Scalar lSn = 0.65; //std::pow(lambdaSolid, (1.0 - porosity)) * std::pow(lambdaN, porosity);
-// const Scalar lSg = 0.35; //std::pow(lambdaSolid, (1.0 - porosity)) * std::pow(lambdaG, porosity);
+// const Scalar lSw = 1.8; //pow(lambdaSolid, (1.0 - porosity)) * pow(lambdaW, porosity);
+// const Scalar lSn = 0.65; //pow(lambdaSolid, (1.0 - porosity)) * pow(lambdaN, porosity);
+// const Scalar lSg = 0.35; //pow(lambdaSolid, (1.0 - porosity)) * pow(lambdaG, porosity);
// porosity weighted geometric mean
- Scalar lSw = std::pow(lambdaSolid, (1.0 - porosity)) * std::pow(lambdaW, porosity);
- Scalar lSn = std::pow(lambdaSolid, (1.0 - porosity)) * std::pow(lambdaN, porosity);
- Scalar lSg = std::pow(lambdaSolid, (1.0 - porosity)) * std::pow(lambdaG, porosity);
- Scalar lambdaEff = lSg + std::sqrt(satW) * (lSw - lSg) + std::sqrt(satN) * (lSn -lSg);
+ Scalar lSw = pow(lambdaSolid, (1.0 - porosity)) * pow(lambdaW, porosity);
+ Scalar lSn = pow(lambdaSolid, (1.0 - porosity)) * pow(lambdaN, porosity);
+ Scalar lSg = pow(lambdaSolid, (1.0 - porosity)) * pow(lambdaG, porosity);
+ Scalar lambdaEff = lSg + sqrt(satW) * (lSw - lSg) + sqrt(satN) * (lSn -lSg);
return lambdaEff;
diff --git a/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh b/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
index 92204bbad0e0b48c27c111c1504cfb952901e928..00e818d59cbe9cdfb1f256efa86482237f64ffd7 100644
--- a/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
+++ b/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
@@ -68,6 +68,7 @@ public:
// we calculate the more efficient
// D_eff,pm = phi * Sw^3 * cubicroot(phi * Sw) * D
+ using std::cbrt;
return porosity * (saturation * saturation * saturation)
* cbrt(porosity * saturation) * diffCoeff;
}
diff --git a/dumux/material/fluidmatrixinteractions/mp/mplinearmaterial.hh b/dumux/material/fluidmatrixinteractions/mp/mplinearmaterial.hh
index a71b95f1c76bf690ac2d5ebd6dc39986368d46f3..db7cb5b273c36690409d554258ffc189e92d72cf 100644
--- a/dumux/material/fluidmatrixinteractions/mp/mplinearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/mp/mplinearmaterial.hh
@@ -87,8 +87,10 @@ public:
const Params ¶ms,
const FluidState &state)
{
+ using std::max;
+ using std::min;
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
- values[phaseIdx] = std::max(std::min(state.saturation(phaseIdx),1.0),0.0);
+ values[phaseIdx] = max(min(state.saturation(phaseIdx),1.0),0.0);
}
};
}
diff --git a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh
index 29086bd30e72a96c571b2ef367350f9ccd1be666..fbd5a5221773e257e0bda1a2811f179978b4b4e1 100644
--- a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh
+++ b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh
@@ -82,6 +82,7 @@ public:
auto Keff
= spatialParams.intrinsicPermeability(element, fvGeometry, scvIdx);
+ using std::exp;
Keff *= exp(exponent);
return Keff;