research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

Browse source
This commit is contained in:
Henry 2014-03-18 23:20:39 +00:00
commit c3e65d3e41
27 changed files with 48 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
View file

@ -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)

6
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
View file

@ -107,13 +107,11 @@ Foam::tmp<Foam::volScalarField> 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());
}

9
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
View file

@ -134,13 +134,8 @@ public:
virtual tmp<volScalarField> 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<volScalarField> K() const;
//- Dummy write for regIOobject

7
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
View file

@ -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());
}

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
View file

@ -47,7 +47,7 @@ namespace heatTransferModels
{
/*---------------------------------------------------------------------------*\
Class RanzMarshall Declaration
Class RanzMarshall Declaration
\*---------------------------------------------------------------------------*/
class RanzMarshall

3
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
View file

@ -45,7 +45,8 @@ Foam::heatTransferModel::heatTransferModel
const phasePair& pair
)
:
pair_(pair)
pair_(pair),
residualAlpha_("residualAlpha", dimless, dict.lookup("residualAlpha"))
{}

14
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
View file

@ -46,7 +46,7 @@ namespace Foam
class phasePair;
/*---------------------------------------------------------------------------*\
Class heatTransferModel Declaration
Class heatTransferModel Declaration
\*---------------------------------------------------------------------------*/
class heatTransferModel
@ -58,6 +58,9 @@ protected:
//- Phase pair
const phasePair& pair_;
//- Residual phase fraction
const dimensionedScalar residualAlpha_;
public:
@ -112,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<volScalarField> K() const = 0;
};

1
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
View file

@ -62,6 +62,7 @@ Foam::tmp<Foam::volVectorField> Foam::liftModel::F() const
{
return
Cl()
*pair_.dispersed()
*pair_.continuous().rho()
*(
pair_.Ur() ^ fvc::curl(pair_.continuous().U())

1
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
View file

@ -85,6 +85,7 @@ Foam::turbulentDispersionModels::Gosman::F() const
return
- 0.75
*drag.CdRe()
*pair_.dispersed()
*pair_.continuous().nu()
*pair_.continuous().turbulence().nut()
/(

1
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
View file

@ -75,6 +75,7 @@ F() const
{
return
- Ctd_
*pair_.dispersed()
*pair_.continuous().rho()
*pair_.continuous().turbulence().k()
*fvc::grad(pair_.dispersed());

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H
View file

@ -47,7 +47,7 @@ namespace turbulentDispersionModels
{
/*---------------------------------------------------------------------------*\
Class noTurbulentDispersion Declaration
Class noTurbulentDispersion Declaration
\*---------------------------------------------------------------------------*/
class noTurbulentDispersion

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H
View file

@ -48,7 +48,7 @@ namespace virtualMassModels
{
/*---------------------------------------------------------------------------*\
Class constantVirtualMassCoefficient Declaration
Class constantVirtualMassCoefficient Declaration
\*---------------------------------------------------------------------------*/
class constantVirtualMassCoefficient

3
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H
View file

@ -47,7 +47,7 @@ namespace virtualMassModels
{
/*---------------------------------------------------------------------------*\
Class noVirtualMass Declaration
Class noVirtualMass Declaration
\*---------------------------------------------------------------------------*/
class noVirtualMass
@ -80,6 +80,7 @@ public:
//- Virtual mass coefficient
virtual tmp<volScalarField> Cvm() const;
//- The virtual mass function K used in the momentum equation
virtual tmp<volScalarField> K() const;
};

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
View file

@ -72,7 +72,7 @@ Foam::virtualMassModel::~virtualMassModel()
Foam::tmp<Foam::volScalarField> Foam::virtualMassModel::K() const
{
return Cvm()*pair_.continuous().rho();
return Cvm()*pair_.dispersed()*pair_.continuous().rho();
}

11
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
View file

@ -47,7 +47,7 @@ namespace Foam
class phasePair;
/*---------------------------------------------------------------------------*\
Class virtualMassModel Declaration
Class virtualMassModel Declaration
\*---------------------------------------------------------------------------*/
class virtualMassModel
@ -120,13 +120,8 @@ public:
virtual tmp<volScalarField> 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<volScalarField> K() const;
// Dummy write for regIOobject

1
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
View file

@ -79,6 +79,7 @@ Foam::tmp<Foam::volVectorField> 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;

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
View file

@ -47,7 +47,7 @@ namespace Foam
class phasePair;
/*---------------------------------------------------------------------------*\
Class wallLubricationModel Declaration
Class wallLubricationModel Declaration
\*---------------------------------------------------------------------------*/
class wallLubricationModel

2
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
View file

@ -163,8 +163,6 @@ Foam::BlendedInterfacialModel<modelType>::K() const
if (model_.valid() || model1In2_.valid() || model2In1_.valid())
{
x() *= max(pair_.phase1()*pair_.phase2(), blending_.residualAlpha());
correctFixedFluxBCs(x());
}

10
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
View file

@ -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_;
}
// ************************************************************************* //

11
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
View file

@ -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<volScalarField> f1
(

3
tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
View file

@ -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;
}
);

3
tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
View file

@ -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;
}
);

7
tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
View file

@ -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;
}
);

3
tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
View file

@ -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;
}
);

3
tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
View file

@ -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;
}
);

2
tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
View file

@ -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;
}
);

3
tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
View file

@ -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;
}
);