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

fixedTemperatureConstraint,effectivenessHeatExchangerSource: Set the field name to that of the energy

Browse Source 
field from which the temperature is obtained

Removes the need for the 'alwaysApply' hack.
This commit is contained in:
Henry
2015-06-01 15:46:17 +01:00
parent 25944abbc8
commit 7608bb5bc6
5 changed files with 41 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
View File

@ -94,19 +94,20 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
}
fieldNames_.setSize(1, "energy");
// Set the field name to that of the energy field from which the temperature
// is obtained
const basicThermo& thermo =
mesh_.lookupObject<basicThermo>("thermophysicalProperties");
fieldNames_.setSize(1, thermo.he().name());
applied_.setSize(1, false);
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::fv::fixedTemperatureConstraint::alwaysApply() const
{
return true;
}
void Foam::fv::fixedTemperatureConstraint::constrain
(
fvMatrix<scalar>& eqn,
@ -116,8 +117,6 @@ void Foam::fv::fixedTemperatureConstraint::constrain
const basicThermo& thermo =
mesh_.lookupObject<basicThermo>("thermophysicalProperties");
if (eqn.psi().name() == thermo.he().name())
{
switch (mode_)
{
case tmUniform:
@ -143,8 +142,6 @@ void Foam::fv::fixedTemperatureConstraint::constrain
// error handling done by NamedEnum
}
}
}
}

7
src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
View File

@ -136,12 +136,7 @@ public:
// Member Functions
virtual bool alwaysApply() const;
// Set values directly
//- Scalar
//- Constrain energy equation to fix the temperature
virtual void constrain(fvMatrix<scalar>& eqn, const label fieldI);

21
src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
View File

@ -166,7 +166,6 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
faceSign_(),
faceZoneArea_(0)
{
if (zoneID_ < 0)
{
FatalErrorIn
@ -185,7 +184,14 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
<< nl << exit(FatalError);
}
fieldNames_.setSize(1, "energy");
// Set the field name to that of the energy field from which the temperature
// is obtained
const basicThermo& thermo =
mesh_.lookupObject<basicThermo>("thermophysicalProperties");
fieldNames_.setSize(1, thermo.he().name());
applied_.setSize(1, false);
eTable_.reset(new interpolation2DTable<scalar>(coeffs_));
@ -196,12 +202,6 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::fv::effectivenessHeatExchangerSource::alwaysApply() const
{
return true;
}
void Foam::fv::effectivenessHeatExchangerSource::addSup
(
const volScalarField& rho,
@ -212,11 +212,6 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
const basicThermo& thermo =
mesh_.lookupObject<basicThermo>("thermophysicalProperties");
if (eqn.psi().name() != thermo.he().name())
{
return;
}
const surfaceScalarField Cpf(fvc::interpolate(thermo.Cp()));
const surfaceScalarField& phi =

7
src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
View File

@ -245,10 +245,7 @@ public:
// Member Functions
virtual bool alwaysApply() const;
// Add explicit and implicit contributions
// Explicit and implicit source
//- Scalar
virtual void addSup
@ -265,7 +262,7 @@ public:
}
// Add explicit and implicit contributions to compressible equation
// Explicit and implicit source for compressible equation
//- Scalar
virtual void addSup

4
src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceTemplates.C
View File

@ -55,13 +55,13 @@ void Foam::fv::solidificationMeltingSource::apply
if (eqn.psi().dimensions() == dimTemperature)
{
// isothermal phase change - only include time derivative
// eqn -= L/Cp*(fvc::ddt(rho, alpha1_) + fvc::div(phi, alpha1_));
// eqn -= L/Cp*(fvc::ddt(rho, alpha1_) + fvc::div(phi, alpha1_));
eqn -= L/Cp*(fvc::ddt(rho, alpha1_));
}
else
{
// isothermal phase change - only include time derivative
// eqn -= L*(fvc::ddt(rho, alpha1_) + fvc::div(phi, alpha1_));
// eqn -= L*(fvc::ddt(rho, alpha1_) + fvc::div(phi, alpha1_));
eqn -= L*(fvc::ddt(rho, alpha1_));
}
}