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

ENH: Clean-up after latest Foundation integrations

Browse Source
This commit is contained in:
Andrew Heather
2017-03-27 14:34:01 +01:00
parent dcb1a95e35
commit b708c23cfc
17 changed files with 433 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
View File

@ -369,8 +369,10 @@ diffusionMulticomponent<CombThermoType, ThermoType>::correct()
template<class CombThermoType, class ThermoType>
Foam::tmp<Foam::fvScalarMatrix>
Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::
R(volScalarField& Y) const
Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::R
(
volScalarField& Y
) const
{
tmp<fvScalarMatrix> tSu(new fvScalarMatrix(Y, dimMass/dimTime));
@ -378,7 +380,7 @@ R(volScalarField& Y) const
if (this->active())
{
const label specieI = this->thermo().composition().species()[Y.name()];
const label specieI = this->thermo().composition().species()[Y.member()];
Su += this->chemistryPtr_->RR(specieI);
}
@ -389,15 +391,15 @@ R(volScalarField& Y) const
template<class CombThermoType, class ThermoType>
Foam::tmp<Foam::volScalarField>
Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::
dQ() const
Qdot() const
{
tmp<volScalarField> tdQ
tmp<volScalarField> tQdot
(
new volScalarField
(
IOobject
(
"dQ",
"Qdot",
this->mesh().time().timeName(),
this->mesh(),
IOobject::NO_READ,
@ -412,45 +414,11 @@ dQ() const
if (this->active())
{
volScalarField& dQ = tdQ.ref();
dQ = this->chemistryPtr_->dQ();
volScalarField& Qdot = tQdot.ref();
Qdot = this->chemistryPtr_->Qdot();
}
return tdQ;
}
template<class CombThermoType, class ThermoType>
Foam::tmp<Foam::volScalarField>
Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::
Sh() const
{
tmp<volScalarField> tSh
(
new volScalarField
(
IOobject
(
"Sh",
this->mesh().time().timeName(),
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0),
zeroGradientFvPatchScalarField::typeName
)
);
if (this->active())
{
scalarField& Sh = tSh.ref();
Sh = this->chemistryPtr_->Sh();
}
return tSh;
return tQdot;
}