diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C index 2b31bf96c9..519af93eee 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C @@ -63,12 +63,12 @@ Foam::tmp Foam::dragModels::Beetstra::CdRe() const { const volScalarField alpha1 ( - max(interface_.dispersed(), interface_.continuous().residualAlpha()) + max(interface_.dispersed(), interface_.dispersed().residualAlpha()) ); const volScalarField alpha2 ( - max(1 - interface_.dispersed(), interface_.continuous().residualAlpha()) + max(interface_.continuous(), interface_.continuous().residualAlpha()) ); const volScalarField Res(max(alpha2*interface_.Re(), scalar(0))); diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C index 238be2d4d2..dc9ff4e22f 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,13 +63,12 @@ Foam::tmp Foam::dragModels::Gibilaro::CdRe() const { const volScalarField alpha2 ( - max(1 - interface_.dispersed(), interface_.continuous().residualAlpha()) + max(interface_.continuous(), interface_.continuous().residualAlpha()) ); return (4.0/3.0) - *(17.3/alpha2 + 0.336*interface_.Re()) - *max(interface_.continuous(), interface_.continuous().residualAlpha()) + *(17.3/alpha2 + 0.336*interface_.Re())*alpha2 *pow(alpha2, -2.8); } diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C index 97882abe08..96311de47c 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C @@ -64,21 +64,18 @@ Foam::dragModels::GidaspowSchillerNaumann::CdRe() const { const volScalarField alpha2 ( - max(1 - interface_.dispersed(), interface_.continuous().residualAlpha()) + max(interface_.continuous(), interface_.continuous().residualAlpha()) ); - const volScalarField Re(alpha2*interface_.Re()); + const volScalarField Res(alpha2*interface_.Re()); - const volScalarField CdsRe + const volScalarField CdsRes ( - neg(Re - 1000)*24*(1.0 + 0.15*pow(Re, 0.687))/alpha2 - + pos0(Re - 1000)*0.44*Re + neg(Res - 1000)*24*(1.0 + 0.15*pow(Res, 0.687))/alpha2 + + pos0(Res - 1000)*0.44*Res ); - return - CdsRe - *pow(alpha2, -2.65) - *max(interface_.continuous(), interface_.continuous().residualAlpha()); + return CdsRes*pow(alpha2, -1.65); } diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C index 301c022622..e8a59fb8b9 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,7 +63,7 @@ Foam::tmp Foam::dragModels::SyamlalOBrien::CdRe() const { const volScalarField alpha2 ( - max(1 - interface_.dispersed(), interface_.continuous().residualAlpha()) + max(interface_.continuous(), interface_.continuous().residualAlpha()) ); const volScalarField A(pow(alpha2, 4.14)); @@ -82,10 +82,7 @@ Foam::tmp Foam::dragModels::SyamlalOBrien::CdRe() const ); volScalarField CdsRe(sqr(0.63*sqrt(Re) + 4.8*sqrt(Vr))); - return - CdsRe - *max(interface_.continuous(), interface_.continuous().residualAlpha()) - /sqr(Vr); + return CdsRe*alpha2/sqr(Vr); } diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C index 56d1539349..5639f1a1f6 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C @@ -69,7 +69,7 @@ Foam::tmp Foam::dragModels::Tenneti::CdRe() const const volScalarField alpha2 ( - max(1 - interface_.dispersed(), interface_.continuous().residualAlpha()) + max(interface_.continuous(), interface_.continuous().residualAlpha()) ); const volScalarField Res(alpha2*interface_.Re()); diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C index 3a3cd30559..22a4a531b4 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C @@ -63,20 +63,18 @@ Foam::tmp Foam::dragModels::WenYu::CdRe() const { const volScalarField alpha2 ( - max(1 - interface_.dispersed(), interface_.continuous().residualAlpha()) + max(interface_.continuous(), interface_.continuous().residualAlpha()) ); const volScalarField Res(alpha2*interface_.Re()); + const volScalarField CdsRes ( neg(Res - 1000)*24*(1.0 + 0.15*pow(Res, 0.687)) + pos0(Res - 1000)*0.44*Res ); - return - CdsRes - *pow(alpha2, -3.65) - *max(interface_.continuous(), interface_.continuous().residualAlpha()); + return CdsRes*pow(alpha2, -2.65); } diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.C index 3e9691f695..212462f4ff 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.C @@ -68,7 +68,7 @@ Foam::heatTransferModels::Gunn::K(const scalar residualAlpha) const { const volScalarField alpha2 ( - max(1 - interface_.dispersed(), interface_.continuous().residualAlpha()) + max(interface_.continuous(), interface_.continuous().residualAlpha()) ); const volScalarField sqrAlpha2(sqr(alpha2));