diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
index 2cefd8cf82ca1706b99a0219ef585e29c67639b7..15b97633166a84306e64b3198952ae08cea0db1a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@@ -34,7 +34,6 @@
fvc::interpolate(rAU1*phase1.turbulence().pPrime())
*fvc::snGrad(alpha1)*mesh.magSf()
);
- phiF1.boundaryField() == 0;
// Phase-2 pressure flux (e.g. due to particle-particle pressure)
surfaceScalarField phiF2
@@ -43,7 +42,6 @@
fvc::interpolate(rAU2*phase2.turbulence().pPrime())
*fvc::snGrad(alpha2)*mesh.magSf()
);
- phiF2.boundaryField() == 0;
volScalarField rho("rho", fluid.rho());
surfaceScalarField ghSnGradRho(ghf*fvc::snGrad(rho)*mesh.magSf());
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 8f136cd5936c470fc4edde2934a3ca2ff4088692..ed109b96def65f8b8cd1cc6ccb7b040b171b60b4 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -59,52 +59,52 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
(
kineticTheoryModels::viscosityModel::New
(
- this->coeffDict_
+ coeffDict_
)
),
conductivityModel_
(
kineticTheoryModels::conductivityModel::New
(
- this->coeffDict_
+ coeffDict_
)
),
radialModel_
(
kineticTheoryModels::radialModel::New
(
- this->coeffDict_
+ coeffDict_
)
),
granularPressureModel_
(
kineticTheoryModels::granularPressureModel::New
(
- this->coeffDict_
+ coeffDict_
)
),
frictionalStressModel_
(
kineticTheoryModels::frictionalStressModel::New
(
- this->coeffDict_
+ coeffDict_
)
),
- equilibrium_(this->coeffDict_.lookup("equilibrium")),
- e_("e", dimless, this->coeffDict_.lookup("e")),
- alphaMax_("alphaMax", dimless, this->coeffDict_.lookup("alphaMax")),
+ equilibrium_(coeffDict_.lookup("equilibrium")),
+ e_("e", dimless, coeffDict_.lookup("e")),
+ alphaMax_("alphaMax", dimless, coeffDict_.lookup("alphaMax")),
alphaMinFriction_
(
"alphaMinFriction",
dimless,
- this->coeffDict_.lookup("alphaMinFriction")
+ coeffDict_.lookup("alphaMinFriction")
),
residualAlpha_
(
"residualAlpha",
dimless,
- this->coeffDict_.lookup("residualAlpha")
+ coeffDict_.lookup("residualAlpha")
),
Theta_
@@ -164,7 +164,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
{
if (type == typeName)
{
- this->printCoeffs(type);
+ printCoeffs(type);
}
}
@@ -187,10 +187,10 @@ bool Foam::RASModels::kineticTheoryModel::read()
>::read()
)
{
- this->coeffDict().lookup("equilibrium") >> equilibrium_;
- e_.readIfPresent(this->coeffDict());
- alphaMax_.readIfPresent(this->coeffDict());
- alphaMinFriction_.readIfPresent(this->coeffDict());
+ coeffDict().lookup("equilibrium") >> equilibrium_;
+ e_.readIfPresent(coeffDict());
+ alphaMax_.readIfPresent(coeffDict());
+ alphaMinFriction_.readIfPresent(coeffDict());
viscosityModel_->read();
conductivityModel_->read();
@@ -232,107 +232,61 @@ Foam::RASModels::kineticTheoryModel::R() const
(
IOobject
(
- IOobject::groupName("R", this->U_.group()),
- this->runTime_.timeName(),
- this->mesh_,
+ IOobject::groupName("R", U_.group()),
+ runTime_.timeName(),
+ mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
- - (this->nut_)*dev(twoSymm(fvc::grad(this->U_)))
- - (lambda_*fvc::div(this->phi_))*symmTensor::I
+ - (nut_)*dev(twoSymm(fvc::grad(U_)))
+ - (lambda_*fvc::div(phi_))*symmTensor::I
)
);
}
-/*
-Foam::tmp<Foam::volScalarField>
-Foam::RASModels::kineticTheoryModel::pp() const
-{
-
- // Particle pressure coefficient
- // Coefficient in front of Theta (Eq. 3.22, p. 45)
- volScalarField PsCoeff
- (
- granularPressureModel_->granularPressureCoeff
- (
- alpha,
- gs0,
- rho,
- e_
- )
- );
-
- // Frictional pressure
- volScalarField pf
- (
- frictionalStressModel_->frictionalPressure
- (
- alpha,
- alphaMinFriction_,
- alphaMax_
- )
- );
-
- // Return total particle pressure
- return PsCoeff*Theta_ + pf;
-}
-*/
-
-
Foam::tmp<Foam::volScalarField>
Foam::RASModels::kineticTheoryModel::pPrime() const
{
- // Local references
- const volScalarField& alpha = this->alpha_;
const volScalarField& rho = phase_.rho();
- return
+ tmp<volScalarField> tpPrime
(
Theta_
*granularPressureModel_->granularPressureCoeffPrime
(
- alpha,
- radialModel_->g0(alpha, alphaMinFriction_, alphaMax_),
- radialModel_->g0prime(alpha, alphaMinFriction_, alphaMax_),
+ alpha_,
+ radialModel_->g0(alpha_, alphaMinFriction_, alphaMax_),
+ radialModel_->g0prime(alpha_, alphaMinFriction_, alphaMax_),
rho,
e_
)
+ frictionalStressModel_->frictionalPressurePrime
(
- alpha,
+ alpha_,
alphaMinFriction_,
alphaMax_
)
);
+
+ volScalarField::GeometricBoundaryField& bpPrime = tpPrime().boundaryField();
+
+ forAll(bpPrime, patchi)
+ {
+ if (!bpPrime[patchi].coupled())
+ {
+ bpPrime[patchi] == 0;
+ }
+ }
+
+ return tpPrime;
}
Foam::tmp<Foam::surfaceScalarField>
Foam::RASModels::kineticTheoryModel::pPrimef() const
{
- // Local references
- const volScalarField& alpha = this->alpha_;
- const volScalarField& rho = phase_.rho();
-
- return fvc::interpolate
- (
- Theta_
- *granularPressureModel_->granularPressureCoeffPrime
- (
- alpha,
- radialModel_->g0(alpha, alphaMinFriction_, alphaMax_),
- radialModel_->g0prime(alpha, alphaMinFriction_, alphaMax_),
- rho,
- e_
- )
- + frictionalStressModel_->frictionalPressurePrime
- (
- alpha,
- alphaMinFriction_,
- alphaMax_
- )
- );
+ return fvc::interpolate(pPrime());
}
@@ -345,15 +299,15 @@ Foam::RASModels::kineticTheoryModel::devRhoReff() const
(
IOobject
(
- IOobject::groupName("devRhoReff", this->U_.group()),
- this->runTime_.timeName(),
- this->mesh_,
+ IOobject::groupName("devRhoReff", U_.group()),
+ runTime_.timeName(),
+ mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
- - (this->rho_*this->nut_)
- *dev(twoSymm(fvc::grad(this->U_)))
- - ((this->rho_*lambda_)*fvc::div(this->phi_))*symmTensor::I
+ - (rho_*nut_)
+ *dev(twoSymm(fvc::grad(U_)))
+ - ((rho_*lambda_)*fvc::div(phi_))*symmTensor::I
)
);
}
@@ -367,11 +321,11 @@ Foam::RASModels::kineticTheoryModel::divDevRhoReff
{
return
(
- - fvm::laplacian(this->rho_*this->nut_, U)
+ - fvm::laplacian(rho_*nut_, U)
- fvc::div
(
- (this->rho_*this->nut_)*dev2(T(fvc::grad(U)))
- + ((this->rho_*lambda_)*fvc::div(this->phi_))
+ (rho_*nut_)*dev2(T(fvc::grad(U)))
+ + ((rho_*lambda_)*fvc::div(phi_))
*dimensioned<symmTensor>("I", dimless, symmTensor::I)
)
);
@@ -381,10 +335,10 @@ Foam::RASModels::kineticTheoryModel::divDevRhoReff
void Foam::RASModels::kineticTheoryModel::correct()
{
// Local references
- volScalarField alpha(max(this->alpha_, scalar(0)));
+ volScalarField alpha(max(alpha_, scalar(0)));
const volScalarField& rho = phase_.rho();
- const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
- const volVectorField& U = this->U_;
+ const surfaceScalarField& alphaRhoPhi = alphaRhoPhi_;
+ const volVectorField& U = U_;
const volVectorField& Uc_ = phase_.fluid().otherPhase(phase_).U();
const scalar sqrtPi = sqrt(constant::mathematical::pi);
@@ -394,7 +348,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
tmp<volScalarField> tda(phase_.d());
const volScalarField& da = tda();
- tmp<volTensorField> tgradU(fvc::grad(this->U_));
+ tmp<volTensorField> tgradU(fvc::grad(U_));
const volTensorField& gradU(tgradU());
volSymmTensorField D(symm(gradU));
@@ -508,7 +462,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
(
"trD",
alpha/(alpha + residualAlpha_)
- *fvc::div(this->phi_)
+ *fvc::div(phi_)
);
volScalarField tr2D("tr2D", sqr(trD));
volScalarField trD2("trD2", tr(D & D));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 77dfdeb077e28b99534e43deb48d48743aea5dd5..8cca6f493f098cf93b841a128ff96286df2dbb46 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -54,21 +54,21 @@ Foam::RASModels::phasePressureModel::phasePressureModel
phase_(phase),
- alphaMax_(readScalar(this->coeffDict_.lookup("alphaMax"))),
- preAlphaExp_(readScalar(this->coeffDict_.lookup("preAlphaExp"))),
- expMax_(readScalar(this->coeffDict_.lookup("expMax"))),
+ alphaMax_(readScalar(coeffDict_.lookup("alphaMax"))),
+ preAlphaExp_(readScalar(coeffDict_.lookup("preAlphaExp"))),
+ expMax_(readScalar(coeffDict_.lookup("expMax"))),
g0_
(
"g0",
dimensionSet(1, -1, -2, 0, 0),
- this->coeffDict_.lookup("g0")
+ coeffDict_.lookup("g0")
)
{
- this->nut_ == dimensionedScalar("zero", this->nut_.dimensions(), 0.0);
+ nut_ == dimensionedScalar("zero", nut_.dimensions(), 0.0);
if (type == typeName)
{
- this->printCoeffs(type);
+ printCoeffs(type);
}
}
@@ -91,10 +91,10 @@ bool Foam::RASModels::phasePressureModel::read()
>::read()
)
{
- this->coeffDict().lookup("alphaMax") >> alphaMax_;
- this->coeffDict().lookup("preAlphaExp") >> preAlphaExp_;
- this->coeffDict().lookup("expMax") >> expMax_;
- g0_.readIfPresent(this->coeffDict());
+ coeffDict().lookup("alphaMax") >> alphaMax_;
+ coeffDict().lookup("preAlphaExp") >> preAlphaExp_;
+ coeffDict().lookup("expMax") >> expMax_;
+ g0_.readIfPresent(coeffDict());
return true;
}
@@ -130,13 +130,13 @@ Foam::RASModels::phasePressureModel::R() const
(
IOobject
(
- IOobject::groupName("R", this->U_.group()),
- this->runTime_.timeName(),
- this->mesh_,
+ IOobject::groupName("R", U_.group()),
+ runTime_.timeName(),
+ mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
- this->mesh_,
+ mesh_,
dimensioned<symmTensor>
(
"R",
@@ -151,26 +151,55 @@ Foam::RASModels::phasePressureModel::R() const
Foam::tmp<Foam::volScalarField>
Foam::RASModels::phasePressureModel::pPrime() const
{
- return
+ tmp<volScalarField> tpPrime
+ (
g0_
*min
(
- exp(preAlphaExp_*(this->alpha_ - alphaMax_)),
+ exp(preAlphaExp_*(alpha_ - alphaMax_)),
expMax_
- );
+ )
+ );
+
+ volScalarField::GeometricBoundaryField& bpPrime = tpPrime().boundaryField();
+
+ forAll(bpPrime, patchi)
+ {
+ if (!bpPrime[patchi].coupled())
+ {
+ bpPrime[patchi] == 0;
+ }
+ }
+
+ return tpPrime;
}
Foam::tmp<Foam::surfaceScalarField>
Foam::RASModels::phasePressureModel::pPrimef() const
{
- return
+ tmp<surfaceScalarField> tpPrime
+ (
g0_
*min
(
- exp(preAlphaExp_*(fvc::interpolate(this->alpha_) - alphaMax_)),
+ exp(preAlphaExp_*(fvc::interpolate(alpha_) - alphaMax_)),
expMax_
- );
+ )
+ );
+
+ surfaceScalarField::GeometricBoundaryField& bpPrime =
+ tpPrime().boundaryField();
+
+ forAll(bpPrime, patchi)
+ {
+ if (!bpPrime[patchi].coupled())
+ {
+ bpPrime[patchi] == 0;
+ }
+ }
+
+ return tpPrime;
}
@@ -183,17 +212,17 @@ Foam::RASModels::phasePressureModel::devRhoReff() const
(
IOobject
(
- IOobject::groupName("devRhoReff", this->U_.group()),
- this->runTime_.timeName(),
- this->mesh_,
+ IOobject::groupName("devRhoReff", U_.group()),
+ runTime_.timeName(),
+ mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
- this->mesh_,
+ mesh_,
dimensioned<symmTensor>
(
"R",
- this->rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0),
+ rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0),
symmTensor::zero
)
)
@@ -212,7 +241,7 @@ Foam::RASModels::phasePressureModel::divDevRhoReff
new fvVectorMatrix
(
U,
- this->rho_.dimensions()*dimensionSet(0, 4, -2, 0, 0)
+ rho_.dimensions()*dimensionSet(0, 4, -2, 0, 0)
)
);
}