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

sign change on thermalDissipation source (consistency with momentum source)

Browse Source 
- rename thermalDissipationEff() -> thermalDissipationEquilibrium()
This commit is contained in:
Mark Olesen
2009-07-13 16:08:58 +02:00
parent d01f653d32
commit 5b09b44b16
20 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/turbulenceModels/compressible/LES/LESModel/LESModel.C
View File

@ -197,15 +197,16 @@ tmp<volScalarField> LESModel::thermalDissipation() const
IOobject::NO_READ,
IOobject::NO_WRITE
),
(
- (
( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
) + this->rho() * this->epsilon()
)
- this->rho() * this->epsilon()
)
);
}
tmp<volScalarField> LESModel::thermalDissipationEff() const
tmp<volScalarField> LESModel::thermalDissipationEquilibrium() const
{
tmp<volTensorField> tgradU = fvc::grad(this->U());
@ -215,13 +216,13 @@ tmp<volScalarField> LESModel::thermalDissipationEff() const
(
IOobject
(
"thermalDissipationEff",
"thermalDissipationEquilibrium",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
(
- (
this->muEff()*dev(twoSymm(tgradU()))
- ((2.0/3.0)*I) * this->rho() * this->k()
) && tgradU()

2
src/turbulenceModels/compressible/LES/LESModel/LESModel.H
View File

@ -300,7 +300,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const;
//- Correct Eddy-Viscosity and related properties.
// This calls correct(const tmp<volTensorField>& gradU) by supplying

11
src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
View File

@ -207,15 +207,16 @@ tmp<volScalarField> RASModel::thermalDissipation() const
IOobject::NO_READ,
IOobject::NO_WRITE
),
(
- (
( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
) + this->rho() * this->epsilon()
)
- this->rho() * this->epsilon()
)
);
}
tmp<volScalarField> RASModel::thermalDissipationEff() const
tmp<volScalarField> RASModel::thermalDissipationEquilibrium() const
{
tmp<volTensorField> tgradU = fvc::grad(this->U());
@ -225,13 +226,13 @@ tmp<volScalarField> RASModel::thermalDissipationEff() const
(
IOobject
(
"thermalDissipationEff",
"thermalDissipationEquilibrium",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
(
- (
this->muEff()*dev(twoSymm(tgradU()))
- ((2.0/3.0)*I) * this->rho() * this->k()
) && tgradU()

2
src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
View File

@ -352,7 +352,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const;
//- Return yPlus for the given patch
virtual tmp<scalarField> yPlus(const label patchI) const;

8
src/turbulenceModels/compressible/RAS/laminar/laminar.C
View File

@ -193,13 +193,13 @@ tmp<volScalarField> laminar::thermalDissipation() const
IOobject::NO_READ,
IOobject::NO_WRITE
),
( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
- ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
)
);
}
tmp<volScalarField> laminar::thermalDissipationEff() const
tmp<volScalarField> laminar::thermalDissipationEquilibrium() const
{
tmp<volTensorField> tgradU = fvc::grad(this->U());
@ -209,13 +209,13 @@ tmp<volScalarField> laminar::thermalDissipationEff() const
(
IOobject
(
"thermalDissipationEff",
"thermalDissipationEquilibrium",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
- ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
)
);
}

2
src/turbulenceModels/compressible/RAS/laminar/laminar.H
View File

@ -119,7 +119,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const;
//- Correct the laminar viscosity
virtual void correct();

2
src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C
View File

@ -90,7 +90,7 @@ dissipationSelector::dissipation() const
}
else if (treatment_ == equilibrium)
{
return turbModel_.thermalDissipationEff();
return turbModel_.thermalDissipationEquilibrium();
}
else
{

8
src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
View File

@ -211,13 +211,13 @@ tmp<volScalarField> laminar::thermalDissipation() const
IOobject::NO_READ,
IOobject::NO_WRITE
),
( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
- ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
)
);
}
tmp<volScalarField> laminar::thermalDissipationEff() const
tmp<volScalarField> laminar::thermalDissipationEquilibrium() const
{
tmp<volTensorField> tgradU = fvc::grad(this->U());
@ -227,13 +227,13 @@ tmp<volScalarField> laminar::thermalDissipationEff() const
(
IOobject
(
"thermalDissipationEff",
"thermalDissipationEquilibrium",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
- ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU()
)
);
}

2
src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
View File

@ -129,7 +129,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const;
//- Correct the laminar viscosity
virtual void correct();

2
src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
View File

@ -217,7 +217,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const = 0;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const = 0;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct() = 0;

11
src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
View File

@ -156,15 +156,16 @@ tmp<volScalarField> LESModel::thermalDissipation() const
IOobject::NO_READ,
IOobject::NO_WRITE
),
(
- (
( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
) + this->epsilon()
)
- this->epsilon()
)
);
}
tmp<volScalarField> LESModel::thermalDissipationEff() const
tmp<volScalarField> LESModel::thermalDissipationEquilibrium() const
{
tmp<volTensorField> tgradU = fvc::grad(this->U());
@ -174,13 +175,13 @@ tmp<volScalarField> LESModel::thermalDissipationEff() const
(
IOobject
(
"thermalDissipationEff",
"thermalDissipationEquilibrium",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
(
- (
this->nuEff()*dev(twoSymm(tgradU()))
- ((2.0/3.0)*I) * this->k()
) && tgradU()

2
src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
View File

@ -249,7 +249,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const;
//- Correct Eddy-Viscosity and related properties.
// This calls correct(const tmp<volTensorField>& gradU) by supplying

11
src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
View File

@ -192,15 +192,16 @@ tmp<volScalarField> RASModel::thermalDissipation() const
IOobject::NO_READ,
IOobject::NO_WRITE
),
(
- (
( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
) + this->epsilon()
)
- this->epsilon()
)
);
}
tmp<volScalarField> RASModel::thermalDissipationEff() const
tmp<volScalarField> RASModel::thermalDissipationEquilibrium() const
{
tmp<volTensorField> tgradU = fvc::grad(this->U());
@ -210,13 +211,13 @@ tmp<volScalarField> RASModel::thermalDissipationEff() const
(
IOobject
(
"thermalDissipationEff",
"thermalDissipationEquilibrium",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
(
- (
this->nuEff()*dev(twoSymm(tgradU()))
- ((2.0/3.0)*I) * this->k()
) && tgradU()

2
src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
View File

@ -333,7 +333,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const;
//- Return yPlus for the given patch
virtual tmp<scalarField> yPlus(const label patchI) const;

8
src/turbulenceModels/incompressible/RAS/laminar/laminar.C
View File

@ -192,13 +192,13 @@ tmp<volScalarField> laminar::thermalDissipation() const
IOobject::NO_READ,
IOobject::NO_WRITE
),
( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
- ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
)
);
}
tmp<volScalarField> laminar::thermalDissipationEff() const
tmp<volScalarField> laminar::thermalDissipationEquilibrium() const
{
tmp<volTensorField> tgradU = fvc::grad(this->U());
@ -208,13 +208,13 @@ tmp<volScalarField> laminar::thermalDissipationEff() const
(
IOobject
(
"thermalDissipationEff",
"thermalDissipationEquilibrium",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
- ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
)
);
}

2
src/turbulenceModels/incompressible/RAS/laminar/laminar.H
View File

@ -111,7 +111,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const;
//- Correct the laminar viscosity
virtual void correct();

2
src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C
View File

@ -90,7 +90,7 @@ dissipationSelector::dissipation() const
}
else if (treatment_ == equilibrium)
{
return turbModel_.thermalDissipationEff();
return turbModel_.thermalDissipationEquilibrium();
}
else
{

8
src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
View File

@ -215,13 +215,13 @@ tmp<volScalarField> laminar::thermalDissipation() const
IOobject::NO_READ,
IOobject::NO_WRITE
),
( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
- ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
)
);
}
tmp<volScalarField> laminar::thermalDissipationEff() const
tmp<volScalarField> laminar::thermalDissipationEquilibrium() const
{
tmp<volTensorField> tgradU = fvc::grad(this->U());
@ -231,13 +231,13 @@ tmp<volScalarField> laminar::thermalDissipationEff() const
(
IOobject
(
"thermalDissipationEff",
"thermalDissipationEquilibrium",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
- ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU()
)
);
}

2
src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
View File

@ -117,7 +117,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const;
//- Correct the laminar viscosity
virtual void correct();

2
src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
View File

@ -197,7 +197,7 @@ public:
//- The source for the enthalpy equation resulting from
// the effective viscous dissipation
// (ie, when turbulent production and dissipation are in equilibrium)
virtual tmp<volScalarField> thermalDissipationEff() const = 0;
virtual tmp<volScalarField> thermalDissipationEquilibrium() const = 0;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct() = 0;