TurbulenceModels: Obtain the group name from alphaRhoPhi rather than U

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
parent c756b5bee8
commit 877b0c2f7d
26 changed files with 66 additions and 66 deletions

View File

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

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,

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,

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,

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,

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,

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,

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,

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,

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,

View File

@ -357,7 +357,7 @@ kOmegaSST<TurbulenceModel, BasicTurbulenceModel>::kOmegaSST
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -369,7 +369,7 @@ kOmegaSST<TurbulenceModel, BasicTurbulenceModel>::kOmegaSST
(
IOobject
(
IOobject::groupName("omega", U.group()),
IOobject::groupName("omega", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,

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,

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,

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,

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,

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,

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
@ -444,7 +444,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
(
IOobject
(
IOobject::groupName("ReThetat", U.group()),
IOobject::groupName("ReThetat", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -457,7 +457,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
(
IOobject
(
IOobject::groupName("gammaInt", U.group()),
IOobject::groupName("gammaInt", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -470,7 +470,7 @@ kOmegaSSTLM<BasicTurbulenceModel>::kOmegaSSTLM
(
IOobject
(
IOobject::groupName("gammaIntEff", U.group()),
IOobject::groupName("gammaIntEff", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_
),

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
@ -166,7 +166,7 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
(
LESdelta::New
(
IOobject::groupName("delta", U.group()),
IOobject::groupName("delta", alphaRhoPhi.group()),
*this,
this->coeffDict_
)

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
@ -186,7 +186,7 @@ v2f<BasicTurbulenceModel>::v2f
(
IOobject
(
IOobject::groupName("k", U.group()),
IOobject::groupName("k", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -198,7 +198,7 @@ v2f<BasicTurbulenceModel>::v2f
(
IOobject
(
IOobject::groupName("epsilon", U.group()),
IOobject::groupName("epsilon", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -210,7 +210,7 @@ v2f<BasicTurbulenceModel>::v2f
(
IOobject
(
IOobject::groupName("v2", U.group()),
IOobject::groupName("v2", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
@ -222,7 +222,7 @@ v2f<BasicTurbulenceModel>::v2f
(
IOobject
(
IOobject::groupName("f", U.group()),
IOobject::groupName("f", alphaRhoPhi.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,

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,

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,

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,

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,

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,

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_
),

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,