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

Merge commit 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2008-07-25 18:09:01 +02:00
parent 07d8a616f8 a972933b85
commit a7d1ef36e7
19 changed files with 240 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/OpenFOAM/db/Time/TimeIO.C
View File

@ -44,6 +44,7 @@ void Foam::Time::readDict()
);
}
scalar oldWriteInterval = writeInterval_;
if (controlDict_.readIfPresent("writeInterval", writeInterval_))
{
if (writeControl_ == wcTimeStep && label(writeInterval_) < 1)
@ -58,6 +59,22 @@ void Foam::Time::readDict()
controlDict_.lookup("writeFrequency") >> writeInterval_;
}
if (oldWriteInterval != writeInterval_)
{
switch(writeControl_)
{
case wcRunTime:
case wcAdjustableRunTime:
// Recalculate outputTimeIndex_ to be in units of current
// writeInterval.
outputTimeIndex_ *= oldWriteInterval/writeInterval_;
break;
default:
break;
}
}
if (controlDict_.readIfPresent("purgeWrite", purgeWrite_))
{
if (purgeWrite_ < 0)

4
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
View File

@ -248,7 +248,7 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
refineParams.keepPoints()[0],
refineParams.curvature(),
PtrList<featureEdgeMesh>(0), // dummy featureMeshes;
PtrList<featureEdgeMesh>(), // dummy featureMeshes;
labelList(0), // dummy featureLevels;
false, // featureRefinement
@ -389,7 +389,7 @@ Foam::label Foam::autoRefineDriver::shellRefine
refineParams.keepPoints()[0],
refineParams.curvature(),
PtrList<featureEdgeMesh>(0), // dummy featureMeshes;
PtrList<featureEdgeMesh>(), // dummy featureMeshes;
labelList(0), // dummy featureLevels;
false, // featureRefinement

40
src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
View File

@ -155,17 +155,35 @@ void Foam::duplicatePoints::setRefinement
zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
}
meshMod.modifyFace
(
newFace, // modified face
faceI, // label of face being modified
mesh_.faceOwner()[faceI], // owner
-1, // neighbour
false, // face flip
patches.whichPatch(faceI), // patch for face
zoneID, // zone for face
zoneFlip // face flip in zone
);
if (mesh_.isInternalFace(faceI))
{
meshMod.modifyFace
(
newFace, // modified face
faceI, // label of face being modified
mesh_.faceOwner()[faceI], // owner
mesh_.faceNeighbour()[faceI], // neighbour
false, // face flip
-1, // patch for face
zoneID, // zone for face
zoneFlip // face flip in zone
);
}
else
{
meshMod.modifyFace
(
newFace, // modified face
faceI, // label of face being modified
mesh_.faceOwner()[faceI], // owner
-1, // neighbour
false, // face flip
patches.whichPatch(faceI), // patch for face
zoneID, // zone for face
zoneFlip // face flip in zone
);
}
}

102
src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
View File

@ -43,15 +43,22 @@ class minEqOpFace
{
public:
void operator()( face& x, const face& y ) const
void operator()(face& x, const face& y) const
{
forAll(x, i)
if (x.size() > 0)
{
x[i] = min(x[i], y[i]);
label j = 0;
forAll(x, i)
{
x[i] = min(x[i], y[j]);
j = y.rcIndex(j);
}
}
};
};
// Dummy transform for faces. Used in synchronisation
void transformList
(
@ -103,6 +110,7 @@ bool Foam::localPointRegion::isDuplicate
void Foam::localPointRegion::countPointRegions
(
const polyMesh& mesh,
const boolList& candidatePoint,
const Map<label>& candidateFace,
faceList& minRegion
)
@ -120,7 +128,7 @@ void Foam::localPointRegion::countPointRegions
forAllConstIter(Map<label>, candidateFace, iter)
{
label faceI = iter();
label faceI = iter.key();
if (!mesh.isInternalFace(faceI))
{
@ -137,43 +145,75 @@ void Foam::localPointRegion::countPointRegions
forAll(f, fp)
{
label pointI = f[fp];
label region = minRegion[faceI][fp];
if (minPointRegion[pointI] == -1)
// Even points which were not candidates for splitting might
// be on multiple baffles that are being split so check.
if (candidatePoint[pointI])
{
minPointRegion[pointI] = region;
}
else if (minPointRegion[pointI] != region)
{
// Multiple regions for this point. Add.
Map<label>::iterator iter = meshPointMap_.find(pointI);
if (iter != meshPointMap_.end())
label region = minRegion[faceI][fp];
if (minPointRegion[pointI] == -1)
{
labelList& regions = pointRegions[iter()];
if (findIndex(regions, region) == -1)
minPointRegion[pointI] = region;
}
else if (minPointRegion[pointI] != region)
{
// Multiple regions for this point. Add.
Map<label>::iterator iter = meshPointMap_.find(pointI);
if (iter != meshPointMap_.end())
{
label sz = regions.size();
regions.setSize(sz+1);
regions[sz] = region;
labelList& regions = pointRegions[iter()];
if (findIndex(regions, region) == -1)
{
label sz = regions.size();
regions.setSize(sz+1);
regions[sz] = region;
}
}
else
{
label localPointI = meshPointMap_.size();
meshPointMap_.insert(pointI, localPointI);
labelList regions(2);
regions[0] = minPointRegion[pointI];
regions[1] = region;
pointRegions.append(regions);
}
}
else
{
label localPointI = meshPointMap_.size();
meshPointMap_.insert(pointI, localPointI);
labelList regions(2);
regions[0] = minPointRegion[pointI];
regions[1] = region;
pointRegions.append(regions);
}
label meshFaceMapI = meshFaceMap_.size();
meshFaceMap_.insert(faceI, meshFaceMapI);
}
}
}
}
}
minPointRegion.clear();
// Add internal faces that use any duplicated point. Can only have one
// region!
forAllConstIter(Map<label>, candidateFace, iter)
{
label faceI = iter.key();
if (mesh.isInternalFace(faceI))
{
const face& f = mesh.faces()[faceI];
forAll(f, fp)
{
// Note: candidatePoint test not really necessary but
// speeds up rejection.
if (candidatePoint[f[fp]] && meshPointMap_.found(f[fp]))
{
label meshFaceMapI = meshFaceMap_.size();
meshFaceMap_.insert(faceI, meshFaceMapI);
}
}
}
}
minPointRegion.clear();
// Transfer to member data
pointRegions.shrink();
pointRegions_.setSize(pointRegions.size());
@ -285,7 +325,7 @@ void Foam::localPointRegion::calcPointRegions
faceList minRegion(mesh.nFaces());
forAllConstIter(Map<label>, candidateFace, iter)
{
label faceI = iter();
label faceI = iter.key();
const face& f = mesh.faces()[faceI];
if (mesh.isInternalFace(faceI))
@ -391,7 +431,7 @@ void Foam::localPointRegion::calcPointRegions
// Count regions per point
countPointRegions(mesh, candidateFace, minRegion);
countPointRegions(mesh, candidatePoint, candidateFace, minRegion);
minRegion.clear();

1
src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.H
View File

@ -92,6 +92,7 @@ class localPointRegion
void countPointRegions
(
const polyMesh& mesh,
const boolList& candidatePoint,
const Map<label>& candidateFace,
faceList& minRegion
);

36
src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
View File

@ -30,14 +30,9 @@ License
#include "volFields.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -53,7 +48,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
}
wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
(
const wallHeatTransferFvPatchScalarField& ptf,
const fvPatch& p,
@ -67,7 +62,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
{}
wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -96,7 +91,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
}
wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
(
const wallHeatTransferFvPatchScalarField& tppsf
)
@ -107,7 +102,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
{}
wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
(
const wallHeatTransferFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF
@ -121,7 +116,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void wallHeatTransferFvPatchScalarField::autoMap
void Foam::wallHeatTransferFvPatchScalarField::autoMap
(
const fvPatchFieldMapper& m
)
@ -132,7 +127,7 @@ void wallHeatTransferFvPatchScalarField::autoMap
}
void wallHeatTransferFvPatchScalarField::rmap
void Foam::wallHeatTransferFvPatchScalarField::rmap
(
const fvPatchScalarField& ptf,
const labelList& addr
@ -148,7 +143,7 @@ void wallHeatTransferFvPatchScalarField::rmap
}
void wallHeatTransferFvPatchScalarField::updateCoeffs()
void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
{
if (updated())
{
@ -159,13 +154,13 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
(
"thermophysicalProperties"
);
const label patchi = patch().index();
const scalarField& Tw = thermo.T().boundaryField()[patchi];
scalarField Cpw = thermo.Cp(Tw, patchi);
valueFraction() =
valueFraction() =
1.0/
(
1.0
@ -177,7 +172,7 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
}
void wallHeatTransferFvPatchScalarField::write(Ostream& os) const
void Foam::wallHeatTransferFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
Tinf_.writeEntry("Tinf", os);
@ -188,10 +183,9 @@ void wallHeatTransferFvPatchScalarField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, wallHeatTransferFvPatchScalarField);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
namespace Foam
{
makePatchTypeField(fvPatchScalarField, wallHeatTransferFvPatchScalarField);
}
// ************************************************************************* //

8
src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
View File

@ -128,7 +128,7 @@ public:
// Member Functions
// fundamaental properties
// Fundamaental properties
//- Heat capacity at constant pressure [J/(kmol K)]
inline scalar cp(const scalar T) const;
@ -152,10 +152,8 @@ public:
// Member operators
inline eConstThermo& operator=
(
const eConstThermo&
);
inline void operator+=(const hConstThermo&);
inline void operator-=(const hConstThermo&);
// Friend operators

62
src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
View File

@ -24,15 +24,9 @@ License
\*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Construct from components
inline eConstThermo::eConstThermo
inline Foam::eConstThermo::eConstThermo
(
const specieThermo& st,
const scalar cv,
@ -47,8 +41,11 @@ inline eConstThermo::eConstThermo
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
//- Construct as named copy
inline eConstThermo::eConstThermo(const word& name, const eConstThermo& ct)
inline Foam::eConstThermo::eConstThermo
(
const word& name,
const eConstThermo& ct
)
:
specieThermo(name, ct),
CV(ct.CV),
@ -56,10 +53,9 @@ inline eConstThermo::eConstThermo(const word& name, const eConstThermo& ct)
{}
// Construct and return a clone
template<class equationOfState>
inline autoPtr<eConstThermo<equationOfState> > eConstThermo<equationOfState>::
clone() const
inline Foam::autoPtr<eConstThermo<equationOfState> >
Foam::eConstThermo<equationOfState>::clone() const
{
return autoPtr<eConstThermo<equationOfState> >
(
@ -68,10 +64,9 @@ clone() const
}
// Selector from Istream
template<class equationOfState>
inline autoPtr<eConstThermo<equationOfState> > eConstThermo<equationOfState>::
New(Istream& is)
inline autoPtr<eConstThermo<equationOfState> >
Foam::eConstThermo<equationOfState>::New(Istream& is)
{
return autoPtr<eConstThermo<equationOfState> >
(
@ -82,37 +77,40 @@ New(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
//- Heat capacity at constant pressure [J/(kmol K)]
inline scalar eConstThermo::cp(const scalar) const
inline Foam::scalar Foam::eConstThermo::cp(const scalar) const
{
return CV*W() + RR;
}
//- Enthalpy [J/kmol]
inline scalar eConstThermo::h(const scalar T) const
inline Foam::scalar Foam::eConstThermo::h(const scalar T) const
{
return cp(T)*T + Hf*W();
}
//- Entropy [J/(kmol K)]
inline scalar eConstThermo::s(const scalar T) const
inline Foam::scalar Foam::eConstThermo::s(const scalar T) const
{
notImplemented("scalar eConstThermo::s(const scalar T) const");
return T;
}
//- Temperature from Enthalpy given an initial temperature T0
inline scalar eConstThermo::TH(const scalar h, const scalar T0) const
inline Foam::scalar Foam::eConstThermo::TH
(
const scalar h,
const scalar T0
) const
{
return (h - Hf)/Cp(T0);
}
//- Temperature from internal energy given an initial temperature T0
inline scalar eConstThermo::TE(const scalar e, const scalar) const
inline Foam::scalar Foam::eConstThermo::TE
(
const scalar e,
const scalar
) const
{
return (e - Hf)/CV;
}
@ -120,7 +118,7 @@ inline scalar eConstThermo::TE(const scalar e, const scalar) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
inline eConstThermo& eConstThermo::operator=
inline Foam::eConstThermo& Foam::eConstThermo::operator=
(
const eConstThermo& ct
)
@ -136,7 +134,7 @@ inline eConstThermo& eConstThermo::operator=
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
inline eConstThermo operator+
inline Foam::eConstThermo Foam::operator+
(
const eConstThermo& ct1,
const eConstThermo& ct2
@ -153,7 +151,7 @@ inline eConstThermo operator+
}
inline eConstThermo operator-
inline Foam::eConstThermo Foam::operator-
(
const eConstThermo& ct1,
const eConstThermo& ct2
@ -170,7 +168,7 @@ inline eConstThermo operator-
}
inline eConstThermo operator*
inline Foam::eConstThermo Foam::operator*
(
const scalar s,
const eConstThermo& ct
@ -185,7 +183,7 @@ inline eConstThermo operator*
}
inline eConstThermo operator==
inline Foam::eConstThermo Foam::operator==
(
const eConstThermo& ct1,
const eConstThermo& ct2
@ -195,8 +193,4 @@ inline eConstThermo operator==
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //

9
src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
View File

@ -108,6 +108,7 @@ class hConstThermo
const scalar hf
);
public:
// Constructors
@ -127,7 +128,7 @@ public:
// Member Functions
// fundamaental properties
// Fundamaental properties
//- Heat capacity at constant pressure [J/(kmol K)]
inline scalar cp(const scalar T) const;
@ -141,10 +142,8 @@ public:
// Member operators
inline hConstThermo& operator=
(
const hConstThermo&
);
inline void operator+=(const hConstThermo&);
inline void operator-=(const hConstThermo&);
// Friend operators

98
src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
View File

@ -24,16 +24,10 @@ License
\*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Construct from components
template<class equationOfState>
inline hConstThermo<equationOfState>::hConstThermo
inline Foam::hConstThermo<equationOfState>::hConstThermo
(
const equationOfState& st,
const scalar cp,
@ -48,9 +42,8 @@ inline hConstThermo<equationOfState>::hConstThermo
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct as named copy
template<class equationOfState>
inline hConstThermo<equationOfState>::hConstThermo
inline Foam::hConstThermo<equationOfState>::hConstThermo
(
const word& name,
const hConstThermo& ct
@ -62,10 +55,9 @@ inline hConstThermo<equationOfState>::hConstThermo
{}
// Construct and return a clone
template<class equationOfState>
inline autoPtr<hConstThermo<equationOfState> > hConstThermo<equationOfState>::
clone() const
inline Foam::autoPtr<Foam::hConstThermo<equationOfState> >
Foam::hConstThermo<equationOfState>::clone() const
{
return autoPtr<hConstThermo<equationOfState> >
(
@ -74,10 +66,9 @@ clone() const
}
// Selector from Istream
template<class equationOfState>
inline autoPtr<hConstThermo<equationOfState> > hConstThermo<equationOfState>::
New(Istream& is)
inline Foam::autoPtr<Foam::hConstThermo<equationOfState> >
Foam::hConstThermo<equationOfState>::New(Istream& is)
{
return autoPtr<hConstThermo<equationOfState> >
(
@ -88,68 +79,73 @@ New(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
//- Heat capacity at constant pressure [J/(kmol K)]
template<class equationOfState>
inline scalar hConstThermo<equationOfState>::cp(const scalar) const
inline Foam::scalar Foam::hConstThermo<equationOfState>::cp(const scalar) const
{
return CP*this->W();
}
//- Enthalpy [J/kmol]
template<class equationOfState>
inline scalar hConstThermo<equationOfState>::h(const scalar T) const
inline Foam::scalar Foam::hConstThermo<equationOfState>::h(const scalar T) const
{
return (CP*T + Hf)*this->W();
}
//- Entropy [J/(kmol K)]
template<class equationOfState>
inline scalar hConstThermo<equationOfState>::s(const scalar T) const
inline Foam::scalar Foam::hConstThermo<equationOfState>::s(const scalar T) const
{
notImplemented("scalar hConstThermo<equationOfState>::s(const scalar T) const");
notImplemented
(
"scalar hConstThermo<equationOfState>::s(const scalar T) const"
);
return T;
}
/*
//- Temperature from Enthalpy given an initial temperature T0
template<class equationOfState>
inline scalar hConstThermo<equationOfState>::TH(const scalar h, const scalar T0) const
{
return (h - Hf)/Cp(T0);
}
//- Temperature from internal energy given an initial temperature T0
template<class equationOfState>
inline scalar hConstThermo<equationOfState>::TE(const scalar e, const scalar T0) const
{
return (e - Hf)/Cv(T0);
}
*/
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class equationOfState>
inline hConstThermo<equationOfState>& hConstThermo<equationOfState>::operator=
inline void Foam::hConstThermo<equationOfState>::operator+=
(
const hConstThermo& ct
const hConstThermo<equationOfState>& ct
)
{
equationOfState::operator=(ct);
scalar molr1 = this->nMoles();
CP = ct.CP;
Hf = ct.Hf;
equationOfState::operator+=(ct);
return *this;
molr1 /= this->nMoles();
scalar molr2 = ct.nMoles()/this->nMoles();
CP = molr1*CP + molr2*ct.CP;
Hf = molr1*Hf + molr2*ct.Hf;
}
template<class equationOfState>
inline void Foam::hConstThermo<equationOfState>::operator-=
(
const hConstThermo<equationOfState>& ct
)
{
scalar molr1 = this->nMoles();
equationOfState::operator-=(ct);
molr1 /= this->nMoles();
scalar molr2 = ct.nMoles()/this->nMoles();
CP = molr1*CP - molr2*ct.CP;
Hf = molr1*Hf - molr2*ct.Hf;
}
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
template<class equationOfState>
inline hConstThermo<equationOfState> operator+
inline Foam::hConstThermo<equationOfState> Foam::operator+
(
const hConstThermo<equationOfState>& ct1,
const hConstThermo<equationOfState>& ct2
@ -158,7 +154,7 @@ inline hConstThermo<equationOfState> operator+
equationOfState eofs
(
static_cast<const equationOfState&>(ct1)
+ static_cast<const equationOfState&>(ct2)
+ static_cast<const equationOfState&>(ct2)
);
return hConstThermo<equationOfState>
@ -171,7 +167,7 @@ inline hConstThermo<equationOfState> operator+
template<class equationOfState>
inline hConstThermo<equationOfState> operator-
inline Foam::hConstThermo<equationOfState> Foam::operator-
(
const hConstThermo<equationOfState>& ct1,
const hConstThermo<equationOfState>& ct2
@ -193,7 +189,7 @@ inline hConstThermo<equationOfState> operator-
template<class equationOfState>
inline hConstThermo<equationOfState> operator*
inline Foam::hConstThermo<equationOfState> Foam::operator*
(
const scalar s,
const hConstThermo<equationOfState>& ct
@ -209,7 +205,7 @@ inline hConstThermo<equationOfState> operator*
template<class equationOfState>
inline hConstThermo<equationOfState> operator==
inline Foam::hConstThermo<equationOfState> Foam::operator==
(
const hConstThermo<equationOfState>& ct1,
const hConstThermo<equationOfState>& ct2
@ -219,8 +215,4 @@ inline hConstThermo<equationOfState> operator==
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //

19
src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
View File

@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef janafThermo2_H
#define janafThermo2_H
#ifndef janafThermo_H
#define janafThermo_H
#include "scalar.H"
@ -85,11 +85,6 @@ Ostream& operator<<
);
#ifdef __GNUC__
typedef scalar coeffArray2[7];
#endif
/*---------------------------------------------------------------------------*\
Class janafThermo Declaration
\*---------------------------------------------------------------------------*/
@ -122,13 +117,7 @@ private:
inline void checkT(const scalar T) const;
//- Return the coefficients corresponding to the given temperature
inline const
# ifdef __GNUC__
coeffArray2&
# else
coeffArray&
# endif
coeffs(const scalar T) const;
inline const coeffArray& coeffs(const scalar T) const;
public:
@ -170,8 +159,6 @@ public:
inline void operator+=(const janafThermo&);
inline void operator-=(const janafThermo&);
inline void operator*=(const scalar);
// Friend operators

59
src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
View File

@ -26,16 +26,10 @@ License
#include "janafThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Construct from components
template<class equationOfState>
inline janafThermo<equationOfState>::janafThermo
inline Foam::janafThermo<equationOfState>::janafThermo
(
const equationOfState& st,
const scalar Tlow,
@ -58,9 +52,8 @@ inline janafThermo<equationOfState>::janafThermo
}
// Check given temperature is within the range of the fitted coeffs.
template<class equationOfState>
inline void janafThermo<equationOfState>::checkT(const scalar T) const
inline void Foam::janafThermo<equationOfState>::checkT(const scalar T) const
{
if (T < Tlow_ || T > Thigh_)
{
@ -75,15 +68,9 @@ inline void janafThermo<equationOfState>::checkT(const scalar T) const
}
// Return the coefficients corresponding to the given temperature
template<class equationOfState>
inline const
#ifdef __GNUC__
coeffArray2&
#else
typename janafThermo<equationOfState>::coeffArray&
#endif
janafThermo<equationOfState>::coeffs
inline const typename Foam::janafThermo<equationOfState>::coeffArray&
Foam::janafThermo<equationOfState>::coeffs
(
const scalar T
) const
@ -103,9 +90,8 @@ janafThermo<equationOfState>::coeffs
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct as a named copy
template<class equationOfState>
inline janafThermo<equationOfState>::janafThermo
inline Foam::janafThermo<equationOfState>::janafThermo
(
const word& name,
const janafThermo& jt
@ -126,9 +112,8 @@ inline janafThermo<equationOfState>::janafThermo
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// Heat capacity at constant pressure [J/(kmol K)]
template<class equationOfState>
inline scalar janafThermo<equationOfState>::cp
inline Foam::scalar Foam::janafThermo<equationOfState>::cp
(
const scalar T
) const
@ -138,9 +123,8 @@ inline scalar janafThermo<equationOfState>::cp
}
// Enthalpy [J/kmol]
template<class equationOfState>
inline scalar janafThermo<equationOfState>::h
inline Foam::scalar Foam::janafThermo<equationOfState>::h
(
const scalar T
) const
@ -155,9 +139,8 @@ inline scalar janafThermo<equationOfState>::h
}
// Entropy [J/(kmol K)]
template<class equationOfState>
inline scalar janafThermo<equationOfState>::s
inline Foam::scalar Foam::janafThermo<equationOfState>::s
(
const scalar T
) const
@ -175,7 +158,7 @@ inline scalar janafThermo<equationOfState>::s
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class equationOfState>
inline void janafThermo<equationOfState>::operator+=
inline void Foam::janafThermo<equationOfState>::operator+=
(
const janafThermo<equationOfState>& jt
)
@ -210,7 +193,7 @@ inline void janafThermo<equationOfState>::operator+=
template<class equationOfState>
inline void janafThermo<equationOfState>::operator-=
inline void Foam::janafThermo<equationOfState>::operator-=
(
const janafThermo<equationOfState>& jt
)
@ -244,20 +227,10 @@ inline void janafThermo<equationOfState>::operator-=
}
template<class equationOfState>
inline void janafThermo<equationOfState>::operator*=
(
const scalar s
)
{
equationOfState::operator*=(s);
}
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
template<class equationOfState>
inline janafThermo<equationOfState> operator+
inline Foam::janafThermo<equationOfState> Foam::operator+
(
const janafThermo<equationOfState>& jt1,
const janafThermo<equationOfState>& jt2
@ -301,7 +274,7 @@ inline janafThermo<equationOfState> operator+
template<class equationOfState>
inline janafThermo<equationOfState> operator-
inline Foam::janafThermo<equationOfState> Foam::operator-
(
const janafThermo<equationOfState>& jt1,
const janafThermo<equationOfState>& jt2
@ -345,7 +318,7 @@ inline janafThermo<equationOfState> operator-
template<class equationOfState>
inline janafThermo<equationOfState> operator*
inline Foam::janafThermo<equationOfState> Foam::operator*
(
const scalar s,
const janafThermo<equationOfState>& jt
@ -364,7 +337,7 @@ inline janafThermo<equationOfState> operator*
template<class equationOfState>
inline janafThermo<equationOfState> operator==
inline Foam::janafThermo<equationOfState> Foam::operator==
(
const janafThermo<equationOfState>& jt1,
const janafThermo<equationOfState>& jt2
@ -374,8 +347,4 @@ inline janafThermo<equationOfState> operator==
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //