Merge branch 'cleanup/FS211-UseConvFunc' into 'master'

Cleanup/fs211 use conv func



See merge request !57

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))

test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh

@@ -343,11 +343,11 @@ public:
     {
         source = 0;
         const  VolumeVariables &volVars = elemVolVars[scvIdx];
-        Scalar moleFracNaCl_lPhase = volVars.fluidState().moleFraction(wPhaseIdx, NaClIdx);
-        Scalar moleFracNaCl_gPhase = volVars.fluidState().moleFraction(nPhaseIdx, NaClIdx);
+        Scalar moleFracNaCl_lPhase = volVars.moleFraction(wPhaseIdx, NaClIdx);
+        Scalar moleFracNaCl_gPhase = volVars.moleFraction(nPhaseIdx, NaClIdx);
         Scalar massFracNaCl_Max_lPhase = this->spatialParams().SolubilityLimit();
         Scalar moleFracNaCl_Max_lPhase = massTomoleFrac_(massFracNaCl_Max_lPhase);
-        Scalar moleFracNaCl_Max_gPhase = moleFracNaCl_Max_lPhase / volVars.fluidState().pressure(nPhaseIdx);
+        Scalar moleFracNaCl_Max_gPhase = moleFracNaCl_Max_lPhase / volVars.pressure(nPhaseIdx);
         Scalar saltPorosity = this->spatialParams().porosityMin(element, fvGeometry, scvIdx);
 
         // liquid phase