From 3761c48e1cdc20e8213df3720e383457415832b5 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Tue, 14 Dec 2021 11:19:23 +0000 Subject: [PATCH] multiphaseEulerFoam: Make aspect ratio models sub-models of force models These models are quite configuration specific. It makes sense to make them sub-models of the force (drag or lift) models that use them, rather than making them fundamental properties of the phase system. --- .../TomiyamaAnalytic/TomiyamaAnalytic.C | 8 ++-- .../TomiyamaAnalytic/TomiyamaAnalytic.H | 8 +++- .../liftModels/TomiyamaLift/TomiyamaLift.C | 11 +++-- .../liftModels/TomiyamaLift/TomiyamaLift.H | 11 ++++- .../virtualMassModels/Lamb/Lamb.C | 8 ++-- .../virtualMassModels/Lamb/Lamb.H | 11 ++++- .../BlendedInterfacialModel.H | 1 - .../phasePair/phasePair/phasePair.C | 47 ++++--------------- .../phasePair/phasePair/phasePair.H | 15 +----- .../phaseSystems/phaseSystem/phaseSystem.C | 20 -------- .../phaseSystems/phaseSystem/phaseSystem.H | 13 ----- .../phaseSystem/phaseSystemTemplates.C | 25 ++-------- .../constant/phaseProperties | 15 ------ .../waterEvaporation/constant/phaseProperties | 15 ------ .../binaryBreakup/constant/phaseProperties | 3 -- .../breakup/constant/phaseProperties | 3 -- .../coalescence/constant/phaseProperties | 3 -- .../drift/constant/phaseProperties | 3 -- .../isothermalGrowth/constant/phaseProperties | 3 -- .../negativeDrift/constant/phaseProperties | 3 -- .../constant/phaseProperties | 3 -- .../waterEvaporation/constant/phaseProperties | 15 ------ .../LES/bubbleColumn/constant/phaseProperties | 15 ------ .../RAS/Grossetete/constant/phaseProperties | 9 ++-- .../RAS/LBend/constant/phaseProperties | 4 -- .../RAS/bubbleColumn/constant/phaseProperties | 15 ------ .../constant/phaseProperties | 15 ------ .../RAS/bubblePipe/constant/phaseProperties | 21 ++------- .../RAS/fluidisedBed/constant/phaseProperties | 3 -- .../RAS/wallBoiling/constant/phaseProperties | 9 ++-- .../wallBoilingIATE/constant/phaseProperties | 9 ++-- .../constant/phaseProperties | 9 ++-- .../constant/phaseProperties | 15 ++++-- .../laminar/bed/constant/phaseProperties | 39 --------------- .../bubbleColumn/constant/phaseProperties | 15 ------ .../constant/phaseProperties | 15 ------ .../constant/phaseProperties | 15 ------ .../bubbleColumnIATE/constant/phaseProperties | 15 ------ .../damBreak4phase/constant/phaseProperties | 3 -- .../fluidisedBed/constant/phaseProperties | 3 -- .../injection/constant/phaseProperties | 15 ------ .../mixerVessel2D/constant/phaseProperties | 3 -- .../mixerVesselAMI2D/constant/phaseProperties | 3 -- .../constant/phasePropertiesAll | 3 -- .../steamInjection/constant/phaseProperties | 9 ---- .../titaniaSynthesis/constant/phaseProperties | 3 -- .../constant/phaseProperties | 3 -- .../trickleBed/constant/phaseProperties | 39 --------------- 48 files changed, 100 insertions(+), 451 deletions(-) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C index 6b2534a3a1..3f22b23db5 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/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-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ License #include "TomiyamaAnalytic.H" #include "phasePair.H" +#include "aspectRatioModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +52,8 @@ Foam::dragModels::TomiyamaAnalytic::TomiyamaAnalytic dragModel(dict, pair, registerObject), residualRe_("residualRe", dimless, dict), residualEo_("residualEo", dimless, dict), - residualE_("residualE", dimless, dict) + residualE_("residualE", dimless, dict), + aspectRatio_(aspectRatioModel::New(dict.subDict("aspectRatio"), pair)) {} @@ -67,7 +69,7 @@ Foam::tmp Foam::dragModels::TomiyamaAnalytic::CdRe() const { const volScalarField Eo(max(pair_.Eo(), residualEo_)); - const volScalarField E(max(pair_.E(), residualE_)); + const volScalarField E(max(aspectRatio_->E(), residualE_)); const volScalarField OmEsq(max(1 - sqr(E), sqr(residualE_))); const volScalarField rtOmEsq(sqrt(OmEsq)); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H index 5bc7f7fa2e..3d9353285c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/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-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,6 +49,9 @@ SourceFiles namespace Foam { + +class aspectRatioModel; + namespace dragModels { @@ -71,6 +74,9 @@ class TomiyamaAnalytic //- Residual aspect ratio const dimensionedScalar residualE_; + //- The aspect ratio model + autoPtr aspectRatio_; + public: diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C index 895fae576c..0630d23358 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ License #include "TomiyamaLift.H" #include "phasePair.H" +#include "aspectRatioModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -47,7 +48,8 @@ Foam::liftModels::TomiyamaLift::TomiyamaLift const phasePair& pair ) : - liftModel(dict, pair) + liftModel(dict, pair), + aspectRatio_(aspectRatioModel::New(dict.subDict("aspectRatio"), pair)) {} @@ -61,7 +63,10 @@ Foam::liftModels::TomiyamaLift::~TomiyamaLift() Foam::tmp Foam::liftModels::TomiyamaLift::Cl() const { - const volScalarField EoH(pair_.EoH2()); + const volScalarField EoH + ( + pair_.Eo(pair_.dispersed().d()/cbrt(aspectRatio_->E())) + ); const volScalarField f ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H index 48ffcbdbdf..9d0a71019a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,6 +54,7 @@ namespace Foam { class phasePair; +class aspectRatioModel; namespace liftModels { @@ -66,6 +67,14 @@ class TomiyamaLift : public liftModel { +private: + + //- Private Data + + //- The aspect ratio model + autoPtr aspectRatio_; + + public: //- Runtime type information diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C index 69db3f57c2..2226040666 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ License #include "Lamb.H" #include "phasePair.H" +#include "aspectRatioModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -53,7 +54,8 @@ Foam::virtualMassModels::Lamb::Lamb const bool registerObject ) : - virtualMassModel(dict, pair, registerObject) + virtualMassModel(dict, pair, registerObject), + aspectRatio_(aspectRatioModel::New(dict.subDict("aspectRatio"), pair)) {} @@ -67,7 +69,7 @@ Foam::virtualMassModels::Lamb::~Lamb() Foam::tmp Foam::virtualMassModels::Lamb::Cvm() const { - volScalarField E(min(max(pair_.E(), small), 1 - small)); + volScalarField E(min(max(aspectRatio_->E(), small), 1 - small)); volScalarField rtOmEsq(sqrt(1 - sqr(E))); return diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H index a495c8c10c..13aad2d80c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,6 +50,7 @@ namespace Foam { class phasePair; +class aspectRatioModel; namespace virtualMassModels { @@ -62,6 +63,14 @@ class Lamb : public virtualMassModel { +private: + + //- Private Data + + //- The aspect ratio model + autoPtr aspectRatio_; + + public: //- Runtime type information diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H index 1c23cc53e8..d81b60c89c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H @@ -36,7 +36,6 @@ SourceFiles #include "blendingMethod.H" #include "phasePair.H" -#include "orderedPhasePair.H" #include "HashPtrTable.H" #include "hashedWordList.H" #include "geometricZeroField.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C index 566d392cbd..d38dc09c18 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C @@ -27,20 +27,6 @@ License #include "phaseSystem.H" #include "surfaceTensionModel.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -Foam::tmp Foam::phasePair::EoH -( - const volScalarField& d -) const -{ - return - mag(dispersed().rho() - continuous().rho()) - *mag(g()) - *sqr(d) - /sigma(); -} - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -138,29 +124,20 @@ Foam::tmp Foam::phasePair::Pr() const Foam::tmp Foam::phasePair::Eo() const { - return EoH(dispersed().d()); + return Eo(dispersed().d()); } -Foam::tmp Foam::phasePair::EoH1() const +Foam::tmp Foam::phasePair::Eo +( + const volScalarField& d +) const { return - EoH - ( - dispersed().d() - *cbrt(1 + 0.163*pow(Eo(), 0.757)) - ); -} - - -Foam::tmp Foam::phasePair::EoH2() const -{ - return - EoH - ( - dispersed().d() - /cbrt(E()) - ); + mag(dispersed().rho() - continuous().rho()) + *mag(g()) + *sqr(d) + /sigma(); } @@ -194,10 +171,4 @@ Foam::tmp Foam::phasePair::Ta() const } -Foam::tmp Foam::phasePair::E() const -{ - return dispersed().fluid().E(*this); -} - - // ************************************************************************* // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H index 0e3d477898..d8fdc4f16b 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H @@ -65,12 +65,6 @@ private: const uniformDimensionedVectorField& g_; - // Private Member Functions - - // Etvos number for given diameter - tmp EoH(const volScalarField& d) const; - - public: // Constructors @@ -120,11 +114,8 @@ public: //- Eotvos number tmp Eo() const; - //- Eotvos number based on hydraulic diameter type 1 - tmp EoH1() const; - - //- Eotvos number based on hydraulic diameter type 2 - tmp EoH2() const; + //- Eotvos number for given diameter + tmp Eo(const volScalarField& d) const; //- Surface tension coefficient tmp sigma() const; @@ -135,8 +126,6 @@ public: //- Takahashi Number tmp Ta() const; - //- Aspect ratio - tmp E() const; // Access diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C index 40ecd68e6f..da59c2aab0 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C @@ -473,7 +473,6 @@ Foam::phaseSystem::phaseSystem // Sub-models generatePairsAndSubModels("surfaceTension", surfaceTensionModels_); - generatePairsAndSubModels("aspectRatio", aspectRatioModels_); // Update motion fields correctKinematics(); @@ -565,25 +564,6 @@ Foam::tmp Foam::phaseSystem::U() const } -Foam::tmp -Foam::phaseSystem::E(const phasePairKey& key) const -{ - if (aspectRatioModels_.found(key)) - { - return aspectRatioModels_[key]->E(); - } - else - { - return volScalarField::New - ( - aspectRatioModel::typeName + ":E", - mesh_, - dimensionedScalar(dimless, 1) - ); - } -} - - Foam::tmp Foam::phaseSystem::sigma(const phasePairKey& key) const { diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H index 054e46557e..7a09ddc06a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H @@ -60,7 +60,6 @@ namespace Foam class blendingMethod; template class BlendedInterfacialModel; class surfaceTensionModel; -class aspectRatioModel; class pressureReference; class nonOrthogonalSolutionControl; @@ -126,15 +125,6 @@ protected: > surfaceTensionModelTable; - typedef - HashTable - < - autoPtr, - phasePairKey, - phasePairKey::hash - > - aspectRatioModelTable; - typedef HashTable cAlphaTable; @@ -190,9 +180,6 @@ protected: //- Surface tension models surfaceTensionModelTable surfaceTensionModels_; - //- Aspect ratio models - aspectRatioModelTable aspectRatioModels_; - //- Flag to indicate that returned lists of fields are "complete"; i.e., // that an absence of force is returned as a constructed list of zeros, diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C index 2f7fae6cdf..63e0341d60 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C @@ -314,33 +314,16 @@ bool Foam::phaseSystem::foundSubModel(const phasePair& key) const if (key.ordered()) { - if (mesh().foundObject(name)) - { - return true; - } - else - { - return false; - } + return mesh().foundObject(name); } else { - if - ( + return mesh().foundObject(name) - || - mesh().foundObject + || mesh().foundObject ( IOobject::groupName(modelType::typeName, key.otherName()) - ) - ) - { - return true; - } - else - { - return false; - } + ); } } diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties index a457cf572c..ecc76ee596 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties @@ -56,21 +56,6 @@ surfaceTension } ); -aspectRatio -( - (gas in liquid) - { - type constant; - E0 1.0; - } - - (liquid in gas) - { - type constant; - E0 1.0; - } -); - drag ( ); diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties index af62e709be..b00deb37e8 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties @@ -55,21 +55,6 @@ surfaceTension } ); -aspectRatio -( - (gas in liquid) - { - type constant; - E0 1.0; - } - - (liquid in gas) - { - type constant; - E0 1.0; - } -); - drag ( ); diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties index 0863b794c4..a1e218e20e 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties @@ -158,9 +158,6 @@ surfaceTension interfaceCompression (); -aspectRatio -(); - drag (); diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties index b5f40e8c8b..22ee569ea2 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties @@ -159,9 +159,6 @@ surfaceTension interfaceCompression (); -aspectRatio -(); - drag (); diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties index 7d58ce9650..c96335eda9 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties @@ -201,9 +201,6 @@ surfaceTension interfaceCompression (); -aspectRatio -(); - drag (); diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties index 117a472e26..7b0fe27bfe 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties @@ -124,9 +124,6 @@ surfaceTension interfaceCompression (); -aspectRatio -(); - drag (); diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties index d4347e3832..9f4edcb0c2 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties @@ -128,9 +128,6 @@ populationBalanceCoeffs } } -aspectRatio -(); - blending { default diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties index 47c78b62a7..186d137137 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties @@ -124,9 +124,6 @@ surfaceTension interfaceCompression (); -aspectRatio -(); - drag (); diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties index fe564f20e3..b04eb33648 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties @@ -164,9 +164,6 @@ surfaceTension interfaceCompression (); -aspectRatio -(); - drag (); diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties index 04b544027c..2adf22fc1e 100644 --- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties @@ -65,21 +65,6 @@ saturation } ); -aspectRatio -( - (steam in water) - { - type constant; - E0 1.0; - } - - (water in steam) - { - type constant; - E0 1.0; - } -); - drag ( ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/constant/phaseProperties index 56ba4bfdf2..b615805fb6 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/constant/phaseProperties @@ -73,21 +73,6 @@ surfaceTension } ); -aspectRatio -( - (air in water) - { - type constant; - E0 1.0; - } - - (water in air) - { - type constant; - E0 1.0; - } -); - drag ( (air in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties index 08bacadb79..04b7cc237d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties @@ -83,6 +83,12 @@ lift { type Tomiyama; Cl 0.288; + + aspectRatio + { + type constant; + E0 1; + } } wallDamping @@ -122,9 +128,6 @@ blending } } -aspectRatio -(); - surfaceTension ( (gas and liquid) diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties index 4cf2ccd906..06ab4d5f4a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties @@ -63,10 +63,6 @@ surfaceTension } ); -aspectRatio -( -); - drag ( (solids in gas) diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties index 56ba4bfdf2..b615805fb6 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties @@ -73,21 +73,6 @@ surfaceTension } ); -aspectRatio -( - (air in water) - { - type constant; - E0 1.0; - } - - (water in air) - { - type constant; - E0 1.0; - } -); - drag ( (air in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties index 882a887be7..0f9b0d3376 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties @@ -78,21 +78,6 @@ surfaceTension } ); -aspectRatio -( - (gas in liquid) - { - type constant; - E0 1.0; - } - - (liquid in gas) - { - type constant; - E0 1.0; - } -); - drag ( (gas in liquid) diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties index cd25aca93d..0f8a292c6f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties @@ -141,19 +141,6 @@ surfaceTension interfaceCompression (); -aspectRatio -( - (air1 in water) - { - type Wellek; - } - - (air2 in water) - { - type Wellek; - } -); - drag ( (air1 in water) @@ -216,9 +203,9 @@ lift { type Tomiyama; - swarmCorrection + aspectRatio { - type none; + type Wellek; } } } @@ -237,9 +224,9 @@ lift { type Tomiyama; - swarmCorrection + aspectRatio { - type none; + type Wellek; } } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties index dbd2faf114..0718fe0944 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties @@ -65,9 +65,6 @@ surfaceTension } ); -aspectRatio -(); - interfaceCompression (); diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties index 482235fe26..1ee12e56f3 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties @@ -92,6 +92,12 @@ lift { type Tomiyama; Cl 0.288; + + aspectRatio + { + type constant; + E0 1; + } } wallDamping @@ -132,9 +138,6 @@ blending } } -aspectRatio -(); - saturation ( (gas and liquid) diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties index 5cdad9d7da..42b8d158be 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties @@ -132,6 +132,12 @@ lift { type Tomiyama; Cl 0.288; + + aspectRatio + { + type constant; + E0 1; + } } wallDamping @@ -172,9 +178,6 @@ blending } } -aspectRatio -(); - saturation ( (gas and liquid) diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties index 0a3410543f..a257c26f31 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties @@ -175,6 +175,12 @@ lift { type Tomiyama; Cl 0.288; + + aspectRatio + { + type constant; + E0 1; + } } wallDamping @@ -215,9 +221,6 @@ blending } } -aspectRatio -(); - saturation ( (gas and liquid) diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties index 63b8f525dc..0240e7c767 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties @@ -232,6 +232,12 @@ lift { type Tomiyama; Cl 0.288; + + aspectRatio + { + type constant; + E0 1; + } } wallDamping @@ -250,6 +256,12 @@ lift { type Tomiyama; Cl 0.288; + + aspectRatio + { + type constant; + E0 1; + } } wallDamping @@ -304,9 +316,6 @@ blending } } -aspectRatio -(); - saturation ( (gas and liquid) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties index 484f973a3e..331bed4948 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties @@ -90,45 +90,6 @@ surfaceTension } ); -aspectRatio -( - (air in water) - { - type constant; - E0 1.0; - } - - (water in air) - { - type constant; - E0 1.0; - } - - (air in solid) - { - type constant; - E0 1.0; - } - - (solid in air) - { - type constant; - E0 1.0; - } - - (water in solid) - { - type constant; - E0 1.0; - } - - (solid in water) - { - type constant; - E0 1.0; - } -); - drag ( (air in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties index d72a2bf7a1..c661acbb91 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties @@ -78,21 +78,6 @@ surfaceTension interfaceCompression (); -aspectRatio -( - (air in water) - { - type constant; - E0 1.0; - } - - (water in air) - { - type constant; - E0 1.0; - } -); - drag ( (air in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties index 227de941e5..fd9b537ac5 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties @@ -78,21 +78,6 @@ surfaceTension } ); -aspectRatio -( - (gas in liquid) - { - type constant; - E0 1.0; - } - - (liquid in gas) - { - type constant; - E0 1.0; - } -); - drag ( (gas in liquid) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties index de54db3673..38cfbabfc5 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties @@ -78,21 +78,6 @@ surfaceTension } ); -aspectRatio -( - (gas in liquid) - { - type constant; - E0 1.0; - } - - (liquid in gas) - { - type constant; - E0 1.0; - } -); - drag ( (gas in liquid) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties index 899da89194..d73e0b74d3 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties @@ -95,21 +95,6 @@ surfaceTension } ); -aspectRatio -( - (air in water) - { - type constant; - E0 1.0; - } - - (water in air) - { - type constant; - E0 1.0; - } -); - drag ( (air in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties index f8c8618fb9..b0369c4fca 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties @@ -124,9 +124,6 @@ interfaceCompression (oil and mercury) 1 ); -aspectRatio -(); - drag ( (air and water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties index 15f8e113d2..c7c254c2f6 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties @@ -61,9 +61,6 @@ surfaceTension } ); -aspectRatio -(); - drag ( (particles in air) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/phaseProperties index 02ba3ef48c..af0f94ec8e 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/phaseProperties @@ -73,21 +73,6 @@ surfaceTension } ); -aspectRatio -( - (air in water) - { - type constant; - E0 1.0; - } - - (water in air) - { - type constant; - E0 1.0; - } -); - drag ( (air in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties index 81f15d8c5b..fa1ce85eae 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties @@ -139,9 +139,6 @@ interfaceCompression (oil and mercury) 1 ); -aspectRatio -(); - drag ( (air in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phaseProperties index 257e35398b..b6e4b5dec5 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phaseProperties @@ -140,9 +140,6 @@ interfaceCompression (oil and mercury) 1 ); -aspectRatio -(); - drag ( (air in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phasePropertiesAll b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phasePropertiesAll index 52ba2ca656..496b646f7a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phasePropertiesAll +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phasePropertiesAll @@ -139,9 +139,6 @@ interfaceCompression (oil and mercury) 1 ); -aspectRatio -(); - drag ( (air in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties index 23392f2646..0192adcd62 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties @@ -73,15 +73,6 @@ saturation } ); -aspectRatio -( - (steam in water) - { - type constant; - E0 1.0; - } -); - drag ( (steam in water) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties index 09943db053..44677312be 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties @@ -147,9 +147,6 @@ interfaceCompression surfaceTension (); -aspectRatio -(); - drag ( (particles in vapor) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties index b5d03502c7..bbea434966 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties @@ -159,9 +159,6 @@ interfaceCompression surfaceTension (); -aspectRatio -(); - drag ( (particles in vapor) diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties index 94f7d3b9e3..55be4da384 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties @@ -85,45 +85,6 @@ surfaceTension } ); -aspectRatio -( - (air in water) - { - type constant; - E0 1.0; - } - - (water in air) - { - type constant; - E0 1.0; - } - - (air in solid) - { - type constant; - E0 1.0; - } - - (solid in air) - { - type constant; - E0 1.0; - } - - (water in solid) - { - type constant; - E0 1.0; - } - - (solid in water) - { - type constant; - E0 1.0; - } -); - drag ( (air and water)