From 32711a0caa442863eced5d34635ecabd9756c022 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 11 Mar 2014 10:51:57 +0000 Subject: [PATCH 1/6] ENH: refineHexMesh: add option to keep to 2:1 ratio outside cellSet --- .../mesh/advanced/refineHexMesh/refineHexMesh.C | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C index b6669b09..1f91954e 100644 --- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C +++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,6 +55,12 @@ int main(int argc, char *argv[]) { # include "addOverwriteOption.H" argList::validArgs.append("cellSet"); + argList::addBoolOption + ( + "minSet", + "remove cells from input cellSet to keep to 2:1 ratio" + " (default is to extend set)" + ); # include "setRootCase.H" # include "createTime.H" @@ -65,6 +71,8 @@ int main(int argc, char *argv[]) word cellSetName(args.args()[1]); const bool overwrite = args.optionFound("overwrite"); + const bool minSet = args.optionFound("minSet"); + Info<< "Reading cells to refine from cellSet " << cellSetName << nl << endl; @@ -143,7 +151,7 @@ int main(int argc, char *argv[]) meshCutter.consistentRefinement ( cellsToRefine.toc(), - true // extend set + !minSet // extend set ) ); From 51385b3dfaf8452d6fa0bccde8529241dacc35c9 Mon Sep 17 00:00:00 2001 From: william Date: Mon, 17 Mar 2014 16:34:32 +0000 Subject: [PATCH 2/6] BUG: twoPhaseEulerFoam: removed multiple of the continuous phase fraction from force and heat transfer models --- .../solvers/multiphase/twoPhaseEulerFoam/UEqns.H | 10 ++++------ .../dragModels/dragModel/dragModel.C | 6 ++---- .../heatTransferModels/RanzMarshall/RanzMarshall.C | 7 ++++++- .../heatTransferModel/heatTransferModel.C | 3 ++- .../heatTransferModel/heatTransferModel.H | 3 +++ .../liftModels/liftModel/liftModel.C | 1 + .../turbulentDispersionModels/Gosman/Gosman.C | 1 + .../constantTurbulentDispersionCoefficient.C | 1 + .../virtualMassModel/virtualMassModel.C | 2 +- .../wallLubricationModels/Antal/Antal.C | 1 + .../BlendedInterfacialModel/BlendedInterfacialModel.C | 2 -- .../blendingMethods/blendingMethod/blendingMethod.C | 10 ---------- .../blendingMethods/blendingMethod/blendingMethod.H | 11 ----------- .../LES/bubbleColumn/constant/phaseProperties | 3 ++- .../RAS/bubbleColumn/constant/phaseProperties | 3 ++- .../RAS/fluidisedBed/constant/phaseProperties | 7 +------ .../laminar/bubbleColumn/constant/phaseProperties | 3 ++- .../laminar/bubbleColumnIATE/constant/phaseProperties | 3 ++- .../laminar/fluidisedBed/constant/phaseProperties | 2 +- .../laminar/mixerVessel2D/constant/phaseProperties | 3 ++- 20 files changed, 34 insertions(+), 48 deletions(-) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H index 7cddcb80..5b0463d1 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H @@ -23,12 +23,11 @@ volScalarField dragCoeff(fluid.dragCoeff()); + phase1.turbulence().divDevReff(U1) == - fvm::Sp(dragCoeff/rho1, U1) - - alpha1*alpha2/rho1 - *( + - ( liftForce + wallLubricationForce + turbulentDispersionForce - ) + )/rho1 - virtualMassCoeff/rho1 *( fvm::ddt(U1) @@ -50,12 +49,11 @@ volScalarField dragCoeff(fluid.dragCoeff()); + phase2.turbulence().divDevReff(U2) == - fvm::Sp(dragCoeff/rho2, U2) - + alpha1*alpha2/rho2 - *( + + ( liftForce + wallLubricationForce + turbulentDispersionForce - ) + )/rho2 - virtualMassCoeff/rho2 *( fvm::ddt(U2) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C index ce2a53a0..e9cb5c33 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C @@ -107,13 +107,11 @@ Foam::tmp Foam::dragModel::K() const return 0.75 *CdRe() + *max(pair_.dispersed(), residualAlpha_) *swarmCorrection_->Cs() *pair_.continuous().rho() *pair_.continuous().nu() - /( - max(pair_.continuous(), residualAlpha_) - *sqr(pair_.dispersed().d()) - ); + /sqr(pair_.dispersed().d()); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C index 1dd21273..84f32a85 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C @@ -64,7 +64,12 @@ Foam::heatTransferModels::RanzMarshall::K() const { volScalarField Nu(scalar(2) + 0.6*pair_.Re()*cbrt(pair_.Pr())); - return 6.0*pair_.continuous().kappa()*Nu/sqr(pair_.dispersed().d()); + return + 6.0 + *max(pair_.dispersed(), residualAlpha_) + *pair_.continuous().kappa() + *Nu + /sqr(pair_.dispersed().d()); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C index b04b6a0c..2a47cbbb 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C @@ -45,7 +45,8 @@ Foam::heatTransferModel::heatTransferModel const phasePair& pair ) : - pair_(pair) + pair_(pair), + residualAlpha_("residualAlpha", dimless, dict.lookup("residualAlpha")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H index 3d4c9dec..e0d1cba7 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H @@ -58,6 +58,9 @@ protected: //- Phase pair const phasePair& pair_; + //- Residual phase fraction + const dimensionedScalar residualAlpha_; + public: diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C index 6cd5e024..b91050bd 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C @@ -62,6 +62,7 @@ Foam::tmp Foam::liftModel::F() const { return Cl() + *pair_.dispersed() *pair_.continuous().rho() *( pair_.Ur() ^ fvc::curl(pair_.continuous().U()) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C index eccbf4e3..01fb4d2f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C @@ -85,6 +85,7 @@ Foam::turbulentDispersionModels::Gosman::F() const return - 0.75 *drag.CdRe() + *pair_.dispersed() *pair_.continuous().nu() *pair_.continuous().turbulence().nut() /( diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C index 47dd0bd9..0d28518b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C @@ -75,6 +75,7 @@ F() const { return - Ctd_ + *pair_.dispersed() *pair_.continuous().rho() *pair_.continuous().turbulence().k() *fvc::grad(pair_.dispersed()); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C index f709a092..34473a6c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C @@ -72,7 +72,7 @@ Foam::virtualMassModel::~virtualMassModel() Foam::tmp Foam::virtualMassModel::K() const { - return Cvm()*pair_.continuous().rho(); + return Cvm()*pair_.dispersed()*pair_.continuous().rho(); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C index aea563ed..9b047289 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C @@ -79,6 +79,7 @@ Foam::tmp Foam::wallLubricationModels::Antal::F() const dimensionedScalar("zero", dimless/dimLength, 0), Cw1_/pair_.dispersed().d() + Cw2_/yWall_ ) + *pair_.dispersed() *pair_.continuous().rho() *magSqr(Ur - (Ur & nWall)*nWall) *nWall; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C index 95d6ebe7..f011791d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -163,8 +163,6 @@ Foam::BlendedInterfacialModel::K() const if (model_.valid() || model1In2_.valid() || model2In1_.valid()) { - x() *= max(pair_.phase1()*pair_.phase2(), blending_.residualAlpha()); - correctFixedFluxBCs(x()); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C index 3b4ec109..46952492 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C @@ -40,8 +40,6 @@ Foam::blendingMethod::blendingMethod ( const dictionary& dict ) -: - residualAlpha_("residualAlpha", dimless, dict.lookup("residualAlpha")) {} @@ -51,12 +49,4 @@ Foam::blendingMethod::~blendingMethod() {} -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -const Foam::dimensionedScalar& Foam::blendingMethod::residualAlpha() const -{ - return residualAlpha_; -} - - // ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H index 63cfb797..47e454f5 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H @@ -49,14 +49,6 @@ namespace Foam class blendingMethod { -protected: - - // Protected data - - //- Residual phase fraction - const dimensionedScalar residualAlpha_; - - public: //- Runtime type information @@ -101,9 +93,6 @@ public: // Member Functions - //- Residual phase fraction - const dimensionedScalar& residualAlpha() const; - //- Factor for first phase virtual tmp f1 ( diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties index 673343de..6163f0ff 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties @@ -41,7 +41,6 @@ blending default { type linear; - residualAlpha 1e-6; maxFullyDispersedAlpha.air 0.3; maxPartlyDispersedAlpha.air 0.5; maxFullyDispersedAlpha.water 0.3; @@ -126,11 +125,13 @@ heatTransfer (air in water) { type RanzMarshall; + residualAlpha 1e-6; } (water in air) { type RanzMarshall; + residualAlpha 1e-6; } ); diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties index 673343de..6163f0ff 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties @@ -41,7 +41,6 @@ blending default { type linear; - residualAlpha 1e-6; maxFullyDispersedAlpha.air 0.3; maxPartlyDispersedAlpha.air 0.5; maxFullyDispersedAlpha.water 0.3; @@ -126,11 +125,13 @@ heatTransfer (air in water) { type RanzMarshall; + residualAlpha 1e-6; } (water in air) { type RanzMarshall; + residualAlpha 1e-6; } ); diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties index bca23e0f..79d8f768 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties @@ -42,7 +42,6 @@ blending default { type none; - residualAlpha 1e-3; continuousPhase air; } } @@ -72,11 +71,6 @@ drag virtualMass ( - (particles in air) - { - type constantCoefficient; - Cvm 0; - } ); heatTransfer @@ -84,6 +78,7 @@ heatTransfer (particles in air) { type RanzMarshall; + residualAlpha 1e-3; } ); diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties index 673343de..6163f0ff 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties @@ -41,7 +41,6 @@ blending default { type linear; - residualAlpha 1e-6; maxFullyDispersedAlpha.air 0.3; maxPartlyDispersedAlpha.air 0.5; maxFullyDispersedAlpha.water 0.3; @@ -126,11 +125,13 @@ heatTransfer (air in water) { type RanzMarshall; + residualAlpha 1e-6; } (water in air) { type RanzMarshall; + residualAlpha 1e-6; } ); diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties index cfb93ba5..db40f41b 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties @@ -62,7 +62,6 @@ blending default { type linear; - residualAlpha 1e-6; maxFullyDispersedAlpha.air 0.3; maxPartlyDispersedAlpha.air 0.5; maxFullyDispersedAlpha.water 0.3; @@ -147,11 +146,13 @@ heatTransfer (air in water) { type RanzMarshall; + residualAlpha 1e-6; } (water in air) { type RanzMarshall; + residualAlpha 1e-6; } ); diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties index 6f7c9add..8e9239c4 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties @@ -42,7 +42,6 @@ blending default { type none; - residualAlpha 1e-3; continuousPhase air; } } @@ -84,6 +83,7 @@ heatTransfer (particles in air) { type RanzMarshall; + residualAlpha 1e-3; } ); diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties index 673343de..6163f0ff 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties @@ -41,7 +41,6 @@ blending default { type linear; - residualAlpha 1e-6; maxFullyDispersedAlpha.air 0.3; maxPartlyDispersedAlpha.air 0.5; maxFullyDispersedAlpha.water 0.3; @@ -126,11 +125,13 @@ heatTransfer (air in water) { type RanzMarshall; + residualAlpha 1e-6; } (water in air) { type RanzMarshall; + residualAlpha 1e-6; } ); From 3c837948f19c4f21570201595ac7396809f308ef Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 17 Mar 2014 21:31:09 +0000 Subject: [PATCH 3/6] Removed alphaOuterCorrectors option because the mass-flux should be updated for all PIMPLE iterations Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1225 --- .../interFoam/LTSInterFoam/LTSInterFoam.C | 13 +++++-------- .../interFoam/MRFInterFoam/MRFInterFoam.C | 13 +++++-------- .../interFoam/interDyMFoam/interDyMFoam.C | 11 ++++------- .../solvers/multiphase/interFoam/interFoam.C | 9 +++------ .../interFoam/interMixingFoam/alphaEqnsSubCycle.H | 2 -- .../interFoam/interMixingFoam/interMixingFoam.C | 13 +++++-------- .../interFoam/porousInterFoam/porousInterFoam.C | 11 ++++------- .../interPhaseChangeDyMFoam.C | 9 +++------ .../interPhaseChangeFoam/interPhaseChangeFoam.C | 11 ++++------- .../cfdTools/general/include/alphaControls.H | 5 ----- .../interDyMFoam/ras/DTCHull/system/fvSolution | 2 -- .../ras/floatingObject/system/fvSolution | 2 -- .../interFoam/laminar/damBreak/system/fvSolution | 1 - .../interFoam/ras/damBreak/system/fvSolution | 1 - .../ras/damBreakPorousBaffle/system/fvSolution | 1 - 15 files changed, 33 insertions(+), 71 deletions(-) diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C index 494acaf0..33d83161 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C +++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,14 +82,11 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #define LTSSOLVE - #include "alphaEqnSubCycle.H" - #undef LTSSOLVE - } + #define LTSSOLVE + #include "alphaEqnSubCycle.H" + #undef LTSSOLVE turbulence->correct(); diff --git a/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C b/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C index ccf89e54..f6386bde 100644 --- a/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C +++ b/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,14 +86,11 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - #include "zonePhaseVolumes.H" - } + #include "alphaEqnSubCycle.H" + interface.correct(); + #include "zonePhaseVolumes.H" #include "UEqn.H" diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C index 83398509..32ee5aee 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -132,13 +132,10 @@ int main(int argc, char *argv[]) #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index f221ff9a..8c59d0f9 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -85,13 +85,10 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H index 259ebb9c..72a9af2c 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H @@ -1,5 +1,3 @@ -#include "alphaControls.H" - if (nAlphaSubCycles > 1) { dimensionedScalar totalDeltaT = runTime.deltaT(); diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index fad22244..edeab9ac 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,15 +79,12 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - threePhaseProperties.correct(); + threePhaseProperties.correct(); - #include "alphaEqnsSubCycle.H" - interface.correct(); + #include "alphaEqnsSubCycle.H" + interface.correct(); - #define twoPhaseProperties threePhaseProperties - } + #define twoPhaseProperties threePhaseProperties #include "UEqn.H" diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C index d81f5c93..c3018878 100644 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C +++ b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,13 +88,10 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C index 247d4e2c..86b19912 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C @@ -154,13 +154,10 @@ int main(int argc, char *argv[]) dimensionedScalar("0", dimMass/dimTime, 0) ); - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties->correct(); + twoPhaseProperties->correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 2a653dcf..bea114da 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -100,13 +100,10 @@ int main(int argc, char *argv[]) dimensionedScalar("0", dimMass/dimTime, 0) ); - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties->correct(); + twoPhaseProperties->correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/src/finiteVolume/cfdTools/general/include/alphaControls.H b/src/finiteVolume/cfdTools/general/include/alphaControls.H index 636e13d8..3819789a 100644 --- a/src/finiteVolume/cfdTools/general/include/alphaControls.H +++ b/src/finiteVolume/cfdTools/general/include/alphaControls.H @@ -6,11 +6,6 @@ label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles"))); bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false)); -bool alphaOuterCorrectors -( - alphaControls.lookupOrDefault("alphaOuterCorrectors", false) -); - // Apply the compression correction from the previous iteration // Improves efficiency for steady-simulations but can only be applied // once the alpha field is reasonably steady, i.e. fully developed diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution index 4ae9d683..42c3d9f0 100644 --- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution @@ -24,8 +24,6 @@ solvers cAlpha 1; icAlpha 0; - alphaOuterCorrectors yes; - MULESCorr yes; nLimiterIter 10; alphaApplyPrevCorr yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution index 1b06dc03..39ce379d 100644 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution @@ -23,8 +23,6 @@ solvers nAlphaSubCycles 1; cAlpha 1; - alphaOuterCorrectors yes; - MULESCorr yes; nLimiterIter 5; alphaApplyPrevCorr true; diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution index 40b5297c..063da65f 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution @@ -21,7 +21,6 @@ solvers { nAlphaCorr 2; nAlphaSubCycles 1; - alphaOuterCorrectors yes; cAlpha 1; MULESCorr yes; diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution index 01414d4e..c5151b23 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution @@ -21,7 +21,6 @@ solvers { nAlphaCorr 2; nAlphaSubCycles 1; - alphaOuterCorrectors yes; cAlpha 1; MULESCorr yes; diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution index 01414d4e..c5151b23 100644 --- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution @@ -21,7 +21,6 @@ solvers { nAlphaCorr 2; nAlphaSubCycles 1; - alphaOuterCorrectors yes; cAlpha 1; MULESCorr yes; From 5871d1aa33ec7fdfc4affcc67f0a64df4f1f3936 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 17 Mar 2014 22:38:53 +0000 Subject: [PATCH 4/6] Separate convection and diffusion terms in the MULEScorr predictor to remove interaction of the diffusion term with the flux-correction. --- applications/solvers/multiphase/driftFluxFoam/alphaEqn.H | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H index 817a0c91..d56b3716 100644 --- a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H +++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H @@ -17,6 +17,11 @@ phi, upwind(mesh, phi) ).fvmDiv(phi, alpha1) + ); + + solve + ( + alpha1Eqn - fv::gaussLaplacianScheme ( mesh, @@ -25,8 +30,6 @@ ).fvmLaplacian(fvc::interpolate(mut/rho), alpha1) ); - alpha1Eqn.solve(); - Info<< "Phase-1 volume fraction = " << alpha1.weightedAverage(mesh.Vsc()).value() << " Min(alpha1) = " << min(alpha1).value() From 195d51bfd43b486c2968a7dc4558b67bc5ca819b Mon Sep 17 00:00:00 2001 From: william Date: Tue, 18 Mar 2014 09:07:35 +0000 Subject: [PATCH 5/6] STYLE: twoPhaseEulerFoam: updated interfacial model headers to reflect changes in the definition of K --- .../dragModels/dragModel/dragModel.H | 9 ++------- .../heatTransferModels/RanzMarshall/RanzMarshall.H | 2 +- .../heatTransferModel/heatTransferModel.H | 11 +++-------- .../noTurbulentDispersion/noTurbulentDispersion.H | 2 +- .../constantVirtualMassCoefficient.H | 2 +- .../virtualMassModels/noVirtualMass/noVirtualMass.H | 3 ++- .../virtualMassModel/virtualMassModel.H | 11 +++-------- .../wallLubricationModel/wallLubricationModel.H | 2 +- 8 files changed, 14 insertions(+), 28 deletions(-) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index 954d60c3..54c78441 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -134,13 +134,8 @@ public: virtual tmp CdRe() const = 0; //- The drag function K used in the momentum equation - // ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(U1-U2) - // ddt(alpha2*rho2*U2) + ... = ... alpha1*alpha2*K*(U2-U1) - // ********************************** NB! ***************************** - // for numerical reasons alpha1 and alpha2 has been extracted from the - // drag function K, so you MUST divide K by alpha1*alpha2 when - // implemnting the drag function - // ********************************** NB! ***************************** + // ddt(alpha1*rho1*U1) + ... = ... K*(U1-U2) + // ddt(alpha2*rho2*U2) + ... = ... K*(U2-U1) virtual tmp K() const; //- Dummy write for regIOobject diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H index a52ff75b..04ce5c90 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H @@ -47,7 +47,7 @@ namespace heatTransferModels { /*---------------------------------------------------------------------------*\ - Class RanzMarshall Declaration + Class RanzMarshall Declaration \*---------------------------------------------------------------------------*/ class RanzMarshall diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H index e0d1cba7..5e16e572 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H @@ -46,7 +46,7 @@ namespace Foam class phasePair; /*---------------------------------------------------------------------------*\ - Class heatTransferModel Declaration + Class heatTransferModel Declaration \*---------------------------------------------------------------------------*/ class heatTransferModel @@ -115,13 +115,8 @@ public: // Member Functions //- The heat transfer function K used in the enthalpy equation - // ddt(alpha1*rho1*ha) + ... = ... alpha1*alpha2*K*(Ta - Tb) - // ddt(alpha2*rho2*hb) + ... = ... alpha1*alpha2*K*(Tb - Ta) - // ********************************** NB!***************************** - // for numerical reasons alpha1 and alpha2 has been extracted from the - // heat transfer function K, so you MUST divide K by alpha1*alpha2 when - // implementing the heat transfer function - // ********************************** NB!***************************** + // ddt(alpha1*rho1*ha) + ... = ... K*(Ta - Tb) + // ddt(alpha2*rho2*hb) + ... = ... K*(Tb - Ta) virtual tmp K() const = 0; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H index 7c9adf6d..19c12a23 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H @@ -47,7 +47,7 @@ namespace turbulentDispersionModels { /*---------------------------------------------------------------------------*\ - Class noTurbulentDispersion Declaration + Class noTurbulentDispersion Declaration \*---------------------------------------------------------------------------*/ class noTurbulentDispersion diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H index 8ce2b691..cb20c4e3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H @@ -48,7 +48,7 @@ namespace virtualMassModels { /*---------------------------------------------------------------------------*\ - Class constantVirtualMassCoefficient Declaration + Class constantVirtualMassCoefficient Declaration \*---------------------------------------------------------------------------*/ class constantVirtualMassCoefficient diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H index a8733e5f..90f60e29 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H @@ -47,7 +47,7 @@ namespace virtualMassModels { /*---------------------------------------------------------------------------*\ - Class noVirtualMass Declaration + Class noVirtualMass Declaration \*---------------------------------------------------------------------------*/ class noVirtualMass @@ -80,6 +80,7 @@ public: //- Virtual mass coefficient virtual tmp Cvm() const; + //- The virtual mass function K used in the momentum equation virtual tmp K() const; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H index bfaf4573..65ea9fd5 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H @@ -47,7 +47,7 @@ namespace Foam class phasePair; /*---------------------------------------------------------------------------*\ - Class virtualMassModel Declaration + Class virtualMassModel Declaration \*---------------------------------------------------------------------------*/ class virtualMassModel @@ -120,13 +120,8 @@ public: virtual tmp Cvm() const = 0; //- The virtual mass function K used in the momentum equation - // ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(DU1_Dt - DU2_Dt) - // ddt(alpha2*rho2*U2) + ... = ... alpha1*alpha2*K*(DU1_Dt - DU2_Dt) - // ********************************** NB! ***************************** - // for numerical reasons alpha1 and alpha2 has been extracted from the - // virtual mass function K, so you MUST divide K by alpha1*alpha2 when - // implemnting the virtual mass function - // ********************************** NB! ***************************** + // ddt(alpha1*rho1*U1) + ... = ... K*(DU1_Dt - DU2_Dt) + // ddt(alpha2*rho2*U2) + ... = ... K*(DU1_Dt - DU2_Dt) virtual tmp K() const; // Dummy write for regIOobject diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H index ee234197..04fd4729 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H @@ -47,7 +47,7 @@ namespace Foam class phasePair; /*---------------------------------------------------------------------------*\ - Class wallLubricationModel Declaration + Class wallLubricationModel Declaration \*---------------------------------------------------------------------------*/ class wallLubricationModel From 3114c5990e39e8c3c1dc18a01559af968a918982 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 18 Mar 2014 23:19:41 +0000 Subject: [PATCH 6/6] Improved calculation of div(U) using the volumetric flux --- applications/solvers/multiphase/driftFluxFoam/kEpsilon.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H b/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H index 92931154..66216b87 100644 --- a/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H +++ b/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H @@ -10,7 +10,7 @@ if (turbulence) dimensionedScalar epsilon0("epsilon0", epsilon.dimensions(), 0); dimensionedScalar epsilonMin("epsilonMin", epsilon.dimensions(), SMALL); - volScalarField divU(fvc::div(rhoPhi/fvc::interpolate(rho))); + volScalarField divU(fvc::div(phi)); tmp tgradU = fvc::grad(U); volScalarField G(mut*(tgradU() && dev(twoSymm(tgradU()))));