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

COMP: Multiple changes - first clean build after latest merge - UNTESTED

Browse Source
This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,43 +53,45 @@ namespace functionObjects
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::volScalarField& Foam::scalarTransport::transportedField()
Foam::volScalarField& Foam::functionObjects::scalarTransport::transportedField()
{
if (!mesh_.foundObject<volScalarField>(fieldName_))
if (!foundObject<volScalarField>(fieldName_))
{
volScalarField* fldPtr = new volScalarField
tmp<volScalarField> tfldPtr
(
IOobject
new volScalarField
(
fieldName_,
mesh_.time().timeName(),
mesh_,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh_,
dimensionedScalar("zero", dimless, 0.0),
boundaryTypes()
IOobject
(
fieldName_,
mesh_.time().timeName(),
mesh_,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh_
)
);
fldPtr->store();
store(fieldName_, tfldPtr);
}
return const_cast<volScalarField&>
(
mesh_.lookupObject<volScalarField>(fieldName_)
lookupObject<volScalarField>(fieldName_)
);
}
Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
(
const volScalarField& s,
const surfaceScalarField& phi
) const
{
typedef incompressible::turbulenceModel icoModel;
typedef compressible::turbulenceModel cmpModel;
word Dname("D" + s_.name());
word Dname("D" + s.name());
if (constantD_)
{
@ -110,18 +112,18 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
)
);
}
else if (mesh_.foundObject<icoModel>(turbulenceModel::propertiesName))
else if (foundObject<icoModel>(turbulenceModel::propertiesName))
{
const icoModel& model = mesh_.lookupObject<icoModel>
const icoModel& model = lookupObject<icoModel>
(
turbulenceModel::propertiesName
);
return model.nuEff();
}
else if (mesh_.foundObject<cmpModel>(turbulenceModel::propertiesName))
else if (foundObject<cmpModel>(turbulenceModel::propertiesName))
{
const cmpModel& model = mesh_.lookupObject<cmpModel>
const cmpModel& model = lookupObject<cmpModel>
(
turbulenceModel::propertiesName
);
@ -221,13 +223,12 @@ bool Foam::functionObjects::scalarTransport::execute()
{
Log << type() << " write:" << endl;
const surfaceScalarField& phi =
mesh_.lookupObject<surfaceScalarField>(phiName_);
const surfaceScalarField& phi = lookupObject<surfaceScalarField>(phiName_);
volScalarField& s = transportedField();
// Calculate the diffusivity
volScalarField D(this->D(phi));
volScalarField D(this->D(s, phi));
word divScheme("div(phi," + schemesField_ + ")");
word laplacianScheme("laplacian(" + D.name() + "," + schemesField_ + ")");
@ -241,8 +242,7 @@ bool Foam::functionObjects::scalarTransport::execute()
if (phi.dimensions() == dimMass/dimTime)
{
const volScalarField& rho =
mesh_.lookupObject<volScalarField>(rhoName_);
const volScalarField& rho = lookupObject<volScalarField>(rhoName_);
for (label i = 0; i <= nCorr_; i++)
{

8
src/functionObjects/solvers/scalarTransport/scalarTransport.H
View File

@ -45,7 +45,7 @@ Description
scalar1
{
type scalarTransport;
functionObjectLibs ("libutilityFunctionObjects.so");
libs ("libutilityFunctionObjects.so");
fvOptions
{
@ -137,7 +137,11 @@ class scalarTransport
volScalarField& transportedField();
//- Return the diffusivity field
tmp<volScalarField> D(const surfaceScalarField& phi) const;
tmp<volScalarField> D
(
const volScalarField& s,
const surfaceScalarField& phi
) const;
//- Disallow default bitwise copy construct
scalarTransport(const scalarTransport&) = delete;