diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C index 5d7e651d81..fc37226ded 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C +++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C @@ -361,6 +361,25 @@ Foam::tmp Foam::twoPhaseMixtureThermo::kappa } +Foam::tmp Foam::twoPhaseMixtureThermo::alphahe() const +{ + return + alpha1()*thermo1_->alphahe() + + alpha2()*thermo2_->alphahe(); +} + + +Foam::tmp Foam::twoPhaseMixtureThermo::alphahe +( + const label patchi +) const +{ + return + alpha1().boundaryField()[patchi]*thermo1_->alphahe(patchi) + + alpha2().boundaryField()[patchi]*thermo2_->alphahe(patchi); +} + + Foam::tmp Foam::twoPhaseMixtureThermo::kappaEff ( const volScalarField& alphat diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H index 8a3f8cb33c..6f5d1c040b 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H +++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H @@ -269,6 +269,12 @@ public: const label patchi ) const; + //- Thermal diffusivity for energy of mixture [kg/m/s] + virtual tmp alphahe() const; + + //- Thermal diffusivity for energy of mixture for patch [kg/m/s] + virtual tmp alphahe(const label patchi) const; + //- Effective thermal diffusivity of mixture [J/m/s/K] virtual tmp kappaEff ( diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C index 416c200e47..8dcceabe90 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C @@ -625,6 +625,45 @@ Foam::tmp Foam::multiphaseMixtureThermo::kappa } +Foam::tmp Foam::multiphaseMixtureThermo::alphahe() const +{ + PtrDictionary::const_iterator phasei = phases_.begin(); + + tmp talphaEff(phasei()*phasei().thermo().alphahe()); + + for (++phasei; phasei != phases_.end(); ++phasei) + { + talphaEff.ref() += phasei()*phasei().thermo().alphahe(); + } + + return talphaEff; +} + + +Foam::tmp Foam::multiphaseMixtureThermo::alphahe +( + const label patchi +) const +{ + PtrDictionary::const_iterator phasei = phases_.begin(); + + tmp talphaEff + ( + phasei().boundaryField()[patchi] + *phasei().thermo().alphahe(patchi) + ); + + for (++phasei; phasei != phases_.end(); ++phasei) + { + talphaEff.ref() += + phasei().boundaryField()[patchi] + *phasei().thermo().alphahe(patchi); + } + + return talphaEff; +} + + Foam::tmp Foam::multiphaseMixtureThermo::kappaEff ( const volScalarField& alphat diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H index 983c2e574b..eb81fcdc96 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H @@ -400,6 +400,12 @@ public: const label patchi ) const; + //- Thermal diffusivity for energy of mixture [kg/m/s] + virtual tmp alphahe() const; + + //- Thermal diffusivity for energy of mixture for patch [kg/m/s] + virtual tmp alphahe(const label patchi) const; + //- Effective thermal diffusivity of mixture [J/m/s/K] virtual tmp kappaEff ( diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H index ac0ddf19f0..ff3d959fc2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H @@ -201,15 +201,6 @@ public: virtual void divU(tmp divU); - // Transport (prevents compiler warnings) - - //- Return the effective thermal conductivity - using BasePhaseModel::kappaEff; - - //- Return the effective thermal conductivity for enthalpy - using BasePhaseModel::alphaEff; - - // Turbulence //- Return the turbulent dynamic viscosity @@ -224,17 +215,23 @@ public: //- Return the effective kinematic viscosity virtual tmp nuEff() const; + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] + using BasePhaseModel::kappaEff; + //- Return the effective thermal conductivity virtual tmp kappaEff() const; //- Return the effective thermal conductivity on a patch virtual tmp kappaEff(const label patchi) const; - //- Return the effective thermal diffusivity for enthalpy + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] + using BasePhaseModel::alphaEff; + + //- Return the effective thermal diffusivity virtual tmp alphaEff() const; - //- Return the effective thermal conductivity for enthalpy on a - // patch + //- Return the effective thermal conductivity on a patch virtual tmp alphaEff(const label patchi) const; //- Return the turbulent kinetic energy diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H index 8098797028..4e259447fc 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H @@ -171,15 +171,6 @@ public: virtual void divU(tmp divU); - // Transport (prevents compiler warnings) - - //- Return the effective thermal conductivity - using BasePhaseModel::kappaEff; - - //- Return the effective thermal conductivity for enthalpy - using BasePhaseModel::alphaEff; - - // Turbulence //- Return the turbulent dynamic viscosity @@ -194,17 +185,23 @@ public: //- Return the effective kinematic viscosity virtual tmp nuEff() const; + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] + using BasePhaseModel::kappaEff; + //- Return the effective thermal conductivity virtual tmp kappaEff() const; //- Return the effective thermal conductivity on a patch virtual tmp kappaEff(const label patchi) const; - //- Return the effective thermal diffusivity for enthalpy + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] + using BasePhaseModel::alphaEff; + + //- Return the effective thermal diffusivity virtual tmp alphaEff() const; - //- Return the effective thermal conductivity for enthalpy on a - // patch + //- Return the effective thermal conductivity on a patch virtual tmp alphaEff(const label patchi) const; //- Return the turbulent kinetic energy diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C index 90fc68c029..01f78f3492 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C @@ -153,6 +153,25 @@ Foam::ThermoPhaseModel::kappa } +template +Foam::tmp +Foam::ThermoPhaseModel::alphahe() const +{ + return thermo_->alphahe(); +} + + +template +Foam::tmp +Foam::ThermoPhaseModel::alphahe +( + const label patchi +) const +{ + return thermo_->alphahe(patchi); +} + + template Foam::tmp Foam::ThermoPhaseModel::kappaEff diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H index 8b5691eade..d1d2d9bcc2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H @@ -112,56 +112,63 @@ public: //- Return the laminar kinematic viscosity on a patch virtual tmp nu(const label patchi) const; - //- Return the laminar thermal conductivity + //- Thermal diffusivity for enthalpy of mixture [kg/m/s] + virtual tmp alpha() const; + + //- Thermal diffusivity for enthalpy of mixture for patch [kg/m/s] + virtual tmp alpha(const label patchi) const; + + //- Thermal diffusivity for temperature of mixture [J/m/s/K] virtual tmp kappa() const; - //- Return the laminar thermal conductivity on a patch + //- Thermal diffusivity for temperature of mixture + // for patch [J/m/s/K] virtual tmp kappa(const label patchi) const; - //- Return the laminar thermal conductivity, given the turbulent - // thermal diffusivity + //- Thermal diffusivity for energy of mixture [kg/m/s] + virtual tmp alphahe() const; + + //- Thermal diffusivity for energy of mixture for patch [kg/m/s] + virtual tmp alphahe(const label patchi) const; + + + // Turbulence + + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] + using BasePhaseModel::kappaEff; + + //- Effective thermal turbulent diffusivity for temperature + // of mixture [J/m/s/K] virtual tmp kappaEff ( const volScalarField& alphat ) const; - //- Return the laminar thermal conductivity on a patch, given the - // turbulent thermal diffusivity + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] virtual tmp kappaEff ( const scalarField& alphat, const label patchi ) const; - //- Return the thermal diffusivity for enthalpy - virtual tmp alpha() const; - - //- Return the thermal diffusivity for enthalpy on a patch - virtual tmp alpha(const label patchi) const; + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] + using BasePhaseModel::alphaEff; - //- Return the effective thermal diffusivity for enthalpy, given the - // turbulent thermal diffusivity + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] virtual tmp alphaEff ( const volScalarField& alphat ) const; - //- Return the effective thermal diffusivity for enthalpy on a - // patch, given the turbulent thermal diffusivity + //- Effective thermal turbulent diffusivity of mixture + // for patch [kg/m/s] virtual tmp alphaEff ( const scalarField& alphat, const label patchi ) const; - - - // Turbulence (prevents compiler warnings) - - //- Return the effective thermal conductivity - using BasePhaseModel::kappaEff; - - //- Return the effective thermal conductivity for enthalpy - using BasePhaseModel::alphaEff; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H index ce2a487594..c7902aec9d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H @@ -327,42 +327,48 @@ public: //- Return the laminar kinematic viscosity on a patch virtual tmp nu(const label patchi) const = 0; - //- Return the laminar thermal conductivity + //- Thermal diffusivity for enthalpy of mixture [kg/m/s] + virtual tmp alpha() const = 0; + + //- Thermal diffusivity for enthalpy of mixture for patch [kg/m/s] + virtual tmp alpha(const label patchi) const = 0; + + //- Thermal diffusivity for temperature of mixture [J/m/s/K] virtual tmp kappa() const = 0; - //- Return the laminar thermal conductivity on a patch + //- Thermal diffusivity for temperature of mixture + // for patch [J/m/s/K] virtual tmp kappa(const label patchi) const = 0; - //- Return the effective thermal conductivity, given the turbulent - // thermal diffusivity + //- Thermal diffusivity for energy of mixture [kg/m/s] + virtual tmp alphahe() const = 0; + + //- Thermal diffusivity for energy of mixture for patch [kg/m/s] + virtual tmp alphahe(const label patchi) const = 0; + + //- Effective thermal turbulent diffusivity for temperature + // of mixture [J/m/s/K] virtual tmp kappaEff ( const volScalarField& alphat ) const = 0; - //- Return the effective thermal conductivity on a patch, given the - // turbulent thermal diffusivity + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] virtual tmp kappaEff ( const scalarField& alphat, const label patchi ) const = 0; - //- Return the laminar thermal diffusivity for enthalpy - virtual tmp alpha() const = 0; - - //- Return the laminar thermal diffusivity for enthalpy on a patch - virtual tmp alpha(const label patchi) const = 0; - - //- Return the effective thermal diffusivity for enthalpy, given the - // turbulent thermal diffusivity + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] virtual tmp alphaEff ( const volScalarField& alphat ) const = 0; - //- Return the effective thermal diffusivity for enthalpy on a - // patch, given the turbulent thermal diffusivity + //- Effective thermal turbulent diffusivity of mixture + // for patch [kg/m/s] virtual tmp alphaEff ( const scalarField& alphat, @@ -384,17 +390,19 @@ public: //- Return the effective kinematic viscosity virtual tmp nuEff() const = 0; - //- Return the effective thermal conductivity + //- Effective thermal turbulent diffusivity for temperature + // of mixture [J/m/s/K] virtual tmp kappaEff() const = 0; - //- Return the effective thermal conductivity on a patch + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] virtual tmp kappaEff(const label patchi) const = 0; - //- Return the effective thermal diffusivity for enthalpy + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] virtual tmp alphaEff() const = 0; - //- Return the effective thermal conductivity for enthalpy on a - // patch + //- Effective thermal turbulent diffusivity of mixture + // for patch [kg/m/s] virtual tmp alphaEff(const label patchi) const = 0; //- Return the turbulent kinetic energy diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H index e058817c9c..721dc516b5 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H @@ -196,19 +196,45 @@ public: return thermo_->mu(patchi); } - //- Return the thermal conductivity on a patch + //- Thermal diffusivity for enthalpy of mixture [kg/m/s] + tmp alpha() const + { + return thermo_->alpha(); + } + + //- Thermal diffusivity for enthalpy of mixture for patch [kg/m/s] + tmp alpha(const label patchi) const + { + return thermo_->alpha(patchi); + } + + //- Thermal diffusivity for temperature of mixture [J/m/s/K] tmp kappa(const label patchi) const { return thermo_->kappa(patchi); } - //- Return the thermal conductivity + //- Thermal diffusivity for temperature of mixture + // for patch [J/m/s/K] tmp kappa() const { return thermo_->kappa(); } - //- Return the laminar thermal conductivity + //- Thermal diffusivity for energy of mixture [kg/m/s] + tmp alphahe() const + { + return thermo_->alphahe(); + } + + //- Thermal diffusivity for energy of mixture for patch [kg/m/s] + tmp alphahe(const label patchi) const + { + return thermo_->alphahe(patchi); + } + + //- Effective thermal turbulent diffusivity for temperature + // of mixture [J/m/s/K] tmp kappaEff ( const volScalarField& alphat @@ -217,7 +243,8 @@ public: return thermo_->kappaEff(alphat); } - //- Return the laminar thermal conductivity on a patch + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] tmp kappaEff ( const scalarField& alphat, @@ -227,19 +254,7 @@ public: return thermo_->kappaEff(alphat, patchi); } - //- Return the laminar thermal diffusivity for enthalpy - tmp alpha() const - { - return thermo_->alpha(); - } - - //- Return the laminar thermal diffusivity for enthalpy on a patch - tmp alpha(const label patchi) const - { - return thermo_->alpha(patchi); - } - - //- Return the effective thermal diffusivity for enthalpy + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] tmp alphaEff ( const volScalarField& alphat @@ -248,7 +263,8 @@ public: return thermo_->alphaEff(alphat); } - //- Return the effective thermal diffusivity for enthalpy on a patch + //- Effective thermal turbulent diffusivity of mixture + // for patch [kg/m/s] tmp alphaEff ( const scalarField& alphat, diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H index 54aec72d00..6ba960efc7 100644 --- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H +++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H @@ -102,42 +102,40 @@ public: //- Re-read model coefficients if they have changed virtual bool read(); - //- Return the turbulent thermal diffusivity for enthalpy [kg/m/s] + //- Turbulent thermal diffusivity for enthalpy [kg/m/s] virtual tmp alphat() const { return alphat_; } - //- Return the turbulent thermal diffusivity for enthalpy for a patch - // [kg/m/s] + //- Turbulent thermal diffusivity for enthalpy for a patch [kg/m/s] virtual tmp alphat(const label patchi) const { return alphat()().boundaryField()[patchi]; } - //- Return the effective turbulent thermal diffusivity for temperature - // [J/m/s/K] + //- Effective thermal turbulent diffusivity for temperature + // of mixture [J/m/s/K] virtual tmp kappaEff() const { return this->transport_.kappaEff(alphat()); } - //- Return the effective turbulent thermal diffusivity for temperature - // [J/m/s/K] + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] virtual tmp kappaEff(const label patchi) const { return this->transport_.kappaEff(alphat(patchi), patchi); } - //- Return the effective turbulent thermal diffusivity for enthalpy - // [kg/m/s] + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] virtual tmp alphaEff() const { return this->transport_.alphaEff(alphat()); } - //- Return the effective turbulent thermal diffusivity for enthalpy - // for a patch [kg/m/s] + //- Effective thermal turbulent diffusivity of mixture + // for patch [kg/m/s] virtual tmp alphaEff(const label patchi) const { return this->transport_.alphaEff(alphat(patchi), patchi); diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H index a049597485..afc6cf805d 100644 --- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H +++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H @@ -107,65 +107,62 @@ public: // Member Functions - //- Return the thermal diffusivity for temperature [J/m/s/K] - virtual tmp kappa() const + //- Thermal diffusivity for enthalpy of mixture [kg/m/s] + virtual tmp alpha() const { - return this->transport_.kappa(); + return this->transport_.alpha(); } - //- Return the laminar thermal diffusivity for temperature on patch - // [J/m/s/K] - virtual tmp kappa(const label patchi) const + //- Thermal diffusivity for enthalpy of mixture for patch [kg/m/s] + virtual tmp alpha(const label patchi) const { - return this->transport_.kappa(patchi); + return this->transport_.alpha(patchi); } - //- Return the laminar thermal diffusivity for enthalpy [kg/m/s] - virtual tmp alpha() const + //- Thermal diffusivity for temperature of mixture [J/m/s/K] + virtual tmp kappa() const { - return this->transport_.alpha(); + return this->transport_.kappa(); } - //- Return the laminar thermal diffusivity for enthalpy on patch - // [kg/m/s] - virtual tmp alpha(const label patchi) const + //- Thermal diffusivity for temperature of mixture + // for patch [J/m/s/K] + virtual tmp kappa(const label patchi) const { - return this->transport_.alpha(patchi); + return this->transport_.kappa(patchi); } - //- Return the turbulent thermal diffusivity for enthalpy [kg/m/s] + //- Turbulent thermal diffusivity for enthalpy [kg/m/s] virtual tmp alphat() const; - //- Return the turbulent thermal diffusivity for enthalpy for a patch - // [kg/m/s] + //- Turbulent thermal diffusivity for enthalpy for a patch [kg/m/s] virtual tmp alphat(const label patchi) const; - //- Return the effective turbulent thermal diffusivity for temperature - // [J/m/s/K] + //- Effective thermal turbulent diffusivity for temperature + // of mixture [J/m/s/K] virtual tmp kappaEff() const { return kappa(); } - //- Return the effective turbulent thermal diffusivity for temperature - // [J/m/s/K] + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] virtual tmp kappaEff(const label patchi) const { return kappa(patchi); } - //- Return the effective turbulent thermal diffusivity for enthalpy - // [kg/m/s] + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] virtual tmp alphaEff() const { - return alpha(); + return this->transport_.alphahe(); } - //- Return the effective turbulent thermal diffusivity for enthalpy - // for a patch [kg/m/s] + //- Effective thermal turbulent diffusivity of mixture + // for patch [kg/m/s] virtual tmp alphaEff(const label patchi) const { - return alpha(patchi); + return this->transport_.alphahe(patchi); } }; diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H index e20e9a36e5..859b12560c 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H +++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H @@ -425,21 +425,27 @@ public: //- Thermal diffusivity for temperature of mixture [J/m/s/K] virtual tmp kappa() const = 0; - //- Thermal diffusivity for temperature - // of mixture for patch [J/m/s/K] + //- Thermal diffusivity for temperature of mixture + // for patch [J/m/s/K] virtual tmp kappa ( const label patchi ) const = 0; - //- Effective thermal diffusivity for temperature + //- Thermal diffusivity for energy of mixture [kg/m/s] + virtual tmp alphahe() const = 0; + + //- Thermal diffusivity for energy of mixture for patch [kg/m/s] + virtual tmp alphahe(const label patchi) const = 0; + + //- Effective thermal turbulent diffusivity for temperature // of mixture [J/m/s/K] virtual tmp kappaEff ( const volScalarField& ) const = 0; - //- Effective thermal diffusivity for temperature + //- Effective thermal turbulent diffusivity for temperature // of mixture for patch [J/m/s/K] virtual tmp kappaEff ( @@ -447,13 +453,14 @@ public: const label patchi ) const = 0; - //- Effective thermal diffusivity of mixture [kg/m/s] + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] virtual tmp alphaEff ( const volScalarField& alphat ) const = 0; - //- Effective thermal diffusivity of mixture for patch [kg/m/s] + //- Effective thermal turbulent diffusivity of mixture + // for patch [kg/m/s] virtual tmp alphaEff ( const scalarField& alphat, diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C index 071fa4a878..48641717f8 100644 --- a/src/thermophysicalModels/basic/heThermo/heThermo.C +++ b/src/thermophysicalModels/basic/heThermo/heThermo.C @@ -813,6 +813,31 @@ Foam::tmp Foam::heThermo::kappa } +template +Foam::tmp +Foam::heThermo::alphahe() const +{ + tmp alphaEff(this->CpByCpv()*this->alpha_); + alphaEff.ref().rename("alphahe"); + return alphaEff; +} + + +template +Foam::tmp +Foam::heThermo::alphahe(const label patchi) const +{ + return + this->CpByCpv + ( + this->p_.boundaryField()[patchi], + this->T_.boundaryField()[patchi], + patchi + ) + *this->alpha_.boundaryField()[patchi]; +} + + template Foam::tmp Foam::heThermo::kappaEff diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.H b/src/thermophysicalModels/basic/heThermo/heThermo.H index 236e799dd1..7b99d58bc6 100644 --- a/src/thermophysicalModels/basic/heThermo/heThermo.H +++ b/src/thermophysicalModels/basic/heThermo/heThermo.H @@ -271,18 +271,27 @@ public: //- Thermal diffusivity for temperature of mixture [J/m/s/K] virtual tmp kappa() const; - //- Thermal diffusivity for temperature - // of mixture for patch [J/m/s/K] + //- Thermal diffusivity for temperature of mixture + // for patch [J/m/s/K] virtual tmp kappa ( const label patchi ) const; - //- Effective thermal diffusivity for temperature + //- Thermal diffusivity for energy of mixture [kg/m/s] + virtual tmp alphahe() const; + + //- Thermal diffusivity for energy of mixture for patch [kg/m/s] + virtual tmp alphahe(const label patchi) const; + + //- Effective thermal turbulent diffusivity for temperature // of mixture [J/m/s/K] - virtual tmp kappaEff(const volScalarField&) const; + virtual tmp kappaEff + ( + const volScalarField& + ) const; - //- Effective thermal diffusivity for temperature + //- Effective thermal turbulent diffusivity for temperature // of mixture for patch [J/m/s/K] virtual tmp kappaEff ( @@ -290,13 +299,14 @@ public: const label patchi ) const; - //- Effective thermal diffusivity of mixture [kg/m/s] + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] virtual tmp alphaEff ( const volScalarField& alphat ) const; - //- Effective thermal diffusivity of mixture for patch [kg/m/s] + //- Effective thermal turbulent diffusivity of mixture + // for patch [kg/m/s] virtual tmp alphaEff ( const scalarField& alphat,