From 395cc7f80f29e8541eccd6406facec7091f2172e Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Tue, 22 Jan 2013 11:12:23 +0000
Subject: [PATCH] [Somerton] Rename variables, make function const, use math
functions from std:: (reviewed by klaus)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10062 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/material/fluidmatrixinteractions/2p/somerton.hh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dumux/material/fluidmatrixinteractions/2p/somerton.hh b/dumux/material/fluidmatrixinteractions/2p/somerton.hh
index 17e441c429..4ff8edbbad 100644
--- a/dumux/material/fluidmatrixinteractions/2p/somerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/somerton.hh
@@ -73,18 +73,18 @@ public:
const ElementVolumeVariables &elemVolVars,
const FVElementGeometry &fvGeometry,
const SpatialParams &spatialParams,
- const int scvIdx)
+ const int scvIdx) const
{
const Scalar lambdaSolid = spatialParams.thermalConductivitySolid(element, fvGeometry, scvIdx);
- const Scalar poro = spatialParams.porosity(element, fvGeometry, scvIdx);
+ const Scalar porosity = spatialParams.porosity(element, fvGeometry, scvIdx);
const Scalar Sw = std::max<Scalar>(0.0, elemVolVars[scvIdx].saturation(wPhaseIdx));
const Scalar lWater = elemVolVars[scvIdx].thermalConductivity(wPhaseIdx);
- const Scalar lsat = pow(lambdaSolid, (1-poro)) * pow(lWater, poro);
- const Scalar ldry = pow(lambdaSolid, (1-poro));
+ const Scalar lSat = std::pow(lambdaSolid, (1.0 - porosity)) * std::pow(lWater, porosity);
+ const Scalar lDry = std::pow(lambdaSolid, (1.0 - porosity));
- return ldry + sqrt(Sw) * (ldry - lsat);
+ return lDry + std::sqrt(Sw) * (lDry - lSat);
}
};
}
--
GitLab