diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C index 83b1dee2ff..b76d90e390 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C @@ -35,6 +35,8 @@ namespace Foam defineRunTimeSelectionTable(dragModel, dictionary); } +const Foam::dimensionSet Foam::dragModel::dimK(1, -3, -1, 0, 0); + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index 43409d2927..abaed5c530 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -93,6 +93,12 @@ public: ); + // Static data members + + //- Coefficient dimensions + static const dimensionSet dimK; + + // Constructors // Construct without residual constants diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C index 71eeb7620a..b04b6a0c10 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C @@ -34,6 +34,8 @@ namespace Foam defineRunTimeSelectionTable(heatTransferModel, dictionary); } +const Foam::dimensionSet Foam::heatTransferModel::dimK(1, -1, -3, -1, 0); + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H index b7cc4f917f..3d4c9dec68 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H @@ -80,6 +80,12 @@ public: ); + // Static data members + + //- Coefficient dimensions + static const dimensionSet dimK; + + // Constructors //- Construct froma dictionary and a phase pair diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C index 67c19b6876..6cd5e02471 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C @@ -35,6 +35,8 @@ namespace Foam defineRunTimeSelectionTable(liftModel, dictionary); } +const Foam::dimensionSet Foam::liftModel::dimF(1, -2, -2, 0, 0); + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H index fe6581b2b1..d20d43216b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H @@ -81,6 +81,12 @@ public: ); + // Static data members + + //- Force dimensions + static const dimensionSet dimF; + + // Constructors //- Construct from a dictionary and a phase pair diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C index 2b71f89fee..7d11722bab 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C @@ -34,6 +34,8 @@ namespace Foam defineRunTimeSelectionTable(turbulentDispersionModel, dictionary); } +const Foam::dimensionSet Foam::turbulentDispersionModel::dimF(1, -2, -2, 0, 0); + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H index 19359079ea..b689033476 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H @@ -80,6 +80,11 @@ public: (dict, pair) ); + // Static data members + + //- Force dimensions + static const dimensionSet dimF; + // Constructors diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C index 43973243ef..ffdfb44a83 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C @@ -34,6 +34,8 @@ namespace Foam defineRunTimeSelectionTable(virtualMassModel, dictionary); } +const Foam::dimensionSet Foam::virtualMassModel::dimK(dimDensity); + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H index e97aec16be..90222e8f67 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H @@ -83,6 +83,12 @@ public: ); + // Static data members + + //- Coefficient dimensions + static const dimensionSet dimK; + + // Constructors //- Construct from a dictionary and a phase pair diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C index 0dbedbf020..593516e4ff 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C @@ -26,6 +26,8 @@ License #include "wallLubricationModel.H" #include "phasePair.H" +const Foam::dimensionSet Foam::wallLubricationModel::dimF(1, -2, -2, 0, 0); + // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H index e246ac9f22..ee2341970e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H @@ -84,6 +84,12 @@ public: ); + // Static data members + + //- Coefficient dimensions + static const dimensionSet dimF; + + // Constructors //- Construct from components diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C index 809d177d1a..e077870cb9 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -66,30 +66,6 @@ Foam::BlendedInterfacialModel::BlendedInterfacialModel pair_(pair), pair1In2_(pair1In2), pair2In1_(pair2In1), - model_ - ( - modelType::New - ( - modelTable[pair_], - pair_ - ) - ), - model1In2_ - ( - modelType::New - ( - modelTable[pair1In2_], - pair1In2_ - ) - ), - model2In1_ - ( - modelType::New - ( - modelTable[pair2In1_], - pair2In1_ - ) - ), blending_ ( blendingMethod::New @@ -105,7 +81,43 @@ Foam::BlendedInterfacialModel::BlendedInterfacialModel dimless, blendingDict.lookup("residualAlpha") ) -{} +{ + if (modelTable.found(pair_)) + { + model_.set + ( + modelType::New + ( + modelTable[pair_], + pair_ + ).ptr() + ); + } + + if (modelTable.found(pair1In2_)) + { + model1In2_.set + ( + modelType::New + ( + modelTable[pair1In2_], + pair1In2_ + ).ptr() + ); + } + + if (modelTable.found(pair2In1_)) + { + model2In1_.set + ( + modelType::New + ( + modelTable[pair2In1_], + pair2In1_ + ).ptr() + ); + } +} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // @@ -121,21 +133,56 @@ template Foam::tmp Foam::BlendedInterfacialModel::K() const { - tmp f1(blending_->f1()); - tmp f2(blending_->f2()); + tmp f1, f2; - tmp c + if (model_.valid() || model1In2_.valid()) + { + f1 = blending_->f1(); + } + + if (model_.valid() || model2In1_.valid()) + { + f2 = blending_->f2(); + } + + tmp x ( - model_->K()*(f1() - f2()) - + model1In2_->K()*(1 - f1) - + model2In1_->K()*f2 + new volScalarField + ( + IOobject + ( + modelType::typeName + "Coeff", + pair_.phase1().mesh().time().timeName(), + pair_.phase1().mesh() + ), + pair_.phase1().mesh(), + dimensionedScalar("zero", modelType::dimK, 0) + ) ); - c() *= max(pair_.phase1()*pair_.phase2(), residualAlpha_); + if (model_.valid()) + { + x() += model_->K()*(f1() - f2()); + } - correctFixedFluxBCs(c()); + if (model1In2_.valid()) + { + x() += model1In2_->K()*(1 - f1); + } - return c; + if (model2In1_.valid()) + { + x() += model2In1_->K()*f2; + } + + if (model_.valid() || model1In2_.valid() || model2In1_.valid()) + { + x() *= max(pair_.phase1()*pair_.phase2(), residualAlpha_); + + correctFixedFluxBCs(x()); + } + + return x; } @@ -144,19 +191,54 @@ template Foam::tmp > Foam::BlendedInterfacialModel::F() const { - tmp f1(blending_->f1()); - tmp f2(blending_->f2()); + tmp f1, f2; - tmp > v + if (model_.valid() || model1In2_.valid()) + { + f1 = blending_->f1(); + } + + if (model_.valid() || model2In1_.valid()) + { + f2 = blending_->f2(); + } + + tmp > x ( - model_->F()*(f1() - f2()) - + model1In2_->F()*(1 - f1) - - model2In1_->F()*f2 + new GeometricField + ( + IOobject + ( + modelType::typeName + "Coeff", + pair_.phase1().mesh().time().timeName(), + pair_.phase1().mesh() + ), + pair_.phase1().mesh(), + dimensioned("zero", modelType::dimF, pTraits::zero) + ) ); - correctFixedFluxBCs(v()); + if (model_.valid()) + { + x() += model_->F()*(f1() - f2()); + } - return v; + if (model1In2_.valid()) + { + x() += model1In2_->F()*(1 - f1); + } + + if (model2In1_.valid()) + { + x() -= model2In1_->F()*f2; // note : subtraction + } + + if (model_.valid() || model1In2_.valid() || model2In1_.valid()) + { + correctFixedFluxBCs(x()); + } + + return x; } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H index a5c81e26bf..acc66085bc 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H @@ -38,6 +38,8 @@ SourceFiles #include "phasePair.H" #include "orderedPhasePair.H" +#include "geometricZeroField.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -50,6 +52,8 @@ namespace Foam template class BlendedInterfacialModel { +private: + // Private data //- Unordered phase pair diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C index fc0c2cbbbe..808208ea99 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C @@ -37,16 +37,20 @@ Foam::orderedPhasePair::orderedPhasePair const dictTable& aspectRatioTable ) : - phasePair(dispersed, continuous, g, sigmaTable, true), - aspectRatio_ - ( - aspectRatioModel::New + phasePair(dispersed, continuous, g, sigmaTable, true) +{ + if (aspectRatioTable.found(*this)) + { + aspectRatio_.set ( - aspectRatioTable[*this], - *this - ) - ) -{} + aspectRatioModel::New + ( + aspectRatioTable[*this], + *this + ).ptr() + ); + } +} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // @@ -79,6 +83,13 @@ Foam::word Foam::orderedPhasePair::name() const Foam::tmp Foam::orderedPhasePair::E() const { + if (!aspectRatio_.valid()) + { + FatalErrorIn("Foam::orderedPhasePair::E() const") + << "Aspect ratio model not specified for " << *this << "." + << exit(FatalError); + } + return aspectRatio_->E(); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C index 354b74d084..14822a26c8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C @@ -185,7 +185,7 @@ Foam::tmp Foam::phasePair::Ta() const Foam::tmp Foam::phasePair::E() const { - FatalErrorIn("Foam::phasePair::dispersed() const") + FatalErrorIn("Foam::phasePair::E() const") << "Requested aspect ratio of the dispersed phase in an unordered pair" << exit(FatalError); diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties index 09b1c3f242..48d8185c6a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties @@ -110,21 +110,18 @@ drag } ); -lift +virtualMass ( (air in water) { - type none; + type constantCoefficient; + Cvm 0.5; } (water in air) { - type none; - } - - (air and water) - { - type none; + type constantCoefficient; + Cvm 0.5; } ); @@ -141,67 +138,18 @@ heatTransfer type RanzMarshall; residualRe 1e-3; } - - (air and water) - { - type none; - } ); -virtualMass +lift ( - (air in water) - { - type constantCoefficient; - Cvm 0.5; - } - - (water in air) - { - type constantCoefficient; - Cvm 0.5; - } - - (air and water) - { - type none; - } ); wallLubrication ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); turbulentDispersion ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); // Minimum allowable pressure diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties index 09b1c3f242..48d8185c6a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties @@ -110,21 +110,18 @@ drag } ); -lift +virtualMass ( (air in water) { - type none; + type constantCoefficient; + Cvm 0.5; } (water in air) { - type none; - } - - (air and water) - { - type none; + type constantCoefficient; + Cvm 0.5; } ); @@ -141,67 +138,18 @@ heatTransfer type RanzMarshall; residualRe 1e-3; } - - (air and water) - { - type none; - } ); -virtualMass +lift ( - (air in water) - { - type constantCoefficient; - Cvm 0.5; - } - - (water in air) - { - type constantCoefficient; - Cvm 0.5; - } - - (air and water) - { - type none; - } ); wallLubrication ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); turbulentDispersion ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); // Minimum allowable pressure diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties index 7dedb2618a..d79bf8cefa 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties @@ -52,17 +52,6 @@ sigma aspectRatio ( - (particles in air) - { - type constant; - E0 1.0; - } - - (air in particles) - { - type constant; - E0 1.0; - } ); drag @@ -78,33 +67,14 @@ drag type none; } } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); -lift +virtualMass ( (particles in air) { - type none; - } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; + type constantCoefficient; + Cvm 0.5; } ); @@ -115,71 +85,18 @@ heatTransfer type RanzMarshall; residualRe 1e-3; } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); -virtualMass +lift ( - (particles in air) - { - type constantCoefficient; - Cvm 0.5; - } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); wallLubrication ( - (particles in air) - { - type none; - } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); turbulentDispersion ( - (particles in air) - { - type none; - } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); // Minimum allowable pressure diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties index 09b1c3f242..48d8185c6a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties @@ -110,21 +110,18 @@ drag } ); -lift +virtualMass ( (air in water) { - type none; + type constantCoefficient; + Cvm 0.5; } (water in air) { - type none; - } - - (air and water) - { - type none; + type constantCoefficient; + Cvm 0.5; } ); @@ -141,67 +138,18 @@ heatTransfer type RanzMarshall; residualRe 1e-3; } - - (air and water) - { - type none; - } ); -virtualMass +lift ( - (air in water) - { - type constantCoefficient; - Cvm 0.5; - } - - (water in air) - { - type constantCoefficient; - Cvm 0.5; - } - - (air and water) - { - type none; - } ); wallLubrication ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); turbulentDispersion ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); // Minimum allowable pressure diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties index 3df4758900..48d8185c6a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties @@ -19,32 +19,11 @@ phases (air water); air { - diameterModel IATE; - - IATECoeffs + diameterModel isothermal; + isothermalCoeffs { - dMax 1e-2; - dMin 1e-4; - residualAlpha 1e-6; - - sources - ( - wakeEntrainmentCoalescence - { - Cwe 0.002; - } - randomCoalescence - { - Crc 0.04; - C 3; - alphaMax 0.75; - } - turbulentBreakUp - { - Cti 0.085; - WeCr 6; - } - ); + d0 3e-3; + p0 1e5; } } @@ -131,21 +110,18 @@ drag } ); -lift +virtualMass ( (air in water) { - type none; + type constantCoefficient; + Cvm 0.5; } (water in air) { - type none; - } - - (air and water) - { - type none; + type constantCoefficient; + Cvm 0.5; } ); @@ -162,67 +138,18 @@ heatTransfer type RanzMarshall; residualRe 1e-3; } - - (air and water) - { - type none; - } ); -virtualMass +lift ( - (air in water) - { - type constantCoefficient; - Cvm 0.5; - } - - (water in air) - { - type constantCoefficient; - Cvm 0.5; - } - - (air and water) - { - type none; - } ); wallLubrication ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); turbulentDispersion ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); // Minimum allowable pressure diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties index 7dedb2618a..d79bf8cefa 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties @@ -52,17 +52,6 @@ sigma aspectRatio ( - (particles in air) - { - type constant; - E0 1.0; - } - - (air in particles) - { - type constant; - E0 1.0; - } ); drag @@ -78,33 +67,14 @@ drag type none; } } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); -lift +virtualMass ( (particles in air) { - type none; - } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; + type constantCoefficient; + Cvm 0.5; } ); @@ -115,71 +85,18 @@ heatTransfer type RanzMarshall; residualRe 1e-3; } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); -virtualMass +lift ( - (particles in air) - { - type constantCoefficient; - Cvm 0.5; - } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); wallLubrication ( - (particles in air) - { - type none; - } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); turbulentDispersion ( - (particles in air) - { - type none; - } - - (air in particles) - { - type none; - } - - (particles and air) - { - type none; - } ); // Minimum allowable pressure diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties index 09b1c3f242..48d8185c6a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties @@ -110,21 +110,18 @@ drag } ); -lift +virtualMass ( (air in water) { - type none; + type constantCoefficient; + Cvm 0.5; } (water in air) { - type none; - } - - (air and water) - { - type none; + type constantCoefficient; + Cvm 0.5; } ); @@ -141,67 +138,18 @@ heatTransfer type RanzMarshall; residualRe 1e-3; } - - (air and water) - { - type none; - } ); -virtualMass +lift ( - (air in water) - { - type constantCoefficient; - Cvm 0.5; - } - - (water in air) - { - type constantCoefficient; - Cvm 0.5; - } - - (air and water) - { - type none; - } ); wallLubrication ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); turbulentDispersion ( - (air in water) - { - type none; - } - - (water in air) - { - type none; - } - - (air and water) - { - type none; - } ); // Minimum allowable pressure