diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H index 245450dab..f8e9518f0 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -204,8 +204,7 @@ public: //- Return true if there is mass transfer for phase virtual bool transfersMass(const phaseModel& phase) const = 0; - //- Return the total interfacial mass transfer rate for phase - virtual tmp dmdt(const phaseModel& phase) const = 0; + using phaseSystem::dmdt; //- Return the momentum transfer matrices virtual autoPtr momentumTransfer() const = 0; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H index 93c6e3b58..002feac00 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H @@ -317,20 +317,20 @@ while (pimple.correct()) { if (pEqnComp1.valid()) { - pEqnComp1.ref() -= fluid.dmdt()/rho1; + pEqnComp1.ref() -= fluid.dmdt(phase1)/rho1; } else { - pEqnComp1 = fvm::Su(-fluid.dmdt()/rho1, p_rgh); + pEqnComp1 = fvm::Su(-fluid.dmdt(phase1)/rho1, p_rgh); } if (pEqnComp2.valid()) { - pEqnComp2.ref() += fluid.dmdt()/rho2; + pEqnComp2.ref() -= fluid.dmdt(phase2)/rho2; } else { - pEqnComp2 = fvm::Su(fluid.dmdt()/rho2, p_rgh); + pEqnComp2 = fvm::Su(-fluid.dmdt(phase2)/rho2, p_rgh); } } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H index cfaaeef81..2faee403e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H @@ -18,8 +18,8 @@ fvVectorMatrix U2Eqn(U2, rho2.dimensions()*U2.dimensions()*dimVol/dimTime); + MRF.DDt(U2) ); - const volScalarField dmdt21(posPart(fluid.dmdt())); - const volScalarField dmdt12(negPart(fluid.dmdt())); + const volScalarField dmdt21(posPart(fluid.dmdt(phase1))); + const volScalarField dmdt12(negPart(fluid.dmdt(phase1))); { U1Eqn = diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H index b0c8e46b1..84f1b89b0 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H @@ -303,20 +303,20 @@ while (pimple.correct()) { if (pEqnComp1.valid()) { - pEqnComp1.ref() -= fluid.dmdt()/rho1; + pEqnComp1.ref() -= fluid.dmdt(phase1)/rho1; } else { - pEqnComp1 = fvm::Su(-fluid.dmdt()/rho1, p_rgh); + pEqnComp1 = fvm::Su(-fluid.dmdt(phase1)/rho1, p_rgh); } if (pEqnComp2.valid()) { - pEqnComp2.ref() += fluid.dmdt()/rho2; + pEqnComp2.ref() -= fluid.dmdt(phase2)/rho2; } else { - pEqnComp2 = fvm::Su(fluid.dmdt()/rho2, p_rgh); + pEqnComp2 = fvm::Su(-fluid.dmdt(phase2)/rho2, p_rgh); } } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C index 1ab0d2278..38d041b57 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -174,16 +174,6 @@ bool Foam::twoPhaseSystem::transfersMass() const } -Foam::tmp -Foam::twoPhaseSystem::dmdt() const -{ - return dmdt - ( - phasePairKey(phase1().name(), phase2().name()) - ); -} - - void Foam::twoPhaseSystem::solve() { const Time& runTime = mesh_.time(); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H index 3c4c98f58..b97f8bcf5 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -198,8 +198,7 @@ public: //- Return true if there is mass transfer bool transfersMass() const; - //- Return the interfacial mass flow rate - tmp dmdt() const; + using phaseSystem::dmdt; //- Solve for the phase fractions virtual void solve();