zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TurbulenceModels: Obtain the group name from alphaRhoPhi rather than U

Browse Source 
to support multiphase solvers in which the phases have the same velocity field.
This commit is contained in:
Henry Weller
2017-10-11 22:47:08 +01:00
parent 8e6da093cb
commit 8c5d9fcf29
20 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -124,7 +124,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::alphat() const
(
IOobject
(
IOobject::groupName("alphat", this->U_.group()),
IOobject::groupName("alphat", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

6
src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -110,7 +110,7 @@ Foam::PhaseCompressibleTurbulenceModel<TransportModel>::pPrime() const
(
IOobject
(
IOobject::groupName("pPrime", this->U_.group()),
IOobject::groupName("pPrime", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,
@ -133,7 +133,7 @@ Foam::PhaseCompressibleTurbulenceModel<TransportModel>::pPrimef() const
(
IOobject
(
IOobject::groupName("pPrimef", this->U_.group()),
IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

6
src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
View File

@ -189,7 +189,7 @@ continuousGasKEpsilon<BasicTurbulenceModel>::nuEff() const
(
new volScalarField
(
IOobject::groupName("nuEff", this->U_.group()),
IOobject::groupName("nuEff", this->alphaRhoPhi_.group()),
blend*this->nut_
+ (1.0 - blend)*rhoEff()*nutEff_/this->transport().rho()
+ this->nu()
@ -210,7 +210,7 @@ continuousGasKEpsilon<BasicTurbulenceModel>::rhoEff() const
(
new volScalarField
(
IOobject::groupName("rhoEff", this->U_.group()),
IOobject::groupName("rhoEff", this->alphaRhoPhi_.group()),
gas.rho() + (fluid.virtualMass(gas).Cvm() + 3.0/20.0)*liquid.rho()
)
);
@ -278,7 +278,7 @@ continuousGasKEpsilon<BasicTurbulenceModel>::R() const
(
IOobject
(
IOobject::groupName("R", this->U_.group()),
IOobject::groupName("R", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

6
src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -109,7 +109,7 @@ Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::pPrime() const
(
IOobject
(
IOobject::groupName("pPrime", this->U_.group()),
IOobject::groupName("pPrime", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,
@ -132,7 +132,7 @@ Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::pPrimef() const
(
IOobject
(
IOobject::groupName("pPrimef", this->U_.group()),
IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

4
src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -150,7 +150,7 @@ tmp<volScalarField> DeardorffDiffStress<BasicTurbulenceModel>::epsilon() const
(
IOobject
(
IOobject::groupName("epsilon", this->U_.group()),
IOobject::groupName("epsilon", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

4
src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -212,7 +212,7 @@ public:
(
new volScalarField
(
IOobject::groupName("nuEff", this->U_.group()),
IOobject::groupName("nuEff", this->alphaRhoPhi_.group()),
this->nut() + this->nu()
)
);

4
src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -100,7 +100,7 @@ tmp<volScalarField> LESeddyViscosity<BasicTurbulenceModel>::epsilon() const
(
IOobject
(
IOobject::groupName("epsilon", this->U_.group()),
IOobject::groupName("epsilon", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

6
src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -53,7 +53,7 @@ tmp<volScalarField> Smagorinsky<BasicTurbulenceModel>::k
(
IOobject
(
IOobject::groupName("k", this->U_.group()),
IOobject::groupName("k", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_
),
@ -149,7 +149,7 @@ tmp<volScalarField> Smagorinsky<BasicTurbulenceModel>::epsilon() const
(
IOobject
(
IOobject::groupName("epsilon", this->U_.group()),
IOobject::groupName("epsilon", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_
),

6
src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,7 +59,7 @@ tmp<volScalarField> WALE<BasicTurbulenceModel>::k
(
IOobject
(
IOobject::groupName("k", this->U_.group()),
IOobject::groupName("k", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_
),
@ -180,7 +180,7 @@ tmp<volScalarField> WALE<BasicTurbulenceModel>::epsilon() const
(
IOobject
(
IOobject::groupName("epsilon", this->U_.group()),
IOobject::groupName("epsilon", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

6
src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -172,7 +172,7 @@ dynamicKEqn<BasicTurbulenceModel>::dynamicKEqn
(
IOobject
(
IOobject::groupName("k", this->U_.group()),
IOobject::groupName("k", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -221,7 +221,7 @@ tmp<volScalarField> dynamicKEqn<BasicTurbulenceModel>::epsilon() const
(
IOobject
(
IOobject::groupName("epsilon", this->U_.group()),
IOobject::groupName("epsilon", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

4
src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
View File

@ -87,7 +87,7 @@ dynamicLagrangian<BasicTurbulenceModel>::dynamicLagrangian
(
IOobject
(
IOobject::groupName("flm", this->U_.group()),
IOobject::groupName("flm", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -99,7 +99,7 @@ dynamicLagrangian<BasicTurbulenceModel>::dynamicLagrangian
(
IOobject
(
IOobject::groupName("fmm", this->U_.group()),
IOobject::groupName("fmm", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,

6
src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -92,7 +92,7 @@ kEqn<BasicTurbulenceModel>::kEqn
(
IOobject
(
IOobject::groupName("k", this->U_.group()),
IOobject::groupName("k", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -147,7 +147,7 @@ tmp<volScalarField> kEqn<BasicTurbulenceModel>::epsilon() const
(
IOobject
(
IOobject::groupName("epsilon", this->U_.group()),
IOobject::groupName("epsilon", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

4
src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -220,7 +220,7 @@ public:
(
new volScalarField
(
IOobject::groupName("nuEff", this->U_.group()),
IOobject::groupName("nuEff", this->alphaRhoPhi_.group()),
this->nut() + this->nu()
)
);

10
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
View File

@ -89,7 +89,7 @@ tmp<volScalarField::Internal> kOmegaSSTLM<BasicTurbulenceModel>::Fthetat
(
new volScalarField::Internal
(
IOobject::groupName("Fthetat", this->U_.group()),
IOobject::groupName("Fthetat", this->alphaRhoPhi_.group()),
min
(
max
@ -114,7 +114,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::ReThetac() const
(
IOobject
(
IOobject::groupName("ReThetac", this->U_.group()),
IOobject::groupName("ReThetac", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_
),
@ -157,7 +157,7 @@ tmp<volScalarField::Internal> kOmegaSSTLM<BasicTurbulenceModel>::Flength
(
IOobject
(
IOobject::groupName("Flength", this->U_.group()),
IOobject::groupName("Flength", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_
),
@ -222,7 +222,7 @@ tmp<volScalarField::Internal> kOmegaSSTLM<BasicTurbulenceModel>::ReThetat0
(
IOobject
(
IOobject::groupName("ReThetat0", this->U_.group()),
IOobject::groupName("ReThetat0", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_
),
@ -343,7 +343,7 @@ tmp<volScalarField::Internal> kOmegaSSTLM<BasicTurbulenceModel>::Fonset
(
new volScalarField::Internal
(
IOobject::groupName("Fonset", this->U_.group()),
IOobject::groupName("Fonset", this->alphaRhoPhi_.group()),
max(Fonset2 - Fonset3, scalar(0))
)
);

2
src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
View File

@ -212,7 +212,7 @@ Foam::ReynoldsStress<BasicTurbulenceModel>::devRhoReff() const
(
IOobject
(
IOobject::groupName("devRhoReff", this->U_.group()),
IOobject::groupName("devRhoReff", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

2
src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
View File

@ -107,7 +107,7 @@ Foam::eddyViscosity<BasicTurbulenceModel>::R() const
(
IOobject
(
IOobject::groupName("R", this->U_.group()),
IOobject::groupName("R", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

2
src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C
View File

@ -135,7 +135,7 @@ Maxwell<BasicTurbulenceModel>::devRhoReff() const
(
IOobject
(
IOobject::groupName("devRhoReff", this->U_.group()),
IOobject::groupName("devRhoReff", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

12
src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -92,7 +92,7 @@ Stokes<BasicTurbulenceModel>::nut() const
(
IOobject
(
IOobject::groupName("nut", this->U_.group()),
IOobject::groupName("nut", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,
@ -128,7 +128,7 @@ Stokes<BasicTurbulenceModel>::nuEff() const
(
new volScalarField
(
IOobject::groupName("nuEff", this->U_.group()), this->nu()
IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), this->nu()
)
);
}
@ -155,7 +155,7 @@ Stokes<BasicTurbulenceModel>::k() const
(
IOobject
(
IOobject::groupName("k", this->U_.group()),
IOobject::groupName("k", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,
@ -179,7 +179,7 @@ Stokes<BasicTurbulenceModel>::epsilon() const
(
IOobject
(
IOobject::groupName("epsilon", this->U_.group()),
IOobject::groupName("epsilon", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,
@ -206,7 +206,7 @@ Stokes<BasicTurbulenceModel>::R() const
(
IOobject
(
IOobject::groupName("R", this->U_.group()),
IOobject::groupName("R", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

10
src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
View File

@ -191,7 +191,7 @@ Foam::laminarModel<BasicTurbulenceModel>::nut() const
(
IOobject
(
IOobject::groupName("nut", this->U_.group()),
IOobject::groupName("nut", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,
@ -227,7 +227,7 @@ Foam::laminarModel<BasicTurbulenceModel>::nuEff() const
(
new volScalarField
(
IOobject::groupName("nuEff", this->U_.group()), this->nu()
IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), this->nu()
)
);
}
@ -254,7 +254,7 @@ Foam::laminarModel<BasicTurbulenceModel>::k() const
(
IOobject
(
IOobject::groupName("k", this->U_.group()),
IOobject::groupName("k", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,
@ -278,7 +278,7 @@ Foam::laminarModel<BasicTurbulenceModel>::epsilon() const
(
IOobject
(
IOobject::groupName("epsilon", this->U_.group()),
IOobject::groupName("epsilon", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,
@ -305,7 +305,7 @@ Foam::laminarModel<BasicTurbulenceModel>::R() const
(
IOobject
(
IOobject::groupName("R", this->U_.group()),
IOobject::groupName("R", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,

4
src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,7 +75,7 @@ Foam::linearViscousStress<BasicTurbulenceModel>::devRhoReff() const
(
IOobject
(
IOobject::groupName("devRhoReff", this->U_.group()),
IOobject::groupName("devRhoReff", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::NO_READ,