From fc2ab1f19b2c081e9c8d746f2bf193310cbe382b Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Thu, 28 Jan 2016 13:22:34 +0100
Subject: [PATCH] [cleanup] Use conv functions in 2pdfm
Use volvars.saturation(phaseIdx) and volvars.density(phaseIdx)
instead of volvars.fluidstate().x(phaseIdx)
---
dumux/porousmediumflow/2pdfm/implicit/fluxvariables.hh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dumux/porousmediumflow/2pdfm/implicit/fluxvariables.hh b/dumux/porousmediumflow/2pdfm/implicit/fluxvariables.hh
index bb1aa810fd..fceb70ee12 100644
--- a/dumux/porousmediumflow/2pdfm/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/2pdfm/implicit/fluxvariables.hh
@@ -227,10 +227,10 @@ private:
// calculate the phase density at the integration point. we
// only do this if the wetting phase is present in both cells
- Scalar SI = elemVolVars[this->face().i].fluidState().saturation(phaseIdx);
- Scalar SJ = elemVolVars[this->face().j].fluidState().saturation(phaseIdx);
- Scalar rhoI = elemVolVars[this->face().i].fluidState().density(phaseIdx);
- Scalar rhoJ = elemVolVars[this->face().j].fluidState().density(phaseIdx);
+ Scalar SI = elemVolVars[this->face().i].saturation(phaseIdx);
+ Scalar SJ = elemVolVars[this->face().j].saturation(phaseIdx);
+ Scalar rhoI = elemVolVars[this->face().i].density(phaseIdx);
+ Scalar rhoJ = elemVolVars[this->face().j].density(phaseIdx);
Scalar fI = std::max(0.0, std::min(SI/1e-5, 0.5));
Scalar fJ = std::max(0.0, std::min(SJ/1e-5, 0.5));
if (Dune::FloatCmp::eq<Scalar, Dune::FloatCmp::absolute>(fI + fJ, 0.0, 1.0e-30))
--
GitLab