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

added offset to enthalpy poly (ref h at Tstd) and renamed s poly to ds

Browse Source
This commit is contained in:
andy
2009-10-21 17:52:27 +01:00
parent 3ac2b9388a
commit e0216666c3
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
View File

@ -40,8 +40,11 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
Sf_(readScalar(is)), Sf_(readScalar(is)),
cpPolynomial_("cpPolynomial", is), cpPolynomial_("cpPolynomial", is),
dhPolynomial_(cpPolynomial_.integrate()), dhPolynomial_(cpPolynomial_.integrate()),
sPolynomial_(cpPolynomial_.integrateMinus1()) dsPolynomial_(cpPolynomial_.integrateMinus1())
{} {
// Offset dh poly so that it is relative to the enthalpy at Tstd
dhPolynomial_[0] -= dhPolynomial_.evaluate(specie::Tstd);
}
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
@ -58,7 +61,7 @@ Foam::Ostream& Foam::operator<<
<< pt.Sf_ << tab << pt.Sf_ << tab
<< pt.cpPolynomial_ << tab << pt.cpPolynomial_ << tab
<< pt.dhPolynomial_ << tab << pt.dhPolynomial_ << tab
<< pt.sPolynomial; << pt.dsPolynomial;
os.check os.check
( (

12
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
View File

@ -106,14 +106,14 @@ class hPolynomialThermo
//- Standard entropy [J/(kg.K)] //- Standard entropy [J/(kg.K)]
scalar Sf_; scalar Sf_;
//- Specific heat at constant pressure //- Specific heat at constant pressure [J/(kg.K)]
Polynomial<PolySize> cpPolynomial_; Polynomial<PolySize> cpPolynomial_;
//- Enthalpy - derived from cp //- Enthalpy - derived from cp [J/kg] - relative to Tstd
typename Polynomial<PolySize>::intPolyType dhPolynomial_; typename Polynomial<PolySize>::intPolyType dhPolynomial_;
//- Entropy - derived from cp //- Entropy - derived from cp [J/(kg.K)]
Polynomial<PolySize> sPolynomial_; Polynomial<PolySize> dsPolynomial_;
// Private member functions // Private member functions
@ -125,8 +125,8 @@ class hPolynomialThermo
const scalar Hf, const scalar Hf,
const scalar Sf, const scalar Sf,
const Polynomial<PolySize>& cpPoly, const Polynomial<PolySize>& cpPoly,
const typename Polynomial<PolySize>::intPolyType& hPoly, const typename Polynomial<PolySize>::intPolyType& dhPoly,
const Polynomial<PolySize>& sPoly const Polynomial<PolySize>& dsPoly
); );

25
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
View File

@ -36,7 +36,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
const scalar Sf, const scalar Sf,
const Polynomial<PolySize>& cpPoly, const Polynomial<PolySize>& cpPoly,
const typename Polynomial<PolySize>::intPolyType& dhPoly, const typename Polynomial<PolySize>::intPolyType& dhPoly,
const Polynomial<PolySize>& sPoly const Polynomial<PolySize>& dsPoly
) )
: :
EquationOfState(pt), EquationOfState(pt),
@ -44,7 +44,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
Sf_(Sf), Sf_(Sf),
cpPolynomial_(cpPoly), cpPolynomial_(cpPoly),
dhPolynomial_(dhPoly), dhPolynomial_(dhPoly),
sPolynomial_(sPoly) dsPolynomial_(dsPoly)
{} {}
@ -62,8 +62,11 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
Sf_(pt.Sf_), Sf_(pt.Sf_),
cpPolynomial_(pt.cpPolynomial_), cpPolynomial_(pt.cpPolynomial_),
dhPolynomial_(pt.dhPolynomial_), dhPolynomial_(pt.dhPolynomial_),
sPolynomial_(pt.sPolynomial_) dsPolynomial_(pt.dsPolynomial_)
{} {
// Offset dh poly so that it is relative to the enthalpy at Tstd
dhPolynomial_[0] -= dhPolynomial_.evaluate(specie::Tstd);
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@ -112,7 +115,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::s
const scalar T const scalar T
) const ) const
{ {
return (sPolynomial_.evaluate(T) + Sf_)*this->W(); return (dsPolynomial_.evaluate(T) + Sf_)*this->W();
} }
@ -135,7 +138,7 @@ inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator+=
Sf_ = molr1*Sf_ + molr2*pt.Sf_; Sf_ = molr1*Sf_ + molr2*pt.Sf_;
cpPolynomial_ = molr1*cpPolynomial_ + molr2*pt.cpPolynomial_; cpPolynomial_ = molr1*cpPolynomial_ + molr2*pt.cpPolynomial_;
dhPolynomial_ = molr1*dhPolynomial_ + molr2*pt.dhPolynomial_; dhPolynomial_ = molr1*dhPolynomial_ + molr2*pt.dhPolynomial_;
sPolynomial_ = molr1*sPolynomial_ + molr2*pt.sPolynomial_; dsPolynomial_ = molr1*dsPolynomial_ + molr2*pt.dsPolynomial_;
} }
@ -153,10 +156,10 @@ inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator-=
scalar molr2 = pt.nMoles()/this->nMoles(); scalar molr2 = pt.nMoles()/this->nMoles();
Hf_ = molr1*Hf_ - molr2*pt.Hf_; Hf_ = molr1*Hf_ - molr2*pt.Hf_;
Sf_ = molr1*Hf_ - molr2*pt.Sf_; Sf_ = molr1*Sf_ - molr2*pt.Sf_;
cpPolynomial_ = molr1*cpPolynomial_ - molr2*pt.cpPolynomial_; cpPolynomial_ = molr1*cpPolynomial_ - molr2*pt.cpPolynomial_;
dhPolynomial_ = molr1*dhPolynomial_ - molr2*pt.dhPolynomial_; dhPolynomial_ = molr1*dhPolynomial_ - molr2*pt.dhPolynomial_;
sPolynomial_ = molr1*sPolynomial_ - molr2*pt.sPolynomial_; dsPolynomial_ = molr1*dsPolynomial_ - molr2*pt.dsPolynomial_;
} }
@ -184,7 +187,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator+
molr1*pt1.Sf_ + molr2*pt2.Sf_, molr1*pt1.Sf_ + molr2*pt2.Sf_,
molr1*pt1.cpPolynomial_ + molr2*pt2.cpPolynomial_, molr1*pt1.cpPolynomial_ + molr2*pt2.cpPolynomial_,
molr1*pt1.dhPolynomial_ + molr2*pt2.dhPolynomial_, molr1*pt1.dhPolynomial_ + molr2*pt2.dhPolynomial_,
molr1*pt1.sPolynomial_ + molr2*pt2.sPolynomial_ molr1*pt1.dsPolynomial_ + molr2*pt2.dsPolynomial_
); );
} }
@ -211,7 +214,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator-
molr1*pt1.Sf_ - molr2*pt2.Sf_, molr1*pt1.Sf_ - molr2*pt2.Sf_,
molr1*pt1.cpPolynomial_ - molr2*pt2.cpPolynomial_, molr1*pt1.cpPolynomial_ - molr2*pt2.cpPolynomial_,
molr1*pt1.dhPolynomial_ - molr2*pt2.dhPolynomial_, molr1*pt1.dhPolynomial_ - molr2*pt2.dhPolynomial_,
molr1*pt1.sPolynomial_ - molr2*pt2.sPolynomial_ molr1*pt1.dsPolynomial_ - molr2*pt2.dsPolynomial_
); );
} }
@ -230,7 +233,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator*
pt.Sf_, pt.Sf_,
pt.cpPolynomial_, pt.cpPolynomial_,
pt.dhPolynomial_, pt.dhPolynomial_,
pt.sPolynomial_ pt.dsPolynomial_
); );
} }