zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: 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 21:59:32 +01:00
committed by Andrew Heather
parent 405bb9414d
commit efe4a9a4b7
40 changed files with 122 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/VoF/createAlphaFluxes.H
View File

@ -1,6 +1,6 @@
IOobject alphaPhi10Header
(
"alphaPhi10",
IOobject::groupName("alphaPhi0", alpha1.group()),
runTime.timeName(),
mesh,
IOobject::READ_IF_PRESENT,

4
src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.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
@ -77,7 +77,7 @@ Foam::EddyDiffusivity<BasicTurbulenceModel>::EddyDiffusivity
(
IOobject
(
IOobject::groupName("alphat", U.group()),
IOobject::groupName("alphat", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,

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
@ -122,7 +122,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/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.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
@ -151,7 +151,7 @@ LamBremhorstKE::LamBremhorstKE
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,
@ -164,7 +164,7 @@ LamBremhorstKE::LamBremhorstKE
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.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
@ -301,7 +301,7 @@ LienCubicKE::LienCubicKE
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,
@ -314,7 +314,7 @@ LienCubicKE::LienCubicKE
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.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
@ -195,7 +195,7 @@ LienLeschziner::LienLeschziner
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,
@ -208,7 +208,7 @@ LienLeschziner::LienLeschziner
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.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
@ -195,7 +195,7 @@ ShihQuadraticKE::ShihQuadraticKE
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,
@ -208,7 +208,7 @@ ShihQuadraticKE::ShihQuadraticKE
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,

8
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.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
@ -490,7 +490,7 @@ kkLOmega::kkLOmega
(
IOobject
(
IOobject::groupName("kt", U.group()),
IOobject::groupName("kt", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,
@ -502,7 +502,7 @@ kkLOmega::kkLOmega
(
IOobject
(
IOobject::groupName("kl", U.group()),
IOobject::groupName("kl", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,
@ -514,7 +514,7 @@ kkLOmega::kkLOmega
(
IOobject
(
IOobject::groupName("omega", U.group()),
IOobject::groupName("omega", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,

10
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.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
@ -153,7 +153,7 @@ qZeta::qZeta
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,
@ -166,7 +166,7 @@ qZeta::qZeta
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::MUST_READ,
@ -179,7 +179,7 @@ qZeta::qZeta
(
IOobject
(
IOobject::groupName("q", U.group()),
IOobject::groupName("q", alphaRhoPhi.group()),
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
@ -193,7 +193,7 @@ qZeta::qZeta
(
IOobject
(
IOobject::groupName("zeta", U.group()),
IOobject::groupName("zeta", alphaRhoPhi.group()),
runTime_.timeName(),
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
@ -108,7 +108,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,
@ -128,7 +128,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,

10
src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.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
@ -68,7 +68,7 @@ continuousGasKEpsilon<BasicTurbulenceModel>::continuousGasKEpsilon
(
IOobject
(
IOobject::groupName("nutEff", U.group()),
IOobject::groupName("nutEff", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::READ_IF_PRESENT,
@ -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/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.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
@ -136,7 +136,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -148,7 +148,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,

12
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
@ -107,7 +107,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,
@ -127,7 +127,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,
@ -160,8 +160,7 @@ Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::divDevReff
template<class TransportModel>
Foam::tmp<Foam::volSymmTensorField>
Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::
devRhoReff() const
Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::devRhoReff() const
{
NotImplemented;
@ -171,8 +170,7 @@ devRhoReff() const
template<class TransportModel>
Foam::tmp<Foam::fvVectorMatrix>
Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::
divDevRhoReff
Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::divDevRhoReff
(
volVectorField& U
) const

4
src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
View File

@ -365,7 +365,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -377,7 +377,7 @@ kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
(
IOobject
(
IOobject::groupName("omega", U.group()),
IOobject::groupName("omega", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_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.C
View File

@ -106,7 +106,7 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
(
LESdelta::New
(
IOobject::groupName("delta", U.group()),
IOobject::groupName("delta", alphaRhoPhi.group()),
*this,
LESDict_
)
@ -141,7 +141,7 @@ Foam::LESModel<BasicTurbulenceModel>::New
(
IOobject
(
IOobject::groupName(propertiesName, U.group()),
IOobject::groupName(propertiesName, alphaRhoPhi.group()),
U.time().constant(),
U.db(),
IOobject::MUST_READ_IF_MODIFIED,

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 | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -101,7 +101,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
@ -178,7 +178,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,
@ -227,7 +227,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,

2
src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
View File

@ -131,7 +131,7 @@ Foam::RASModel<BasicTurbulenceModel>::New
(
IOobject
(
IOobject::groupName(propertiesName, U.group()),
IOobject::groupName(propertiesName, alphaRhoPhi.group()),
U.time().constant(),
U.db(),
IOobject::MUST_READ_IF_MODIFIED,

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

4
src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
View File

@ -181,7 +181,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -193,7 +193,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,

4
src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
View File

@ -163,7 +163,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -175,7 +175,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,

6
src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.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
@ -124,7 +124,7 @@ kOmega<BasicTurbulenceModel>::kOmega
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -136,7 +136,7 @@ kOmega<BasicTurbulenceModel>::kOmega
(
IOobject
(
IOobject::groupName("omega", U.group()),
IOobject::groupName("omega", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -94,7 +94,7 @@ tmp<volScalarField::Internal> kOmegaSSTLM<BasicTurbulenceModel>::Fthetat
(
new volScalarField::Internal
(
IOobject::groupName("Fthetat", this->U_.group()),
IOobject::groupName("Fthetat", this->alphaRhoPhi_.group()),
min
(
max
@ -119,7 +119,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::ReThetac() const
(
IOobject
(
IOobject::groupName("ReThetac", this->U_.group()),
IOobject::groupName("ReThetac", this->alphaRhoPhi_.group()),
this->runTime_.timeName(),
this->mesh_
),
@ -162,7 +162,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_
),
@ -227,7 +227,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_
),
@ -348,7 +348,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))
)
);
@ -450,7 +450,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
(
IOobject
(
IOobject::groupName("ReThetat", U.group()),
IOobject::groupName("ReThetat", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -463,7 +463,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
(
IOobject
(
IOobject::groupName("gammaInt", U.group()),
IOobject::groupName("gammaInt", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -476,7 +476,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
(
IOobject
(
IOobject::groupName("gammaIntEff", U.group()),
IOobject::groupName("gammaIntEff", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_
),

4
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.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
@ -167,7 +167,7 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
(
LESdelta::New
(
IOobject::groupName("delta", U.group()),
IOobject::groupName("delta", alphaRhoPhi.group()),
*this,
this->coeffDict_
)

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -217,7 +217,7 @@ v2f<BasicTurbulenceModel>::v2f
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -229,7 +229,7 @@ v2f<BasicTurbulenceModel>::v2f
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -241,7 +241,7 @@ v2f<BasicTurbulenceModel>::v2f
(
IOobject
(
IOobject::groupName("v2", U.group()),
IOobject::groupName("v2", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -253,7 +253,7 @@ v2f<BasicTurbulenceModel>::v2f
(
IOobject
(
IOobject::groupName("f", U.group()),
IOobject::groupName("f", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,

8
src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.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
@ -143,7 +143,7 @@ Foam::ReynoldsStress<BasicTurbulenceModel>::ReynoldsStress
(
IOobject
(
IOobject::groupName("R", U.group()),
IOobject::groupName("R", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -156,7 +156,7 @@ Foam::ReynoldsStress<BasicTurbulenceModel>::ReynoldsStress
(
IOobject
(
IOobject::groupName("nut", U.group()),
IOobject::groupName("nut", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -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,

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -93,7 +93,7 @@ Foam::TurbulenceModel<Alpha, Rho, BasicTurbulenceModel, TransportModel>::New
(
IOobject
(
IOobject::groupName(propertiesName, U.group()),
IOobject::groupName(propertiesName, alphaRhoPhi.group()),
U.time().constant(),
U.db(),
IOobject::MUST_READ_IF_MODIFIED,

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -58,7 +58,7 @@ Foam::eddyViscosity<BasicTurbulenceModel>::eddyViscosity
(
IOobject
(
IOobject::groupName("nut", U.group()),
IOobject::groupName("nut", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -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,

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -84,7 +84,7 @@ Maxwell<BasicTurbulenceModel>::Maxwell
(
IOobject
(
IOobject::groupName("sigma", U.group()),
IOobject::groupName("sigma", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -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
@ -90,7 +90,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,
@ -125,7 +125,7 @@ Stokes<BasicTurbulenceModel>::nuEff() const
(
new volScalarField
(
IOobject::groupName("nuEff", this->U_.group()), this->nu()
IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), this->nu()
)
);
}
@ -150,7 +150,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,
@ -171,7 +171,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,
@ -192,7 +192,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,

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

@ -94,7 +94,7 @@ Foam::laminarModel<BasicTurbulenceModel>::New
(
IOobject
(
IOobject::groupName(propertiesName, U.group()),
IOobject::groupName(propertiesName, alphaRhoPhi.group()),
U.time().constant(),
U.db(),
IOobject::MUST_READ_IF_MODIFIED,
@ -188,7 +188,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,
@ -223,7 +223,7 @@ Foam::laminarModel<BasicTurbulenceModel>::nuEff() const
(
new volScalarField
(
IOobject::groupName("nuEff", this->U_.group()), this->nu()
IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), this->nu()
)
);
}
@ -248,7 +248,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,
@ -269,7 +269,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,
@ -290,7 +290,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,

4
src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.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
@ -58,7 +58,7 @@ Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::nonlinearEddyViscosity
(
IOobject
(
IOobject::groupName("nonlinearStress", U.group()),
IOobject::groupName("nonlinearStress", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_
),

4
src/TurbulenceModels/turbulenceModels/turbulenceModel.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
@ -52,7 +52,7 @@ Foam::turbulenceModel::turbulenceModel
(
IOobject
(
IOobject::groupName(propertiesName, U.group()),
IOobject::groupName(propertiesName, alphaRhoPhi.group()),
U.time().constant(),
U.db(),
IOobject::MUST_READ_IF_MODIFIED,