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

Renamed turbulenceProperties -> momentumTransport

Browse Source 
Following the generalisation of the TurbulenceModels library to support
non-Newtonian laminar flow including visco-elasticity and extensible to other
form of non-Newtonian behaviour the name TurbulenceModels is misleading and does
not properly represent how general the OpenFOAM solvers now are.  The
TurbulenceModels now provides an interface to momentum transport modelling in
general and the plan is to rename it MomentumTransportModels and in preparation
for this the turbulenceProperties dictionary has been renamed momentumTransport
to properly reflect its new more general purpose.

The old turbulenceProperties name is supported for backward-compatibility.
This commit is contained in:
Henry Weller
2020-04-10 17:17:37 +01:00
parent b9c7428619
commit 7f5144312e
472 changed files with 2788 additions and 3219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/functionObjects/field/PecletNo/PecletNo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,7 +56,7 @@ bool Foam::functionObjects::PecletNo::calc()
(
mesh_.lookupObject<turbulenceModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
).nuEff()
);

6
src/functionObjects/field/age/age.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -175,7 +175,7 @@ bool Foam::functionObjects::age::execute()
tmuEff =
mesh_.lookupObject<turbulenceModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
).muEff();
laplacianScheme =
@ -212,7 +212,7 @@ bool Foam::functionObjects::age::execute()
tnuEff =
mesh_.lookupObject<turbulenceModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
).nuEff();
laplacianScheme =

2
src/functionObjects/field/shearStress/shearStress.C
View File

@ -91,7 +91,7 @@ bool Foam::functionObjects::shearStress::execute()
const word turbulenceModelName
(
IOobject::groupName(turbulenceModel::propertiesName, phaseName_)
IOobject::groupName(turbulenceModel::typeName, phaseName_)
);
if (mesh_.foundObject<cmpModel>(turbulenceModelName))

4
src/functionObjects/field/turbulenceFields/turbulenceFields.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -118,7 +118,7 @@ Foam::functionObjects::turbulenceFields::~turbulenceFields()
const Foam::word& Foam::functionObjects::turbulenceFields::modelName()
{
return Foam::turbulenceModel::propertiesName;
return Foam::turbulenceModel::typeName;
}

6
src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -96,11 +96,11 @@ bool Foam::functionObjects::turbulenceIntensity::read(const dictionary& dict)
bool Foam::functionObjects::turbulenceIntensity::execute()
{
if (mesh_.foundObject<turbulenceModel>(turbulenceModel::propertiesName))
if (mesh_.foundObject<turbulenceModel>(turbulenceModel::typeName))
{
const turbulenceModel& turbModel = mesh_.lookupObject<turbulenceModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
);
volScalarField uPrime(sqrt((2.0/3.0)*turbModel.k()));

6
src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -204,14 +204,14 @@ bool Foam::functionObjects::wallHeatFlux::execute()
(
foundObject<compressible::turbulenceModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
)
)
{
const compressible::turbulenceModel& turbModel =
lookupObject<compressible::turbulenceModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
);
return store

6
src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -200,14 +200,14 @@ bool Foam::functionObjects::wallHeatTransferCoeff::execute()
(
foundObject<incompressible::turbulenceModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
)
)
{
const incompressible::turbulenceModel& turbModel =
lookupObject<incompressible::turbulenceModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
);
return store

10
src/functionObjects/field/wallShearStress/wallShearStress.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -181,17 +181,17 @@ bool Foam::functionObjects::wallShearStress::execute()
typedef incompressible::turbulenceModel icoModel;
tmp<volSymmTensorField> Reff;
if (mesh_.foundObject<cmpModel>(turbulenceModel::propertiesName))
if (mesh_.foundObject<cmpModel>(turbulenceModel::typeName))
{
const cmpModel& model =
mesh_.lookupObject<cmpModel>(turbulenceModel::propertiesName);
mesh_.lookupObject<cmpModel>(turbulenceModel::typeName);
Reff = model.devRhoReff();
}
else if (mesh_.foundObject<icoModel>(turbulenceModel::propertiesName))
else if (mesh_.foundObject<icoModel>(turbulenceModel::typeName))
{
const icoModel& model =
mesh_.lookupObject<icoModel>(turbulenceModel::propertiesName);
mesh_.lookupObject<icoModel>(turbulenceModel::typeName);
Reff = model.devReff();
}

6
src/functionObjects/field/yPlus/yPlus.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -163,12 +163,12 @@ bool Foam::functionObjects::yPlus::execute()
{
if (mesh_.foundObject<turbulenceModel>
(
IOobject::groupName(turbulenceModel::propertiesName, phaseName_))
IOobject::groupName(turbulenceModel::typeName, phaseName_))
)
{
const turbulenceModel& model = mesh_.lookupObject<turbulenceModel>
(
IOobject::groupName(turbulenceModel::propertiesName, phaseName_)
IOobject::groupName(turbulenceModel::typeName, phaseName_)
);
word name(IOobject::groupName(type(), phaseName_));

10
src/functionObjects/forces/forces/forces.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -221,17 +221,17 @@ Foam::functionObjects::forces::devRhoReff() const
typedef compressible::turbulenceModel cmpTurbModel;
typedef incompressible::turbulenceModel icoTurbModel;
if (obr_.foundObject<cmpTurbModel>(cmpTurbModel::propertiesName))
if (obr_.foundObject<cmpTurbModel>(turbulenceModel::typeName))
{
const cmpTurbModel& turb =
obr_.lookupObject<cmpTurbModel>(cmpTurbModel::propertiesName);
obr_.lookupObject<cmpTurbModel>(turbulenceModel::typeName);
return turb.devRhoReff();
}
else if (obr_.foundObject<icoTurbModel>(icoTurbModel::propertiesName))
else if (obr_.foundObject<icoTurbModel>(turbulenceModel::typeName))
{
const incompressible::turbulenceModel& turb =
obr_.lookupObject<icoTurbModel>(icoTurbModel::propertiesName);
obr_.lookupObject<icoTurbModel>(turbulenceModel::typeName);
return rho()*turb.devReff();
}

4
src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -247,7 +247,7 @@ Foam::functionObjects::phaseScalarTransport::D
);
}
const word& nameNoPhase = turbulenceModel::propertiesName;
const word& nameNoPhase = turbulenceModel::typeName;
const word namePhase = IOobject::groupName(nameNoPhase, phaseName_);
const word& name =

10
src/functionObjects/solvers/scalarTransport/scalarTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -72,20 +72,20 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
dimensionedScalar(Dname, phi.dimensions()/dimLength, D_)
);
}
else if (mesh_.foundObject<icoModel>(turbulenceModel::propertiesName))
else if (mesh_.foundObject<icoModel>(turbulenceModel::typeName))
{
const icoModel& model = mesh_.lookupObject<icoModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
);
return alphaD_*model.nu() + alphaDt_*model.nut();
}
else if (mesh_.foundObject<cmpModel>(turbulenceModel::propertiesName))
else if (mesh_.foundObject<cmpModel>(turbulenceModel::typeName))
{
const cmpModel& model = mesh_.lookupObject<cmpModel>
(
turbulenceModel::propertiesName
turbulenceModel::typeName
);
return alphaD_*model.mu() + alphaDt_*model.mut();