diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C index d458db7d63..2b31bf96c9 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,8 +47,7 @@ Foam::dragModels::Beetstra::Beetstra const bool registerObject ) : - dispersedDragModel(dict, interface, registerObject), - residualRe_("residualRe", dimless, dict.lookup("residualRe")) + dispersedDragModel(dict, interface, registerObject) {} @@ -72,13 +71,7 @@ Foam::tmp Foam::dragModels::Beetstra::CdRe() const max(1 - interface_.dispersed(), interface_.continuous().residualAlpha()) ); - const volScalarField Res(alpha2*interface_.Re()); - - const volScalarField ResLim - ( - "ReLim", - max(Res, residualRe_) - ); + const volScalarField Res(max(alpha2*interface_.Re(), scalar(0))); const volScalarField F0 ( @@ -90,8 +83,8 @@ Foam::tmp Foam::dragModels::Beetstra::CdRe() const ( "F1", 0.413*Res/(24*sqr(alpha2))*(1.0/alpha2 - + 3*alpha1*alpha2 + 8.4*pow(ResLim, -0.343)) - /(1 + pow(10.0, 3*alpha1)*pow(ResLim, -(1 + 4*alpha1)/2.0)) + + 3*alpha1*alpha2 + 8.4*pow(Res, -0.343)) + /(1 + pow(10.0, 3*alpha1)*pow(Res, -(1 + 4*alpha1)/2.0)) ); return 24*alpha2*(F0 + F1); diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.H index 94e281fee8..76fe74f784 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.H +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,11 +62,6 @@ class Beetstra : public dispersedDragModel { - // Private Data - - //- Residual Reynolds Number - const dimensionedScalar residualRe_; - public: diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C index 693e2ac641..97882abe08 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.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 @@ -47,8 +47,7 @@ Foam::dragModels::GidaspowSchillerNaumann::GidaspowSchillerNaumann const bool registerObject ) : - dispersedDragModel(dict, interface, registerObject), - residualRe_("residualRe", dimless, dict) + dispersedDragModel(dict, interface, registerObject) {} @@ -73,7 +72,7 @@ Foam::dragModels::GidaspowSchillerNaumann::CdRe() const const volScalarField CdsRe ( neg(Re - 1000)*24*(1.0 + 0.15*pow(Re, 0.687))/alpha2 - + pos0(Re - 1000)*0.44*max(Re, residualRe_) + + pos0(Re - 1000)*0.44*Re ); return diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H index 81c7a91a32..781ba1c9d5 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H @@ -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 @@ -65,11 +65,6 @@ class GidaspowSchillerNaumann : public dispersedDragModel { - // Private Data - - //- Residual Reynolds Number - const dimensionedScalar residualRe_; - public: diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C index b64ddfa164..1e8c74c202 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.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 @@ -47,8 +47,7 @@ Foam::dragModels::SchillerNaumann::SchillerNaumann const bool registerObject ) : - dispersedDragModel(dict, interface, registerObject), - residualRe_("residualRe", dimless, dict) + dispersedDragModel(dict, interface, registerObject) {} @@ -62,11 +61,11 @@ Foam::dragModels::SchillerNaumann::~SchillerNaumann() Foam::tmp Foam::dragModels::SchillerNaumann::CdRe() const { - volScalarField Re(interface_.Re()); + const volScalarField Re(interface_.Re()); return neg(Re - 1000)*24*(1.0 + 0.15*pow(Re, 0.687)) - + pos0(Re - 1000)*0.44*max(Re, residualRe_); + + pos0(Re - 1000)*0.44*Re; } diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H index 67828f02ea..e253c9f1f6 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H @@ -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 @@ -52,11 +52,6 @@ class SchillerNaumann : public dispersedDragModel { - // Private Data - - //- Residual Reynolds Number - const dimensionedScalar residualRe_; - public: diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C index 813689a96f..56d1539349 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,8 +48,7 @@ Foam::dragModels::Tenneti::Tenneti const bool registerObject ) : - dispersedDragModel(dict, interface, registerObject), - residualRe_("residualRe", dimless, dict.lookup("residualRe")) + dispersedDragModel(dict, interface, registerObject) {} @@ -78,7 +77,7 @@ Foam::tmp Foam::dragModels::Tenneti::CdRe() const const volScalarField CdReIsolated ( neg(Res - 1000)*24*(1 + 0.15*pow(Res, 0.687)) - + pos0(Res - 1000)*0.44*max(Res, residualRe_) + + pos0(Res - 1000)*0.44*Res ); const volScalarField F0 diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.H index 2825d14764..c98adfb3ec 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.H +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,11 +64,6 @@ class Tenneti : public dispersedDragModel { - // Private Data - - //- Residual Reynolds Number - const dimensionedScalar residualRe_; - public: diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C index fdbc0be7ac..de7d4d8779 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,6 @@ Foam::dragModels::TomiyamaAnalytic::TomiyamaAnalytic ) : dispersedDragModel(dict, interface, registerObject), - residualRe_("residualRe", dimless, dict), residualEo_("residualEo", dimless, dict), residualE_("residualE", dimless, dict), aspectRatio_(aspectRatioModel::New(dict.subDict("aspectRatio"), interface)) @@ -77,13 +76,8 @@ Foam::dragModels::TomiyamaAnalytic::CdRe() const return (8.0/3.0) - *Eo - /( - Eo*pow(E, 2.0/3.0)/OmEsq - + 16*pow(E, 4.0/3.0) - ) - /sqr(F) - *max(interface_.Re(), residualRe_); + *Eo/(Eo*pow(E, 2.0/3.0)/OmEsq + 16*pow(E, 4.0/3.0))/sqr(F) + *interface_.Re(); } diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H index 36654ab1fd..54c74b953a 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,9 +65,6 @@ class TomiyamaAnalytic { // Private Data - //- Residual Reynolds Number - const dimensionedScalar residualRe_; - //- Residual Eotvos number const dimensionedScalar residualEo_; diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C index 990153a638..52e20882b2 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,9 +52,7 @@ Foam::dragModels::TomiyamaKataokaZunSakaguchi::TomiyamaKataokaZunSakaguchi const bool registerObject ) : - dispersedDragModel(dict, interface, registerObject), - residualRe_("residualRe", dimless, dict), - residualEo_("residualEo", dimless, dict) + dispersedDragModel(dict, interface, registerObject) {} @@ -69,16 +67,10 @@ Foam::dragModels::TomiyamaKataokaZunSakaguchi::~TomiyamaKataokaZunSakaguchi() Foam::tmp Foam::dragModels::TomiyamaKataokaZunSakaguchi::CdRe() const { - volScalarField Re(interface_.Re()); - volScalarField Eo(max(interface_.Eo(), residualEo_)); + const volScalarField Re(interface_.Re()); + const volScalarField Eo(interface_.Eo()); - return - max - ( - 24*(1 + 0.15*pow(Re, 0.687))/max(Re, residualRe_), - 8*Eo/(3*(Eo + 4.0)) - ) - *max(interface_.Re(), residualRe_); + return max(24*(1 + 0.15*pow(Re, 0.687)), 8*Eo*Re/(3*(Eo + 4.0))); } diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H index a82b9cdb15..cff6ad08e2 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,14 +61,6 @@ class TomiyamaKataokaZunSakaguchi : public dispersedDragModel { - // Private Data - - //- Residual Reynolds Number - const dimensionedScalar residualRe_; - - //- Residual Eotvos number - const dimensionedScalar residualEo_; - public: diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C index 9dba43459a..3a3cd30559 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.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 @@ -47,8 +47,7 @@ Foam::dragModels::WenYu::WenYu const bool registerObject ) : - dispersedDragModel(dict, interface, registerObject), - residualRe_("residualRe", dimless, dict) + dispersedDragModel(dict, interface, registerObject) {} @@ -71,7 +70,7 @@ Foam::tmp Foam::dragModels::WenYu::CdRe() const const volScalarField CdsRes ( neg(Res - 1000)*24*(1.0 + 0.15*pow(Res, 0.687)) - + pos0(Res - 1000)*0.44*max(Res, residualRe_) + + pos0(Res - 1000)*0.44*Res ); return diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H index b2239e2110..7cf836fe20 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H @@ -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 @@ -60,11 +60,6 @@ class WenYu : public dispersedDragModel { - // Private Data - - //- Residual Reynolds Number - const dimensionedScalar residualRe_; - public: diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C index df030f7739..8150831697 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,28 +67,17 @@ Foam::tmp Foam::liftModels::LegendreMagnaudet::Cl() const const volScalarField Sr ( sqr(interface_.dispersed().d()) - /( - Re - *interface_.continuous().thermo().nu() - ) + /(Re*interface_.continuous().thermo().nu()) *mag(fvc::grad(interface_.continuous().U())) ); const volScalarField ClLowSqr ( - sqr(6*2.255) - *sqr(Sr) - /( - pow4(constant::mathematical::pi) - *Re - *pow3(Sr + 0.2*Re) - ) + sqr(6*2.255)*sqr(Sr) + /(pow4(constant::mathematical::pi)*Re*pow3(Sr + 0.2*Re)) ); - const volScalarField ClHighSqr - ( - sqr(0.5*(Re + 16)/(Re + 29)) - ); + const volScalarField ClHighSqr(sqr(0.5*(Re + 16)/(Re + 29))); return sqrt(ClLowSqr + ClHighSqr); } diff --git a/tutorials/modules/CHT/multiphaseCoolingCylinder2D/constant/fluid/phaseProperties b/tutorials/modules/CHT/multiphaseCoolingCylinder2D/constant/fluid/phaseProperties index 5e716ad467..4970af6b8b 100644 --- a/tutorials/modules/CHT/multiphaseCoolingCylinder2D/constant/fluid/phaseProperties +++ b/tutorials/modules/CHT/multiphaseCoolingCylinder2D/constant/fluid/phaseProperties @@ -78,13 +78,11 @@ drag oil_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; } oil_segregatedWith_water diff --git a/tutorials/modules/multiphaseEuler/LBend/constant/phaseProperties b/tutorials/modules/multiphaseEuler/LBend/constant/phaseProperties index 529d07c538..c8598e088a 100644 --- a/tutorials/modules/multiphaseEuler/LBend/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/LBend/constant/phaseProperties @@ -65,8 +65,6 @@ drag solids_dispersedIn_gas { type GidaspowErgunWenYu; - residualAlpha 1e-5; - residualRe 1e-5; } } diff --git a/tutorials/modules/multiphaseEuler/bed/constant/phaseProperties b/tutorials/modules/multiphaseEuler/bed/constant/phaseProperties index 7d54311587..fa1216edf3 100644 --- a/tutorials/modules/multiphaseEuler/bed/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/bed/constant/phaseProperties @@ -94,7 +94,6 @@ drag air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_water @@ -107,7 +106,6 @@ drag water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_water_displacedBy_solid diff --git a/tutorials/modules/multiphaseEuler/bubbleColumn/constant/phaseProperties b/tutorials/modules/multiphaseEuler/bubbleColumn/constant/phaseProperties index 37591bb5c4..2941873a31 100644 --- a/tutorials/modules/multiphaseEuler/bubbleColumn/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/bubbleColumn/constant/phaseProperties @@ -78,13 +78,11 @@ drag air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_water diff --git a/tutorials/modules/multiphaseEuler/bubbleColumnEvaporating/constant/phaseProperties b/tutorials/modules/multiphaseEuler/bubbleColumnEvaporating/constant/phaseProperties index 34b9d94444..cd16a28d28 100644 --- a/tutorials/modules/multiphaseEuler/bubbleColumnEvaporating/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/bubbleColumnEvaporating/constant/phaseProperties @@ -83,13 +83,11 @@ drag gas_dispersedIn_liquid { type SchillerNaumann; - residualRe 1e-3; } liquid_dispersedIn_gas { type SchillerNaumann; - residualRe 1e-3; } } diff --git a/tutorials/modules/multiphaseEuler/bubbleColumnEvaporatingDissolving/constant/phaseProperties b/tutorials/modules/multiphaseEuler/bubbleColumnEvaporatingDissolving/constant/phaseProperties index 1d1fb31836..226c1a3961 100644 --- a/tutorials/modules/multiphaseEuler/bubbleColumnEvaporatingDissolving/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/bubbleColumnEvaporatingDissolving/constant/phaseProperties @@ -83,13 +83,11 @@ drag gas_dispersedIn_liquid { type SchillerNaumann; - residualRe 1e-3; } liquid_dispersedIn_gas { type SchillerNaumann; - residualRe 1e-3; } } diff --git a/tutorials/modules/multiphaseEuler/bubbleColumnEvaporatingReacting/constant/phaseProperties b/tutorials/modules/multiphaseEuler/bubbleColumnEvaporatingReacting/constant/phaseProperties index 0861896945..a507da1678 100644 --- a/tutorials/modules/multiphaseEuler/bubbleColumnEvaporatingReacting/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/bubbleColumnEvaporatingReacting/constant/phaseProperties @@ -83,13 +83,11 @@ drag gas_dispersedIn_liquid { type SchillerNaumann; - residualRe 1e-3; } liquid_dispersedIn_gas { type SchillerNaumann; - residualRe 1e-3; } } diff --git a/tutorials/modules/multiphaseEuler/bubbleColumnIATE/constant/phaseProperties b/tutorials/modules/multiphaseEuler/bubbleColumnIATE/constant/phaseProperties index 6cf05a8679..43d895fb96 100644 --- a/tutorials/modules/multiphaseEuler/bubbleColumnIATE/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/bubbleColumnIATE/constant/phaseProperties @@ -100,13 +100,11 @@ drag air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_water diff --git a/tutorials/modules/multiphaseEuler/bubbleColumnLES/constant/phaseProperties b/tutorials/modules/multiphaseEuler/bubbleColumnLES/constant/phaseProperties index 0b86ae31c8..0c1b23f188 100644 --- a/tutorials/modules/multiphaseEuler/bubbleColumnLES/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/bubbleColumnLES/constant/phaseProperties @@ -78,13 +78,11 @@ drag air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_water diff --git a/tutorials/modules/multiphaseEuler/bubbleColumnLaminar/constant/phaseProperties b/tutorials/modules/multiphaseEuler/bubbleColumnLaminar/constant/phaseProperties index ff0107f8a6..fd9cec4ba5 100644 --- a/tutorials/modules/multiphaseEuler/bubbleColumnLaminar/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/bubbleColumnLaminar/constant/phaseProperties @@ -83,13 +83,11 @@ drag air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_water diff --git a/tutorials/modules/multiphaseEuler/bubblePipe/constant/phaseProperties b/tutorials/modules/multiphaseEuler/bubblePipe/constant/phaseProperties index b9bbdcb296..ede99d3695 100644 --- a/tutorials/modules/multiphaseEuler/bubblePipe/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/bubblePipe/constant/phaseProperties @@ -141,13 +141,11 @@ drag air1_dispersedIn_water { type IshiiZuber; - residualRe 1e-3; } air2_dispersedIn_water { type IshiiZuber; - residualRe 1e-3; } } diff --git a/tutorials/modules/multiphaseEuler/fluidisedBed/constant/phaseProperties b/tutorials/modules/multiphaseEuler/fluidisedBed/constant/phaseProperties index ac958d710b..85eef60cf6 100644 --- a/tutorials/modules/multiphaseEuler/fluidisedBed/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/fluidisedBed/constant/phaseProperties @@ -63,7 +63,6 @@ drag particles_dispersedIn_air { type GidaspowErgunWenYu; - residualRe 1e-3; } } diff --git a/tutorials/modules/multiphaseEuler/fluidisedBedLaminar/constant/phaseProperties b/tutorials/modules/multiphaseEuler/fluidisedBedLaminar/constant/phaseProperties index 9fc015f873..f6874d9cd0 100644 --- a/tutorials/modules/multiphaseEuler/fluidisedBedLaminar/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/fluidisedBedLaminar/constant/phaseProperties @@ -62,7 +62,6 @@ drag particles_dispersedIn_air { type GidaspowErgunWenYu; - residualRe 1e-3; } } diff --git a/tutorials/modules/multiphaseEuler/injection/constant/phaseProperties b/tutorials/modules/multiphaseEuler/injection/constant/phaseProperties index 68a04c6f89..721ac8bc75 100644 --- a/tutorials/modules/multiphaseEuler/injection/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/injection/constant/phaseProperties @@ -78,13 +78,11 @@ drag air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_water diff --git a/tutorials/modules/multiphaseEuler/mixerVessel2D/constant/phaseProperties b/tutorials/modules/multiphaseEuler/mixerVessel2D/constant/phaseProperties index 744051126d..3f0939d6b8 100644 --- a/tutorials/modules/multiphaseEuler/mixerVessel2D/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/mixerVessel2D/constant/phaseProperties @@ -150,13 +150,11 @@ drag air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_water @@ -169,13 +167,11 @@ drag air_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; } oil_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_oil @@ -188,13 +184,11 @@ drag air_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; } mercury_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_mercury @@ -207,13 +201,11 @@ drag water_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; } oil_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_segregatedWith_oil @@ -226,13 +218,11 @@ drag water_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; } mercury_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_segregatedWith_mercury @@ -245,13 +235,11 @@ drag oil_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; } mercury_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; } oil_segregatedWith_mercury diff --git a/tutorials/modules/multiphaseEuler/mixerVessel2DMRF/constant/phaseProperties b/tutorials/modules/multiphaseEuler/mixerVessel2DMRF/constant/phaseProperties index 1d6fe92d5a..17f88a5cc9 100644 --- a/tutorials/modules/multiphaseEuler/mixerVessel2DMRF/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/mixerVessel2DMRF/constant/phaseProperties @@ -149,13 +149,11 @@ drag air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_water @@ -168,13 +166,11 @@ drag air_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; } oil_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_oil @@ -187,13 +183,11 @@ drag air_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; } mercury_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; } air_segregatedWith_mercury @@ -206,13 +200,11 @@ drag water_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; } oil_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_segregatedWith_oil @@ -225,13 +217,11 @@ drag water_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; } mercury_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } water_segregatedWith_mercury @@ -244,13 +234,11 @@ drag oil_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; } mercury_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; } oil_segregatedWith_mercury diff --git a/tutorials/modules/multiphaseEuler/pipeBend/constant/phaseProperties b/tutorials/modules/multiphaseEuler/pipeBend/constant/phaseProperties index 785868243a..63608e7da2 100644 --- a/tutorials/modules/multiphaseEuler/pipeBend/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/pipeBend/constant/phaseProperties @@ -136,7 +136,6 @@ drag particles_dispersedIn_water { type WenYu; - residualRe 1e-3; } } @@ -172,7 +171,6 @@ turbulentDispersion particles_dispersedIn_water { type Burns; - residualRe 1e-3; sigma 1; } } diff --git a/tutorials/modules/multiphaseEuler/steamInjection/constant/phaseProperties b/tutorials/modules/multiphaseEuler/steamInjection/constant/phaseProperties index c5c9838457..027ba2c78e 100644 --- a/tutorials/modules/multiphaseEuler/steamInjection/constant/phaseProperties +++ b/tutorials/modules/multiphaseEuler/steamInjection/constant/phaseProperties @@ -73,7 +73,6 @@ drag steam_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; } }