diff --git a/dumux/discretization/staggered/freeflow/fickslaw.hh b/dumux/discretization/staggered/freeflow/fickslaw.hh index 33b3f9910202502b57d89c4897fca61dfae2618b..b7e604908775c62f7a73bd5c3bfc38df6ce48805 100644 --- a/dumux/discretization/staggered/freeflow/fickslaw.hh +++ b/dumux/discretization/staggered/freeflow/fickslaw.hh @@ -82,10 +82,10 @@ public: //! We don't cache anything for this law using Cache = FluxVariablesCaching::EmptyDiffusionCache; - static CellCenterPrimaryVariables diffusiveFluxForCellCenter(const Problem& problem, - const FVElementGeometry& fvGeometry, - const ElementVolumeVariables& elemVolVars, - const SubControlVolumeFace &scvf) + static CellCenterPrimaryVariables flux(const Problem& problem, + const FVElementGeometry& fvGeometry, + const ElementVolumeVariables& elemVolVars, + const SubControlVolumeFace &scvf) { CellCenterPrimaryVariables flux(0.0); @@ -109,7 +109,7 @@ public: return flux; } - const Scalar tij = transmissibility_(problem, fvGeometry, elemVolVars, scvf, compIdx); + const Scalar tij = transmissibility_(fvGeometry, elemVolVars, scvf, compIdx); const Scalar insideMoleFraction = insideVolVars.moleFraction(compIdx); const Scalar outsideMolarDensity = scvf.boundary() ? insideVolVars.molarDensity() : outsideVolVars.molarDensity(); @@ -148,8 +148,7 @@ public: return flux; } - static Scalar transmissibility_(const Problem& problem, - const FVElementGeometry& fvGeometry, + static Scalar transmissibility_(const FVElementGeometry& fvGeometry, const ElementVolumeVariables& elemVolVars, const SubControlVolumeFace& scvf, const int compIdx) diff --git a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh b/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh index a8f2d1ac451a743532b08014c3091233f603affd..4343932b244b40b2814bc164c7c230fe28b79b03 100644 --- a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh +++ b/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh @@ -85,10 +85,10 @@ public: using Cache = FluxVariablesCaching::EmptyDiffusionCache; using CacheFiller = FluxVariablesCaching::EmptyCacheFiller; - static CellCenterPrimaryVariables diffusiveFluxForCellCenter(const Problem& problem, - const FVElementGeometry& fvGeometry, - const ElementVolumeVariables& elemVolVars, - const SubControlVolumeFace& scvf) + static CellCenterPrimaryVariables flux(const Problem& problem, + const FVElementGeometry& fvGeometry, + const ElementVolumeVariables& elemVolVars, + const SubControlVolumeFace& scvf) { //this is to calculate the maxwellStefan diffusion in a multicomponent system. //see: Multicomponent Mass Transfer. R. Taylor u. R. Krishna. J. Wiley & Sons, New York 1993 diff --git a/dumux/freeflow/compositional/staggered/fluxvariables.hh b/dumux/freeflow/compositional/staggered/fluxvariables.hh index fde62e47ce9ff83c8fdd873e70922bf94d1e8556..c91cb1ce0fbdc693f0696e850b51e5cc25fc010b 100644 --- a/dumux/freeflow/compositional/staggered/fluxvariables.hh +++ b/dumux/freeflow/compositional/staggered/fluxvariables.hh @@ -106,7 +106,7 @@ public: flux[Indices::replaceCompEqIdx] = std::accumulate(flux.begin(), flux.end(), 0.0); } - flux += MolecularDiffusionType::diffusiveFluxForCellCenter(problem, fvGeometry, elemVolVars, scvf); + flux += MolecularDiffusionType::flux(problem, fvGeometry, elemVolVars, scvf); return flux; } };