multiphase: completed phase renaming

This commit is contained in:
Henry
2012-03-01 18:22:59 +00:00
parent ab96ba7453
commit c2041f9dba
175 changed files with 397 additions and 395 deletions

View File

@ -5,8 +5,8 @@
fvScalarMatrix T1Eqn fvScalarMatrix T1Eqn
( (
fvm::ddt(alpha1, T1) fvm::ddt(alpha1, T1)
+ fvm::div(alpha1Phi1, T1) + fvm::div(alphaPhi1, T1)
- fvm::Sp(fvc::ddt(alpha1) + fvc::div(alpha1Phi1), T1) - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), T1)
- fvm::laplacian(kByCp1, T1) - fvm::laplacian(kByCp1, T1)
== ==
heatTransferCoeff*T2/Cp1/rho1 heatTransferCoeff*T2/Cp1/rho1
@ -17,8 +17,8 @@
fvScalarMatrix T2Eqn fvScalarMatrix T2Eqn
( (
fvm::ddt(alpha2, T2) fvm::ddt(alpha2, T2)
+ fvm::div(alpha1Phi2, T2) + fvm::div(alphaPhi2, T2)
- fvm::Sp(fvc::ddt(alpha2) + fvc::div(alpha1Phi2), T2) - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), T2)
- fvm::laplacian(kByCp2, T2) - fvm::laplacian(kByCp2, T2)
== ==
heatTransferCoeff*T1/Cp2/rho2 heatTransferCoeff*T1/Cp2/rho2

View File

@ -31,8 +31,8 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
(scalar(1) + Cvm*rho2*alpha2/rho1)* (scalar(1) + Cvm*rho2*alpha2/rho1)*
( (
fvm::ddt(alpha1, U1) fvm::ddt(alpha1, U1)
+ fvm::div(alpha1Phi1, U1) + fvm::div(alphaPhi1, U1)
- fvm::Sp(fvc::ddt(alpha1) + fvc::div(alpha1Phi1), U1) - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), U1)
) )
- fvm::laplacian(alpha1*nuEff1, U1) - fvm::laplacian(alpha1*nuEff1, U1)
+ fvc::div(alpha1*Rc1) + fvc::div(alpha1*Rc1)
@ -57,8 +57,8 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
(scalar(1) + Cvm*rho2*alpha1/rho2)* (scalar(1) + Cvm*rho2*alpha1/rho2)*
( (
fvm::ddt(alpha2, U2) fvm::ddt(alpha2, U2)
+ fvm::div(alpha1Phi2, U2) + fvm::div(alphaPhi2, U2)
- fvm::Sp(fvc::ddt(alpha2) + fvc::div(alpha1Phi2), U2) - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), U2)
) )
- fvm::laplacian(alpha2*nuEff2, U2) - fvm::laplacian(alpha2*nuEff2, U2)
+ fvc::div(alpha2*Rc2) + fvc::div(alpha2*Rc2)

View File

@ -1,5 +1,5 @@
surfaceScalarField alpha1Phi1("alpha1Phi1", phi1); surfaceScalarField alphaPhi1("alphaPhi1", phi1);
surfaceScalarField alpha1Phi2("alpha1Phi2", phi2); surfaceScalarField alphaPhi2("alphaPhi2", phi2);
{ {
word scheme("div(phi,alpha1)"); word scheme("div(phi,alpha1)");
@ -71,14 +71,14 @@ surfaceScalarField alpha1Phi2("alpha1Phi2", phi2);
ppMagf = rAU1f*fvc::interpolate ppMagf = rAU1f*fvc::interpolate
( (
(1.0/(rho1*(alpha1 + scalar(0.0001)))) (1.0/(rho1*(alpha1 + scalar(0.0001))))
*g0*min(exp(preAlphaExp*(alpha1 - alpha1Max)), expMax) *g0*min(exp(preAlphaExp*(alpha1 - alphaMax)), expMax)
); );
alpha1Eqn -= fvm::laplacian alpha1Eqn -= fvm::laplacian
( (
(fvc::interpolate(alpha1) + scalar(0.0001))*ppMagf, (fvc::interpolate(alpha1) + scalar(0.0001))*ppMagf,
alpha1, alpha1,
"laplacian(alpha1PpMag,alpha1)" "laplacian(alphaPpMag,alpha1)"
); );
} }
@ -90,8 +90,8 @@ surfaceScalarField alpha1Phi2("alpha1Phi2", phi2);
#include "packingLimiter.H" #include "packingLimiter.H"
alpha1Phi1 = alpha1Eqn.flux(); alphaPhi1 = alpha1Eqn.flux();
alpha1Phi2 = phi - alpha1Phi1; alphaPhi2 = phi - alphaPhi1;
alpha2 = scalar(1) - alpha1; alpha2 = scalar(1) - alpha1;
Info<< "Dispersed phase volume fraction = " Info<< "Dispersed phase volume fraction = "

View File

@ -206,7 +206,9 @@
( (
"phi", "phi",
runTime.timeName(), runTime.timeName(),
mesh mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
), ),
fvc::interpolate(alpha1)*phi1 + fvc::interpolate(alpha2)*phi2 fvc::interpolate(alpha1)*phi1 + fvc::interpolate(alpha2)*phi2
); );

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -73,8 +73,8 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::
frictionalPressure frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -82,8 +82,8 @@ frictionalPressure
{ {
return return
Fr*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) Fr*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta)
/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p); /pow(max(alphaMax - alpha1, scalar(5.0e-2)), p);
} }
@ -92,8 +92,8 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::
frictionalPressurePrime frictionalPressurePrime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -101,10 +101,10 @@ frictionalPressurePrime
{ {
return Fr* return Fr*
( (
eta*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta - 1.0) eta*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta - 1.0)
*(alpha1Max-alpha1) *(alphaMax-alpha1)
+ p*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) + p*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta)
)/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p + 1.0); )/pow(max(alphaMax - alpha1, scalar(5.0e-2)), p + 1.0);
} }
@ -112,7 +112,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::muf Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -75,8 +75,8 @@ public:
virtual tmp<volScalarField> frictionalPressure virtual tmp<volScalarField> frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -85,8 +85,8 @@ public:
virtual tmp<volScalarField> frictionalPressurePrime virtual tmp<volScalarField> frictionalPressurePrime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -95,7 +95,7 @@ public:
virtual tmp<volScalarField> muf virtual tmp<volScalarField> muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -71,8 +71,8 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::
frictionalPressure frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -80,7 +80,7 @@ frictionalPressure
{ {
return return
dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24) dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24)
*pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 10.0); *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 10.0);
} }
@ -89,8 +89,8 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::
frictionalPressurePrime frictionalPressurePrime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -98,7 +98,7 @@ frictionalPressurePrime
{ {
return return
dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25) dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25)
*pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 9.0); *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 9.0);
} }
@ -106,7 +106,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi
@ -135,7 +135,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
forAll (D, celli) forAll (D, celli)
{ {
if (alpha1[celli] > alpha1Max.value() - 5e-2) if (alpha1[celli] > alphaMax.value() - 5e-2)
{ {
muff[celli] = muff[celli] =
0.5*pf[celli]*sin(phi.value()) 0.5*pf[celli]*sin(phi.value())

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -75,8 +75,8 @@ public:
virtual tmp<volScalarField> frictionalPressure virtual tmp<volScalarField> frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -85,8 +85,8 @@ public:
virtual tmp<volScalarField> frictionalPressurePrime virtual tmp<volScalarField> frictionalPressurePrime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& n, const dimensionedScalar& n,
const dimensionedScalar& p const dimensionedScalar& p
@ -95,7 +95,7 @@ public:
virtual tmp<volScalarField> muf virtual tmp<volScalarField> muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -107,8 +107,8 @@ public:
virtual tmp<volScalarField> frictionalPressure virtual tmp<volScalarField> frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -117,8 +117,8 @@ public:
virtual tmp<volScalarField> frictionalPressurePrime virtual tmp<volScalarField> frictionalPressurePrime
( (
const volScalarField& alpha1f, const volScalarField& alpha1f,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -127,7 +127,7 @@ public:
virtual tmp<volScalarField> muf virtual tmp<volScalarField> muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -98,8 +98,8 @@ Foam::kineticTheoryModel::kineticTheoryModel
) )
), ),
e_(kineticTheoryProperties_.lookup("e")), e_(kineticTheoryProperties_.lookup("e")),
alpha1Max_(kineticTheoryProperties_.lookup("alpha1Max")), alphaMax_(kineticTheoryProperties_.lookup("alphaMax")),
alpha1MinFriction_(kineticTheoryProperties_.lookup("alpha1MinFriction")), alphaMinFriction_(kineticTheoryProperties_.lookup("alphaMinFriction")),
Fr_(kineticTheoryProperties_.lookup("Fr")), Fr_(kineticTheoryProperties_.lookup("Fr")),
eta_(kineticTheoryProperties_.lookup("eta")), eta_(kineticTheoryProperties_.lookup("eta")),
p_(kineticTheoryProperties_.lookup("p")), p_(kineticTheoryProperties_.lookup("p")),
@ -219,8 +219,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t)
// The solution is higly unstable close to the packing limit. // The solution is higly unstable close to the packing limit.
gs0_ = radialModel_->g0 gs0_ = radialModel_->g0
( (
min(max(alpha1_, scalar(1e-6)), alpha1Max_ - 0.01), min(max(alpha1_, scalar(1e-6)), alphaMax_ - 0.01),
alpha1Max_ alphaMax_
); );
// particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45) // particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45)
@ -341,8 +341,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t)
frictionalStressModel_->frictionalPressure frictionalStressModel_->frictionalPressure
( (
alpha1_, alpha1_,
alpha1MinFriction_, alphaMinFriction_,
alpha1Max_, alphaMax_,
Fr_, Fr_,
eta_, eta_,
p_ p_
@ -363,7 +363,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t)
frictionalStressModel_->muf frictionalStressModel_->muf
( (
alpha1_, alpha1_,
alpha1Max_, alphaMax_,
pf, pf,
D, D,
phi_ phi_

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -92,10 +92,10 @@ class kineticTheoryModel
const dimensionedScalar e_; const dimensionedScalar e_;
//- maximum packing //- maximum packing
const dimensionedScalar alpha1Max_; const dimensionedScalar alphaMax_;
//- min value for which the frictional stresses are zero //- min value for which the frictional stresses are zero
const dimensionedScalar alpha1MinFriction_; const dimensionedScalar alphaMinFriction_;
//- material constant for frictional normal stress //- material constant for frictional normal stress
const dimensionedScalar Fr_; const dimensionedScalar Fr_;

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -70,7 +70,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0 Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
@ -85,7 +85,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0prime Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
return return

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -76,13 +76,13 @@ public:
tmp<volScalarField> g0 tmp<volScalarField> g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
tmp<volScalarField> g0prime tmp<volScalarField> g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
}; };

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -70,10 +70,10 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::Gidaspow::g0 Foam::kineticTheoryModels::radialModels::Gidaspow::g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
return 0.6/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)); return 0.6/(1.0 - pow(alpha1/alphaMax, 1.0/3.0));
} }
@ -81,12 +81,12 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::Gidaspow::g0prime Foam::kineticTheoryModels::radialModels::Gidaspow::g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
return return
(-1.0/5.0)*pow(alpha1/alpha1Max, -2.0/3.0) (-1.0/5.0)*pow(alpha1/alphaMax, -2.0/3.0)
/(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0))); /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0)));
} }

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -75,13 +75,13 @@ public:
tmp<volScalarField> g0 tmp<volScalarField> g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
tmp<volScalarField> g0prime tmp<volScalarField> g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
}; };

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -70,11 +70,11 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::LunSavage::g0 Foam::kineticTheoryModels::radialModels::LunSavage::g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
return pow(1.0 - alpha1/alpha1Max, -2.5*alpha1Max); return pow(1.0 - alpha1/alphaMax, -2.5*alphaMax);
} }
@ -82,10 +82,10 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::LunSavage::g0prime Foam::kineticTheoryModels::radialModels::LunSavage::g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
return 2.5*alpha1Max*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alpha1Max); return 2.5*alphaMax*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alphaMax);
} }

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -75,13 +75,13 @@ public:
tmp<volScalarField> g0 tmp<volScalarField> g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
tmp<volScalarField> g0prime tmp<volScalarField> g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
}; };

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -70,10 +70,10 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::SinclairJackson::g0 Foam::kineticTheoryModels::radialModels::SinclairJackson::g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
return 1.0/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)); return 1.0/(1.0 - pow(alpha1/alphaMax, 1.0/3.0));
} }
@ -81,12 +81,12 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
return return
(-1.0/3.0)*pow(alpha1/alpha1Max, -2.0/3.0) (-1.0/3.0)*pow(alpha1/alphaMax, -2.0/3.0)
/(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0))); /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0)));
} }

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -75,13 +75,13 @@ public:
tmp<volScalarField> g0 tmp<volScalarField> g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
tmp<volScalarField> g0prime tmp<volScalarField> g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
}; };

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -108,14 +108,14 @@ public:
virtual tmp<volScalarField> g0 virtual tmp<volScalarField> g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const = 0; ) const = 0;
//- Derivative of the radial distribution function //- Derivative of the radial distribution function
virtual tmp<volScalarField> g0prime virtual tmp<volScalarField> g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const = 0; ) const = 0;
}; };

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -1,7 +1,7 @@
if (packingLimiter) if (packingLimiter)
{ {
// Calculating exceeding volume fractions // Calculating exceeding volume fractions
volScalarField alpha1Ex(max(alpha1 - alpha1Max, scalar(0))); volScalarField alpha1Ex(max(alpha1 - alphaMax, scalar(0)));
// Finding neighbouring cells of the whole domain // Finding neighbouring cells of the whole domain
labelListList neighbour = mesh.cellCells(); labelListList neighbour = mesh.cellCells();

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -15,9 +15,9 @@
readScalar(ppProperties.lookup("preAlphaExp")) readScalar(ppProperties.lookup("preAlphaExp"))
); );
scalar alpha1Max scalar alphaMax
( (
readScalar(ppProperties.lookup("alpha1Max")) readScalar(ppProperties.lookup("alphaMax"))
); );
scalar expMax scalar expMax

View File

@ -15,7 +15,7 @@ if (turbulence)
fvScalarMatrix epsEqn fvScalarMatrix epsEqn
( (
fvm::ddt(alpha2, epsilon) fvm::ddt(alpha2, epsilon)
+ fvm::div(alpha1Phi2, epsilon) + fvm::div(alphaPhi2, epsilon)
- fvm::laplacian - fvm::laplacian
( (
alpha1Eps*nuEff2, epsilon, alpha1Eps*nuEff2, epsilon,
@ -40,7 +40,7 @@ if (turbulence)
fvScalarMatrix kEqn fvScalarMatrix kEqn
( (
fvm::ddt(alpha2, k) fvm::ddt(alpha2, k)
+ fvm::div(alpha1Phi2, k) + fvm::div(alphaPhi2, k)
- fvm::laplacian - fvm::laplacian
( (
alpha1k*nuEff2, k, alpha1k*nuEff2, k,

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -73,8 +73,8 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::
frictionalPressure frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -82,8 +82,8 @@ frictionalPressure
{ {
return return
Fr*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) Fr*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta)
/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p); /pow(max(alphaMax - alpha1, scalar(5.0e-2)), p);
} }
@ -92,8 +92,8 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::
frictionalPressurePrime frictionalPressurePrime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -101,10 +101,10 @@ frictionalPressurePrime
{ {
return Fr* return Fr*
( (
eta*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta - 1.0) eta*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta - 1.0)
*(alpha1Max-alpha1) *(alphaMax-alpha1)
+ p*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) + p*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta)
)/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p + 1.0); )/pow(max(alphaMax - alpha1, scalar(5.0e-2)), p + 1.0);
} }
@ -112,7 +112,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::muf Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -75,8 +75,8 @@ public:
virtual tmp<volScalarField> frictionalPressure virtual tmp<volScalarField> frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -85,8 +85,8 @@ public:
virtual tmp<volScalarField> frictionalPressurePrime virtual tmp<volScalarField> frictionalPressurePrime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -95,7 +95,7 @@ public:
virtual tmp<volScalarField> muf virtual tmp<volScalarField> muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -71,8 +71,8 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::
frictionalPressure frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -80,7 +80,7 @@ frictionalPressure
{ {
return return
dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24) dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24)
*pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 10.0); *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 10.0);
} }
@ -89,8 +89,8 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::
frictionalPressurePrime frictionalPressurePrime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -98,7 +98,7 @@ frictionalPressurePrime
{ {
return return
dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25) dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25)
*pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 9.0); *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 9.0);
} }
@ -106,7 +106,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi
@ -135,7 +135,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
forAll (D, celli) forAll (D, celli)
{ {
if (alpha1[celli] > alpha1Max.value() - 5e-2) if (alpha1[celli] > alphaMax.value() - 5e-2)
{ {
muff[celli] = muff[celli] =
0.5*pf[celli]*sin(phi.value()) 0.5*pf[celli]*sin(phi.value())

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -75,8 +75,8 @@ public:
virtual tmp<volScalarField> frictionalPressure virtual tmp<volScalarField> frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -85,8 +85,8 @@ public:
virtual tmp<volScalarField> frictionalPressurePrime virtual tmp<volScalarField> frictionalPressurePrime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& n, const dimensionedScalar& n,
const dimensionedScalar& p const dimensionedScalar& p
@ -95,7 +95,7 @@ public:
virtual tmp<volScalarField> muf virtual tmp<volScalarField> muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -107,8 +107,8 @@ public:
virtual tmp<volScalarField> frictionalPressure virtual tmp<volScalarField> frictionalPressure
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -117,8 +117,8 @@ public:
virtual tmp<volScalarField> frictionalPressurePrime virtual tmp<volScalarField> frictionalPressurePrime
( (
const volScalarField& alpha1f, const volScalarField& alpha1f,
const dimensionedScalar& alpha1MinFriction, const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const dimensionedScalar& Fr, const dimensionedScalar& Fr,
const dimensionedScalar& eta, const dimensionedScalar& eta,
const dimensionedScalar& p const dimensionedScalar& p
@ -127,7 +127,7 @@ public:
virtual tmp<volScalarField> muf virtual tmp<volScalarField> muf
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D, const volSymmTensorField& D,
const dimensionedScalar& phi const dimensionedScalar& phi

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -98,8 +98,8 @@ Foam::kineticTheoryModel::kineticTheoryModel
) )
), ),
e_(kineticTheoryProperties_.lookup("e")), e_(kineticTheoryProperties_.lookup("e")),
alpha1Max_(kineticTheoryProperties_.lookup("alpha1Max")), alphaMax_(kineticTheoryProperties_.lookup("alphaMax")),
alpha1MinFriction_(kineticTheoryProperties_.lookup("alpha1MinFriction")), alphaMinFriction_(kineticTheoryProperties_.lookup("alphaMinFriction")),
Fr_(kineticTheoryProperties_.lookup("Fr")), Fr_(kineticTheoryProperties_.lookup("Fr")),
eta_(kineticTheoryProperties_.lookup("eta")), eta_(kineticTheoryProperties_.lookup("eta")),
p_(kineticTheoryProperties_.lookup("p")), p_(kineticTheoryProperties_.lookup("p")),
@ -219,8 +219,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t)
// The solution is higly unstable close to the packing limit. // The solution is higly unstable close to the packing limit.
gs0_ = radialModel_->g0 gs0_ = radialModel_->g0
( (
min(max(alpha1_, scalar(1e-6)), alpha1Max_ - 0.01), min(max(alpha1_, scalar(1e-6)), alphaMax_ - 0.01),
alpha1Max_ alphaMax_
); );
// particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45) // particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45)
@ -341,8 +341,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t)
frictionalStressModel_->frictionalPressure frictionalStressModel_->frictionalPressure
( (
alpha1_, alpha1_,
alpha1MinFriction_, alphaMinFriction_,
alpha1Max_, alphaMax_,
Fr_, Fr_,
eta_, eta_,
p_ p_
@ -363,7 +363,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t)
frictionalStressModel_->muf frictionalStressModel_->muf
( (
alpha1_, alpha1_,
alpha1Max_, alphaMax_,
pf, pf,
D, D,
phi_ phi_

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -92,10 +92,10 @@ class kineticTheoryModel
const dimensionedScalar e_; const dimensionedScalar e_;
//- maximum packing //- maximum packing
const dimensionedScalar alpha1Max_; const dimensionedScalar alphaMax_;
//- min value for which the frictional stresses are zero //- min value for which the frictional stresses are zero
const dimensionedScalar alpha1MinFriction_; const dimensionedScalar alphaMinFriction_;
//- material constant for frictional normal stress //- material constant for frictional normal stress
const dimensionedScalar Fr_; const dimensionedScalar Fr_;

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -70,7 +70,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0 Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
@ -85,7 +85,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0prime Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const ) const
{ {
return return

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -76,13 +76,13 @@ public:
tmp<volScalarField> g0 tmp<volScalarField> g0
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
tmp<volScalarField> g0prime tmp<volScalarField> g0prime
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alpha1Max const dimensionedScalar& alphaMax
) const; ) const;
}; };

Some files were not shown because too many files have changed in this diff Show More