zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermophysicalModels: Removed unused and unmaintained Istream constructors

Browse Source
This commit is contained in:
Henry Weller
2017-02-17 15:50:00 +00:00
parent 565576b13c
commit 49cd45bb89
142 changed files with 112 additions and 1946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/thermophysicalModels/properties/solidProperties/C/C.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C, 0);
addToRunTimeSelectionTable(solidProperties, C,);
addToRunTimeSelectionTable(solidProperties, C, Istream);
addToRunTimeSelectionTable(solidProperties, C, dictionary);
}
@ -57,24 +56,12 @@ Foam::C::C(const solidProperties& s)
{}
Foam::C::C(Istream& is)
:
solidProperties(is)
{}
Foam::C::C(const dictionary& dict)
:
solidProperties(dict)
{}
Foam::C::C(const C& s)
:
solidProperties(s)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::C::writeData(Ostream& os) const

8
src/thermophysicalModels/properties/solidProperties/C/C.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,15 +73,9 @@ public:
//- Construct from solidProperties
C(const solidProperties& s);
//- Construct from Istream
C(Istream& is);
//- Construct from dictionary
C(const dictionary& dict);
//- Construct copy
C(const C& s);
//- Construct and return clone
virtual autoPtr<solidProperties> clone() const
{

15
src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(CaCO3, 0);
addToRunTimeSelectionTable(solidProperties, CaCO3,);
addToRunTimeSelectionTable(solidProperties, CaCO3, Istream);
addToRunTimeSelectionTable(solidProperties, CaCO3, dictionary);
}
@ -57,24 +56,12 @@ Foam::CaCO3::CaCO3(const solidProperties& s)
{}
Foam::CaCO3::CaCO3(Istream& is)
:
solidProperties(is)
{}
Foam::CaCO3::CaCO3(const dictionary& dict)
:
solidProperties(dict)
{}
Foam::CaCO3::CaCO3(const CaCO3& s)
:
solidProperties(s)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::CaCO3::writeData(Ostream& os) const

8
src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -74,15 +74,9 @@ public:
//- Construct from solidProperties
CaCO3(const solidProperties& s);
//- Construct from Istream
CaCO3(Istream& is);
//- Construct from dictionary
CaCO3(const dictionary& dict);
//- Construct copy
CaCO3(const CaCO3& s);
//- Construct and return clone
virtual autoPtr<solidProperties> clone() const
{

15
src/thermophysicalModels/properties/solidProperties/ash/ash.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(ash, 0);
addToRunTimeSelectionTable(solidProperties, ash,);
addToRunTimeSelectionTable(solidProperties, ash, Istream);
addToRunTimeSelectionTable(solidProperties, ash, dictionary);
}
@ -57,24 +56,12 @@ Foam::ash::ash(const solidProperties& s)
{}
Foam::ash::ash(Istream& is)
:
solidProperties(is)
{}
Foam::ash::ash(const dictionary& dict)
:
solidProperties(dict)
{}
Foam::ash::ash(const ash& s)
:
solidProperties(s)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::ash::writeData(Ostream& os) const

8
src/thermophysicalModels/properties/solidProperties/ash/ash.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -74,15 +74,9 @@ public:
//- Construct from solidProperties
ash(const solidProperties& s);
//- Construct from Istream
ash(Istream& is);
//- Construct from dictionary
ash(const dictionary& dict);
//- Construct copy
ash(const ash& s);
//- Construct and return clone
virtual autoPtr<solidProperties> clone() const
{

21
src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
View File

@ -31,7 +31,6 @@ namespace Foam
{
defineTypeNameAndDebug(solidProperties, 0);
defineRunTimeSelectionTable(solidProperties,);
defineRunTimeSelectionTable(solidProperties, Istream);
defineRunTimeSelectionTable(solidProperties, dictionary);
}
@ -54,16 +53,6 @@ Foam::solidProperties::solidProperties
{}
Foam::solidProperties::solidProperties(Istream& is)
:
rho_(readScalar(is)),
Cp_(readScalar(is)),
kappa_(readScalar(is)),
Hf_(readScalar(is)),
emissivity_(readScalar(is))
{}
Foam::solidProperties::solidProperties(const dictionary& dict)
:
rho_(readScalar(dict.lookup("rho"))),
@ -74,16 +63,6 @@ Foam::solidProperties::solidProperties(const dictionary& dict)
{}
Foam::solidProperties::solidProperties(const solidProperties& s)
:
rho_(s.rho_),
Cp_(s.Cp_),
kappa_(s.kappa_),
Hf_(s.Hf_),
emissivity_(s.emissivity_)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::solidProperties::writeData(Ostream& os) const

18
src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
View File

@ -96,15 +96,6 @@ public:
()
);
declareRunTimeSelectionTable
(
autoPtr,
solidProperties,
Istream,
(Istream& is),
(is)
);
declareRunTimeSelectionTable
(
autoPtr,
@ -127,15 +118,9 @@ public:
scalar emissivity
);
//- Construct from Istream
solidProperties(Istream& is);
//- Construct from dictionary
solidProperties(const dictionary& dict);
//- Construct copy
solidProperties(const solidProperties& s);
//- Construct and return clone
virtual autoPtr<solidProperties> clone() const
{
@ -145,9 +130,6 @@ public:
// Selectors
//- Return a pointer to a new solidProperties created from input
static autoPtr<solidProperties> New(Istream& is);
//- Return a pointer to a new solidProperties created from dictionary
static autoPtr<solidProperties> New(const dictionary& dict);

45
src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,49 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New(Istream& is)
{
if (debug)
{
InfoInFunction << "Constructing solid" << endl;
}
const word solidType(is);
const word coeffs(is);
if (coeffs == "defaultCoeffs")
{
ConstructorTable::iterator cstrIter =
ConstructorTablePtr_->find(solidType);
if (cstrIter == ConstructorTablePtr_->end())
{
FatalErrorInFunction
<< "Unknown solidProperties type " << solidType << nl << nl
<< "Valid solidProperties types are :" << endl
<< ConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<solidProperties>(cstrIter()());
}
else if (coeffs == "coeffs")
{
return autoPtr<solidProperties>(new solidProperties(is));
}
else
{
FatalErrorInFunction
<< "solidProperties type " << solidType
<< ", option " << coeffs << " given"
<< ", should be coeffs or defaultCoeffs"
<< exit(FatalError);
return autoPtr<solidProperties>(nullptr);
}
}
Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
(
const dictionary& dict

28
src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,26 +26,6 @@ License
#include "absorptionCoeffs.H"
#include "IOstreams.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::radiation::absorptionCoeffs::absorptionCoeffs(Istream& is)
:
Tcommon_(readScalar(is)),
Tlow_(readScalar(is)),
Thigh_(readScalar(is)),
invTemp_(readBool(is))
{
for (label coefLabel=0; absorptionCoeffs::nCoeffs_; coefLabel++)
{
is >> highACoeffs_[coefLabel];
}
for (label coefLabel=0; absorptionCoeffs::nCoeffs_; coefLabel++)
{
is >> lowACoeffs_[coefLabel];
}
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
@ -86,12 +66,6 @@ Foam::radiation::absorptionCoeffs::coeffs
}
void Foam::radiation::absorptionCoeffs::initialise(Istream&)
{
absorptionCoeffs(Istream);
}
void Foam::radiation::absorptionCoeffs::initialise(const dictionary& dict)
{
dict.lookup("Tcommon") >> Tcommon_;

8
src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -90,9 +90,6 @@ public:
// Constructors
//- Construct from Istream
absorptionCoeffs(Istream&);
// Null constructor
absorptionCoeffs()
{}
@ -110,9 +107,6 @@ public:
// Initialise from a dictionary
void initialise(const dictionary&);
// Initialise from an Istream
void initialise(Istream&);
// Access Functions

19
src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,23 +59,6 @@ Foam::solidReaction<ReactionThermo>::solidReaction
{}
template<class ReactionThermo>
Foam::solidReaction<ReactionThermo>::solidReaction
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
)
:
Reaction<ReactionThermo>(species, thermoDatabase, is),
pyrolisisGases_(),
glhs_(),
grhs_()
{
NotImplemented;
}
template<class ReactionThermo>
Foam::solidReaction<ReactionThermo>::solidReaction
(

11
src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -120,15 +120,6 @@ public:
);
//- Construct from Istream
solidReaction
(
const speciesTable& pyrolisisGases,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
);
//- Construct from dictionary
solidReaction
(

8
src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,12 +75,6 @@ public:
const scalar Tcrit
);
//- Construct from Istream
inline solidArrheniusReactionRate
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline solidArrheniusReactionRate

18
src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -39,18 +39,6 @@ inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate
{}
inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate
(
const speciesTable&,
Istream& is
)
:
A_(readScalar(is.readBegin("solidArrheniusReaction(Istream&)"))),
Ta_(readScalar(is)),
Tcrit_(readScalar(is))
{}
inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate
(
const speciesTable&,
@ -101,9 +89,7 @@ inline Foam::Ostream& Foam::operator<<
const solidArrheniusReactionRate& arr
)
{
os << token::BEGIN_LIST
<< arr.A_ << token::SPACE << arr.Ta_ << token::SPACE << arr.Tcrit_
<< token::END_LIST;
arr.write(os);
return os;
}

10
src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,7 +54,6 @@ namespace Foam
typedef ReactionType<solidReaction, Thermo, ReactionRate> \
ReactionType##Thermo##ReactionRate; \
\
defineTemplateRunTimeSelectionTable(Reaction##Thermo, Istream); \
defineTemplateRunTimeSelectionTable(Reaction##Thermo, dictionary); \
\
defineTemplateTypeNameAndDebug(solidReaction##Thermo, 0); \
@ -69,13 +68,6 @@ namespace Foam
); \
\
addToRunTimeSelectionTable \
( \
Reaction##Thermo, \
ReactionType##Thermo##ReactionRate, \
Istream \
); \
\
addToRunTimeSelectionTable \
( \
Reaction##Thermo, \
ReactionType##Thermo##ReactionRate, \

11
src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -64,14 +64,7 @@ Foam::Ostream& Foam::operator<<
const constAnIsoSolidTransport<Thermo>& ct
)
{
operator<<(os, static_cast<const Thermo&>(ct));
os << tab << ct.kappa_;
os.check
(
"Ostream& operator<<(Ostream& os,const constAnIsoSolidTransport& ct)"
);
ct.write(os);
return os;
}

11
src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -64,14 +64,7 @@ Foam::Ostream& Foam::operator<<
const constIsoSolidTransport<Thermo>& ct
)
{
operator<<(os, static_cast<const Thermo&>(ct));
os << tab << ct.kappa_;
os.check
(
"Ostream& operator<<(Ostream& os,const constIsoSolidTransport& ct)"
);
ct.write(os);
return os;
}

2
src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
View File

@ -94,7 +94,7 @@ public:
const constIsoSolidTransport&
);
//- Construct from Istream
//- Construct from dictionary
constIsoSolidTransport(const dictionary& dict);
// Selector from dictionary

11
src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -72,14 +72,7 @@ Foam::Ostream& Foam::operator<<
Ostream& os, const exponentialSolidTransport<Thermo>& et
)
{
operator<<(os, static_cast<const Thermo&>(et));
os << tab << et.kappa0_ << tab << et.n0_ << tab << et.Tref_;
os.check
(
"Ostream& operator<<(Ostream& os, const exponentialSolidTransport& et)"
);
et.write(os);
return os;
}

28
src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,18 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Thermo, int PolySize>
Foam::polynomialSolidTransport<Thermo, PolySize>::polynomialSolidTransport
(
Istream& is
)
:
Thermo(is),
kappaCoeffs_("kappaCoeffs<" + Foam::name(PolySize) + '>', is)
{
}
template<class Thermo, int PolySize>
Foam::polynomialSolidTransport<Thermo, PolySize>::polynomialSolidTransport
(
@ -85,19 +73,7 @@ Foam::Ostream& Foam::operator<<
const polynomialSolidTransport<Thermo, PolySize>& pt
)
{
os << static_cast<const Thermo&>(pt) << tab
<< "kappaCoeffs<" << Foam::name(PolySize) << '>' << tab
<< pt.kappaCoeffs_;
os.check
(
"Ostream& operator<<"
"("
"Ostream&, "
"const polynomialSolidTransport<Thermo, PolySize>&"
")"
);
pt.write(os);
return os;
}

9
src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
View File

@ -127,9 +127,6 @@ public:
// Constructors
//- Construct copy
inline polynomialSolidTransport(const polynomialSolidTransport&);
//- Construct as named copy
inline polynomialSolidTransport
(
@ -137,18 +134,12 @@ public:
const polynomialSolidTransport&
);
//- Construct from Istream
polynomialSolidTransport(Istream& is);
//- Construct from dictionary
polynomialSolidTransport(const dictionary& dict);
//- Construct and return a clone
inline autoPtr<polynomialSolidTransport> clone() const;
// Selector from Istream
inline static autoPtr<polynomialSolidTransport> New(Istream& is);
// Selector from dictionary
inline static autoPtr<polynomialSolidTransport> New
(

23
src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
View File

@ -27,18 +27,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Thermo, int PolySize>
inline Foam::polynomialSolidTransport<Thermo, PolySize>::
polynomialSolidTransport
(
const polynomialSolidTransport& pt
)
:
Thermo(pt),
kappaCoeffs_(pt.kappaCoeffs_)
{}
template<class Thermo, int PolySize>
inline Foam::polynomialSolidTransport<Thermo, PolySize>::
polynomialSolidTransport
@ -76,17 +64,6 @@ Foam::polynomialSolidTransport<Thermo, PolySize>::clone() const
}
template<class Thermo, int PolySize>
inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize>>
Foam::polynomialSolidTransport<Thermo, PolySize>::New(Istream& is)
{
return autoPtr<polynomialSolidTransport<Thermo, PolySize>>
(
new polynomialSolidTransport<Thermo, PolySize>(is)
);
}
template<class Thermo, int PolySize>
inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize>>
Foam::polynomialSolidTransport<Thermo, PolySize>::New(const dictionary& dict)

27
src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
View File

@ -28,22 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::Boussinesq<Specie>::Boussinesq(Istream& is)
:
Specie(is),
rho0_(readScalar(is)),
T0_(readScalar(is)),
beta_(readScalar(is))
{
is.check
(
"Boussinesq<Specie>::"
"Boussinesq(Istream& is)"
);
}
template<class Specie>
Foam::Boussinesq<Specie>::Boussinesq
(
@ -81,16 +65,7 @@ Foam::Ostream& Foam::operator<<
const Boussinesq<Specie>& b
)
{
os << static_cast<const Specie&>(b)
<< token::SPACE << b.rho0_
<< token::SPACE << b.T0_
<< token::SPACE << b.beta_;
os.check
(
"Ostream& operator<<"
"(Ostream& os, const Boussinesq<Specie>& st)"
);
b.write(os);
return os;
}

9
src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
View File

@ -115,12 +115,6 @@ public:
const scalar beta
);
//- Construct from Boussinesq
inline Boussinesq(const Boussinesq& sp);
//- Construct from Istream
Boussinesq(Istream&);
//- Construct from dictionary
Boussinesq(const dictionary& dict);
@ -134,9 +128,6 @@ public:
//- Construct and return a clone
inline autoPtr<Boussinesq> clone() const;
// Selector from Istream
inline static autoPtr<Boussinesq> New(Istream& is);
// Selector from dictionary
inline static autoPtr<Boussinesq> New
(

27
src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
View File

@ -41,19 +41,6 @@ inline Foam::Boussinesq<Specie>::Boussinesq
{}
template<class Specie>
inline Foam::Boussinesq<Specie>::Boussinesq
(
const Boussinesq& b
)
:
Specie(b),
rho0_(b.rho0_),
T0_(b.T0_),
beta_(b.beta_)
{}
template<class Specie>
inline Foam::Boussinesq<Specie>::Boussinesq
(
@ -79,20 +66,6 @@ Foam::Boussinesq<Specie>::clone() const
}
template<class Specie>
inline Foam::autoPtr<Foam::Boussinesq<Specie>>
Foam::Boussinesq<Specie>::New
(
Istream& is
)
{
return autoPtr<Boussinesq<Specie>>
(
new Boussinesq<Specie>(is)
);
}
template<class Specie>
inline Foam::autoPtr<Foam::Boussinesq<Specie>>
Foam::Boussinesq<Specie>::New

26
src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
View File

@ -28,20 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::PengRobinsonGas<Specie>::PengRobinsonGas(Istream& is)
:
Specie(is),
Tc_(readScalar(is)),
Vc_(readScalar(is)),
Zc_(readScalar(is)),
Pc_(readScalar(is)),
omega_(readScalar(is))
{
is.check("PengRobinsonGas<Specie>::PengRobinsonGas(Istream& is)");
}
template<class Specie>
Foam::PengRobinsonGas<Specie>::PengRobinsonGas
(
@ -78,17 +64,7 @@ Foam::Ostream& Foam::operator<<
const PengRobinsonGas<Specie>& pg
)
{
os << static_cast<const Specie&>(pg)
<< token::SPACE << pg.Tc_
<< token::SPACE << pg.Vc_
<< token::SPACE << pg.Zc_
<< token::SPACE << pg.Pc_
<< token::SPACE << pg.omega_;
os.check
(
"Ostream& operator<<(Ostream& os, const PengRobinsonGas<Specie>& st)"
);
pg.write(os);
return os;
}

6
src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
View File

@ -119,9 +119,6 @@ public:
const scalar& omega
);
//- Construct from Istream
PengRobinsonGas(Istream&);
//- Construct from dictionary
PengRobinsonGas(const dictionary& dict);
@ -131,9 +128,6 @@ public:
//- Construct and return a clone
inline autoPtr<PengRobinsonGas> clone() const;
// Selector from Istream
inline static autoPtr<PengRobinsonGas> New(Istream& is);
// Selector from dictionary
inline static autoPtr<PengRobinsonGas> New
(

11
src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
View File

@ -77,17 +77,6 @@ Foam::PengRobinsonGas<Specie>::clone() const
}
template<class Specie>
inline Foam::autoPtr<Foam::PengRobinsonGas<Specie>>
Foam::PengRobinsonGas<Specie>::New
(
Istream& is
)
{
return autoPtr<PengRobinsonGas<Specie>>(new PengRobinsonGas<Specie>(is));
}
template<class Specie>
inline Foam::autoPtr<Foam::PengRobinsonGas<Specie>>
Foam::PengRobinsonGas<Specie>::New

28
src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
View File

@ -28,22 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid(Istream& is)
:
Specie(is),
p0_(readScalar(is)),
rho0_(readScalar(is)),
gamma_(readScalar(is)),
B_(readScalar(is))
{
is.check
(
"adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid(Istream& is)"
);
}
template<class Specie>
Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid
(
@ -84,17 +68,7 @@ Foam::Ostream& Foam::operator<<
const adiabaticPerfectFluid<Specie>& pf
)
{
os << static_cast<const Specie&>(pf)
<< token::SPACE << pf.R_
<< token::SPACE << pf.rho0_
<< token::SPACE << pf.gamma_
<< token::SPACE << pf.B_;
os.check
(
"Ostream& operator<<(Ostream&, const adiabaticPerfectFluid<Specie>&)"
);
pf.write(os);
return os;
}

6
src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
View File

@ -114,9 +114,6 @@ public:
const scalar B
);
//- Construct from Istream
adiabaticPerfectFluid(Istream&);
//- Construct from dictionary
adiabaticPerfectFluid(const dictionary& dict);
@ -130,9 +127,6 @@ public:
//- Construct and return a clone
inline autoPtr<adiabaticPerfectFluid> clone() const;
// Selector from Istream
inline static autoPtr<adiabaticPerfectFluid> New(Istream& is);
// Selector from dictionary
inline static autoPtr<adiabaticPerfectFluid> New
(

11
src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
View File

@ -73,17 +73,6 @@ Foam::adiabaticPerfectFluid<Specie>::clone() const
}
template<class Specie>
inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie>>
Foam::adiabaticPerfectFluid<Specie>::New(Istream& is)
{
return autoPtr<adiabaticPerfectFluid<Specie>>
(
new adiabaticPerfectFluid<Specie>(is)
);
}
template<class Specie>
inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie>>
Foam::adiabaticPerfectFluid<Specie>::New

19
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
View File

@ -33,14 +33,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie, int PolySize>
icoPolynomial<Specie, PolySize>::icoPolynomial(Istream& is)
:
Specie(is),
rhoCoeffs_("rhoCoeffs<" + Foam::name(PolySize) + '>', is)
{}
template<class Specie, int PolySize>
icoPolynomial<Specie, PolySize>::icoPolynomial(const dictionary& dict)
:
@ -78,16 +70,7 @@ void icoPolynomial<Specie, PolySize>::write(Ostream& os) const
template<class Specie, int PolySize>
Ostream& operator<<(Ostream& os, const icoPolynomial<Specie, PolySize>& ip)
{
os << static_cast<const Specie&>(ip) << tab
<< "rhoCoeffs<" << Foam::name(PolySize) << '>' << tab
<< ip.rhoCoeffs_;
os.check
(
"Ostream& operator<<"
"(Ostream& os, const icoPolynomial<Specie, PolySize>& ip)"
);
ip.write(os);
return os;
}

9
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
View File

@ -131,24 +131,15 @@ public:
const Polynomial<PolySize>& rhoPoly
);
//- Construct from Istream
icoPolynomial(Istream&);
//- Construct from dictionary
icoPolynomial(const dictionary& dict);
//- Construct as copy
inline icoPolynomial(const icoPolynomial&);
//- Construct as named copy
inline icoPolynomial(const word& name, const icoPolynomial&);
//- Construct and return a clone
inline autoPtr<icoPolynomial> clone() const;
// Selector from Istream
inline static autoPtr<icoPolynomial> New(Istream& is);
// Selector from dictionary
inline static autoPtr<icoPolynomial> New(const dictionary& dict);

22
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
View File

@ -41,17 +41,6 @@ inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie, int PolySize>
inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
(
const icoPolynomial<Specie, PolySize>& ip
)
:
Specie(ip),
rhoCoeffs_(ip.rhoCoeffs_)
{}
template<class Specie, int PolySize>
inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
(
@ -75,17 +64,6 @@ Foam::icoPolynomial<Specie, PolySize>::clone() const
}
template<class Specie, int PolySize>
inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize>>
Foam::icoPolynomial<Specie, PolySize>::New(Istream& is)
{
return autoPtr<icoPolynomial<Specie, PolySize>>
(
new icoPolynomial<Specie, PolySize>(is)
);
}
template<class Specie, int PolySize>
inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize>>
Foam::icoPolynomial<Specie, PolySize>::New(const dictionary& dict)

23
src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
View File

@ -28,20 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas(Istream& is)
:
Specie(is),
pRef_(readScalar(is))
{
is.check
(
"incompressiblePerfectGas<Specie>::"
"incompressiblePerfectGas(Istream& is)"
);
}
template<class Specie>
Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
(
@ -75,14 +61,7 @@ Foam::Ostream& Foam::operator<<
const incompressiblePerfectGas<Specie>& pg
)
{
os << static_cast<const Specie&>(pg)
<< token::SPACE << pg.pRef_;
os.check
(
"Ostream& operator<<"
"(Ostream& os, const incompressiblePerfectGas<Specie>& st)"
);
pg.write(os);
return os;
}

9
src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
View File

@ -100,12 +100,6 @@ public:
//- Construct from components
inline incompressiblePerfectGas(const Specie& sp, const scalar pRef);
//- Construct from incompressiblePerfectGas
inline incompressiblePerfectGas(const incompressiblePerfectGas& sp);
//- Construct from Istream
incompressiblePerfectGas(Istream&);
//- Construct from dictionary
incompressiblePerfectGas(const dictionary& dict);
@ -119,9 +113,6 @@ public:
//- Construct and return a clone
inline autoPtr<incompressiblePerfectGas> clone() const;
// Selector from Istream
inline static autoPtr<incompressiblePerfectGas> New(Istream& is);
// Selector from dictionary
inline static autoPtr<incompressiblePerfectGas> New
(

25
src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
View File

@ -39,17 +39,6 @@ inline Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
{}
template<class Specie>
inline Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
(
const incompressiblePerfectGas& ipg
)
:
Specie(ipg),
pRef_(ipg.pRef_)
{}
template<class Specie>
inline Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
(
@ -73,20 +62,6 @@ Foam::incompressiblePerfectGas<Specie>::clone() const
}
template<class Specie>
inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie>>
Foam::incompressiblePerfectGas<Specie>::New
(
Istream& is
)
{
return autoPtr<incompressiblePerfectGas<Specie>>
(
new incompressiblePerfectGas<Specie>(is)
);
}
template<class Specie>
inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie>>
Foam::incompressiblePerfectGas<Specie>::New

17
src/thermophysicalModels/specie/equationOfState/linear/linear.C
View File

@ -28,17 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::linear<Specie>::linear(Istream& is)
:
Specie(is),
psi_(readScalar(is)),
rho0_(readScalar(is))
{
is.check("linear<Specie>::linear(Istream& is)");
}
template<class Specie>
Foam::linear<Specie>::linear(const dictionary& dict)
:
@ -68,11 +57,7 @@ void Foam::linear<Specie>::write(Ostream& os) const
template<class Specie>
Foam::Ostream& Foam::operator<<(Ostream& os, const linear<Specie>& pf)
{
os << static_cast<const Specie&>(pf)
<< token::SPACE << pf.psi_
<< token::SPACE << pf.rho0_;
os.check("Ostream& operator<<(Ostream&, const linear<Specie>&)");
pf.write(os);
return os;
}

6
src/thermophysicalModels/specie/equationOfState/linear/linear.H
View File

@ -110,9 +110,6 @@ public:
const scalar rho0
);
//- Construct from Istream
linear(Istream&);
//- Construct from dictionary
linear(const dictionary& dict);
@ -122,9 +119,6 @@ public:
//- Construct and return a clone
inline autoPtr<linear> clone() const;
// Selector from Istream
inline static autoPtr<linear> New(Istream& is);
// Selector from dictionary
inline static autoPtr<linear> New(const dictionary& dict);

8
src/thermophysicalModels/specie/equationOfState/linear/linearI.H
View File

@ -64,14 +64,6 @@ Foam::linear<Specie>::clone() const
}
template<class Specie>
inline Foam::autoPtr<Foam::linear<Specie>>
Foam::linear<Specie>::New(Istream& is)
{
return autoPtr<linear<Specie>>(new linear<Specie>(is));
}
template<class Specie>
inline Foam::autoPtr<Foam::linear<Specie>>
Foam::linear<Specie>::New

17
src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
View File

@ -28,17 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::perfectFluid<Specie>::perfectFluid(Istream& is)
:
Specie(is),
R_(readScalar(is)),
rho0_(readScalar(is))
{
is.check("perfectFluid<Specie>::perfectFluid(Istream& is)");
}
template<class Specie>
Foam::perfectFluid<Specie>::perfectFluid(const dictionary& dict)
:
@ -68,11 +57,7 @@ void Foam::perfectFluid<Specie>::write(Ostream& os) const
template<class Specie>
Foam::Ostream& Foam::operator<<(Ostream& os, const perfectFluid<Specie>& pf)
{
os << static_cast<const Specie&>(pf)
<< token::SPACE << pf.R_
<< token::SPACE << pf.rho0_;
os.check("Ostream& operator<<(Ostream&, const perfectFluid<Specie>&)");
pf.write(os);
return os;
}

6
src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
View File

@ -106,9 +106,6 @@ public:
const scalar rho0
);
//- Construct from Istream
perfectFluid(Istream&);
//- Construct from dictionary
perfectFluid(const dictionary& dict);
@ -118,9 +115,6 @@ public:
//- Construct and return a clone
inline autoPtr<perfectFluid> clone() const;
// Selector from Istream
inline static autoPtr<perfectFluid> New(Istream& is);
// Selector from dictionary
inline static autoPtr<perfectFluid> New(const dictionary& dict);

8
src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
View File

@ -65,14 +65,6 @@ Foam::perfectFluid<Specie>::clone() const
}
template<class Specie>
inline Foam::autoPtr<Foam::perfectFluid<Specie>>
Foam::perfectFluid<Specie>::New(Istream& is)
{
return autoPtr<perfectFluid<Specie>>(new perfectFluid<Specie>(is));
}
template<class Specie>
inline Foam::autoPtr<Foam::perfectFluid<Specie>>
Foam::perfectFluid<Specie>::New

13
src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
View File

@ -28,15 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::perfectGas<Specie>::perfectGas(Istream& is)
:
Specie(is)
{
is.check("perfectGas<Specie>::perfectGas(Istream& is)");
}
template<class Specie>
Foam::perfectGas<Specie>::perfectGas(const dictionary& dict)
:
@ -58,9 +49,7 @@ void Foam::perfectGas<Specie>::write(Ostream& os) const
template<class Specie>
Foam::Ostream& Foam::operator<<(Ostream& os, const perfectGas<Specie>& pg)
{
os << static_cast<const Specie&>(pg);
os.check("Ostream& operator<<(Ostream& os, const perfectGas<Specie>& st)");
pg.write(os);
return os;
}

6
src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
View File

@ -93,9 +93,6 @@ public:
//- Construct from components
inline perfectGas(const Specie& sp);
//- Construct from Istream
perfectGas(Istream&);
//- Construct from dictionary
perfectGas(const dictionary& dict);
@ -105,9 +102,6 @@ public:
//- Construct and return a clone
inline autoPtr<perfectGas> clone() const;
// Selector from Istream
inline static autoPtr<perfectGas> New(Istream& is);
// Selector from dictionary
inline static autoPtr<perfectGas> New(const dictionary& dict);

8
src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
View File

@ -55,14 +55,6 @@ Foam::perfectGas<Specie>::clone() const
}
template<class Specie>
inline Foam::autoPtr<Foam::perfectGas<Specie>>
Foam::perfectGas<Specie>::New(Istream& is)
{
return autoPtr<perfectGas<Specie>>(new perfectGas<Specie>(is));
}
template<class Specie>
inline Foam::autoPtr<Foam::perfectGas<Specie>> Foam::perfectGas<Specie>::New
(

17
src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,16 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::rhoConst<Specie>::rhoConst(Istream& is)
:
Specie(is),
rho_(readScalar(is))
{
is.check("rhoConst<Specie>::rhoConst(Istream& is)");
}
template<class Specie>
Foam::rhoConst<Specie>::rhoConst(const dictionary& dict)
:
@ -65,10 +55,7 @@ void Foam::rhoConst<Specie>::write(Ostream& os) const
template<class Specie>
Foam::Ostream& Foam::operator<<(Ostream& os, const rhoConst<Specie>& ico)
{
os << static_cast<const Specie&>(ico)
<< token::SPACE << ico.rho_;
os.check("Ostream& operator<<(Ostream& os, const rhoConst<Specie>& ico)");
ico.write(os);
return os;
}

6
src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
View File

@ -98,9 +98,6 @@ public:
//- Construct from components
inline rhoConst(const Specie& sp, const scalar rho);
//- Construct from Istream
rhoConst(Istream&);
//- Construct from dictionary
rhoConst(const dictionary& dict);
@ -110,9 +107,6 @@ public:
//- Construct and return a clone
inline autoPtr<rhoConst> clone() const;
// Selector from Istream
inline static autoPtr<rhoConst> New(Istream& is);
// Member functions

8
src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
View File

@ -61,14 +61,6 @@ Foam::rhoConst<Specie>::clone() const
}
template<class Specie>
inline Foam::autoPtr<Foam::rhoConst<Specie>>
Foam::rhoConst<Specie>::New(Istream& is)
{
return autoPtr<rhoConst<Specie>>(new rhoConst<Specie>(is));
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Specie>

21
src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,25 +45,6 @@ IrreversibleReaction
{}
template
<
template<class> class ReactionType,
class ReactionThermo,
class ReactionRate
>
Foam::IrreversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
IrreversibleReaction
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
)
:
ReactionType<ReactionThermo>(species, thermoDatabase, is),
k_(species, is)
{}
template
<
template<class> class ReactionType,

10
src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -103,14 +103,6 @@ public:
const speciesTable& species
);
//- Construct from Istream
IrreversibleReaction
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
);
//- Construct from dictionary
IrreversibleReaction
(

28
src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -52,32 +52,6 @@ NonEquilibriumReversibleReaction
{}
template
<
template<class> class ReactionType,
class ReactionThermo,
class ReactionRate
>
Foam::NonEquilibriumReversibleReaction
<
ReactionType,
ReactionThermo,
ReactionRate
>::
NonEquilibriumReversibleReaction
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
)
:
ReactionType<ReactionThermo>(species, thermoDatabase, is),
fk_(species, is),
rk_(species, is)
{}
template
<
template<class> class ReactionType,

10
src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -97,14 +97,6 @@ public:
const speciesTable& species
);
//- Construct from Istream
NonEquilibriumReversibleReaction
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
);
//- Construct from dictionary
NonEquilibriumReversibleReaction
(

61
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
View File

@ -320,23 +320,6 @@ void Foam::Reaction<ReactionThermo>::setLRhs
}
template<class ReactionThermo>
Foam::Reaction<ReactionThermo>::Reaction
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
)
:
ReactionThermo::thermoType(*thermoDatabase[species[0]]),
name_("un-named-reaction" + Foam::name(getNewReactionID())),
species_(species)
{
setLRhs(is, species, lhs_, rhs_);
setThermo(thermoDatabase);
}
template<class ReactionThermo>
Foam::Reaction<ReactionThermo>::Reaction
(
@ -362,50 +345,6 @@ Foam::Reaction<ReactionThermo>::Reaction
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
template<class ReactionThermo>
Foam::autoPtr<Foam::Reaction<ReactionThermo>>
Foam::Reaction<ReactionThermo>::New
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
)
{
if (is.eof())
{
FatalIOErrorInFunction
(
is
) << "Reaction type not specified" << nl << nl
<< "Valid Reaction types are :" << nl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
const word reactionTypeName(is);
typename IstreamConstructorTable::iterator cstrIter
= IstreamConstructorTablePtr_->find(reactionTypeName);
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalIOErrorInFunction
(
is
) << "Unknown reaction type "
<< reactionTypeName << nl << nl
<< "Valid reaction types are :" << nl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
return autoPtr<Reaction<ReactionThermo>>
(
cstrIter()(species, thermoDatabase, is)
);
}
template<class ReactionThermo>
Foam::autoPtr<Foam::Reaction<ReactionThermo>>
Foam::Reaction<ReactionThermo>::New

65
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -164,19 +164,6 @@ public:
// Declare run-time constructor selection tables
declareRunTimeSelectionTable
(
autoPtr,
Reaction,
Istream,
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
),
(species, thermoDatabase, is)
);
declareRunTimeSelectionTable
(
autoPtr,
@ -191,36 +178,6 @@ public:
);
// Public classes
//- Class used for the read-construction of PtrLists of reaction
class iNew
{
const speciesTable& species_;
const HashPtrTable<ReactionThermo>& thermoDatabase_;
public:
iNew
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase
)
:
species_(species),
thermoDatabase_(thermoDatabase)
{}
autoPtr<Reaction> operator()(Istream& is) const
{
return autoPtr<Reaction>
(
Reaction::New(species_, thermoDatabase_, is)
);
}
};
// Constructors
//- Construct from components
@ -235,14 +192,6 @@ public:
//- Construct as copy given new speciesTable
Reaction(const Reaction<ReactionThermo>&, const speciesTable& species);
//- Construct from Istream
Reaction
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
);
//- Construct from dictionary
Reaction
(
@ -275,14 +224,6 @@ public:
// Selectors
//- Return a pointer to new patchField created on freestore from input
static autoPtr<Reaction<ReactionThermo>> New
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
);
//- Return a pointer to new patchField created on freestore from dict
static autoPtr<Reaction<ReactionThermo>> New
(
@ -312,10 +253,10 @@ public:
virtual const List<specieCoeffs>& grhs() const;
virtual const List<specieCoeffs>& glhs() const;
// - Access to specie list
//- Access to specie list
const speciesTable& species() const;
// - Access to gas specie list
//- Access to gas specie list
virtual const speciesTable& gasSpecies() const;
//- Construct the left- and right-hand-side reaction coefficients

21
src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -60,25 +60,6 @@ Foam::ReactionList<ThermoType>::ReactionList
}
template<class ThermoType>
Foam::ReactionList<ThermoType>::ReactionList
(
const speciesTable& species,
const HashPtrTable<ThermoType>& thermoDb,
const fileName& fName
)
:
SLPtrList<Reaction<ThermoType>>
(
dictionary(IFstream(fName)()).lookup("reactions"),
Reaction<ThermoType>::iNew(species, thermoDb)
),
species_(species),
thermoDb_(thermoDb),
dict_(dictionary::null)
{}
template<class ThermoType>
Foam::ReactionList<ThermoType>::ReactionList(const ReactionList& reactions)
:

10
src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -93,14 +93,6 @@ public:
const dictionary& dict
);
//- Construct from file using (Istream)
ReactionList
(
const speciesTable& species,
const HashPtrTable<ThermoType>& thermoDatabase,
const fileName& fName
);
//- Construct copy
ReactionList(const ReactionList<ThermoType>& reactions);

21
src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,25 +45,6 @@ ReversibleReaction
{}
template
<
template<class> class ReactionType,
class ReactionThermo,
class ReactionRate
>
Foam::ReversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
ReversibleReaction
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
)
:
ReactionType<ReactionThermo>(species, thermoDatabase, is),
k_(species, is)
{}
template
<
template<class> class ReactionType,

10
src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -103,14 +103,6 @@ public:
const speciesTable& species
);
//- Construct from Istream
ReversibleReaction
(
const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase,
Istream& is
);
//- Construct from dictionary
ReversibleReaction
(

9
src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,13 +77,6 @@ public:
const scalar Ta
);
//- Construct from Istream
inline ArrheniusReactionRate
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline ArrheniusReactionRate
(

16
src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,20 +38,6 @@ inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
{}
inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
(
const speciesTable&,
Istream& is
)
:
A_(readScalar(is.readBegin("ArrheniusReactionRate(Istream&)"))),
beta_(readScalar(is)),
Ta_(readScalar(is))
{
is.readEnd("ArrheniusReactionRate(Istream&)");
}
inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
(
const speciesTable&,

9
src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -84,13 +84,6 @@ public:
const thirdBodyEfficiencies& tbes
);
//- Construct from Istream
inline ChemicallyActivatedReactionRate
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline ChemicallyActivatedReactionRate
(

22
src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,26 +45,6 @@ inline Foam::ChemicallyActivatedReactionRate
{}
template<class ReactionRate, class ChemicallyActivationFunction>
inline Foam::ChemicallyActivatedReactionRate
<
ReactionRate,
ChemicallyActivationFunction
>::ChemicallyActivatedReactionRate
(
const speciesTable& species,
Istream& is
)
:
k0_(species, is.readBegin("ChemicallyActivatedReactionRate(Istream&)")),
kInf_(species, is),
F_(is),
thirdBodyEfficiencies_(species, is)
{
is.readEnd("ChemicallyActivatedReactionRate(Istream&)");
}
template<class ReactionRate, class ChemicallyActivationFunction>
inline Foam::ChemicallyActivatedReactionRate
<

9
src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -83,13 +83,6 @@ public:
const thirdBodyEfficiencies& tbes
);
//- Construct from Istream
inline FallOffReactionRate
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline FallOffReactionRate
(

19
src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -42,23 +42,6 @@ FallOffReactionRate
{}
template<class ReactionRate, class FallOffFunction>
inline Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::
FallOffReactionRate
(
const speciesTable& species,
Istream& is
)
:
k0_(species, is.readBegin("FallOffReactionRate(Istream&)")),
kInf_(species, is),
F_(is),
thirdBodyEfficiencies_(species, is)
{
is.readEnd("FallOffReactionRate(Istream&)");
}
template<class ReactionRate, class FallOffFunction>
inline Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::
FallOffReactionRate

9
src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -80,13 +80,6 @@ public:
const FixedList<scalar, nb_> b
);
//- Construct from Istream
inline JanevReactionRate
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline JanevReactionRate
(

17
src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,21 +40,6 @@ inline Foam::JanevReactionRate::JanevReactionRate
{}
inline Foam::JanevReactionRate::JanevReactionRate
(
const speciesTable&,
Istream& is
)
:
A_(readScalar(is.readBegin("JanevReactionRate(Istream&)"))),
beta_(readScalar(is)),
Ta_(readScalar(is)),
b_(is)
{
is.readEnd("JanevReactionRate(Istream&)");
}
inline Foam::JanevReactionRate::JanevReactionRate
(
const speciesTable&,

9
src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -79,13 +79,6 @@ public:
const scalar C
);
//- Construct from Istream
inline LandauTellerReactionRate
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline LandauTellerReactionRate
(

18
src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -42,22 +42,6 @@ inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
{}
inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
(
const speciesTable&,
Istream& is
)
:
A_(readScalar(is.readBegin("LandauTellerReactionRate(Istream&)"))),
beta_(readScalar(is)),
Ta_(readScalar(is)),
B_(readScalar(is)),
C_(readScalar(is))
{
is.readEnd("LandauTellerReactionRate(Istream&)");
}
inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
(
const speciesTable&,

9
src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -81,13 +81,6 @@ public:
const label no
);
//- Construct from Istream
inline LangmuirHinshelwoodReactionRate
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline LangmuirHinshelwoodReactionRate
(

23
src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -49,27 +49,6 @@ inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
}
inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
(
const speciesTable& st,
Istream& is
)
:
co_(st["CO"]),
c3h6_(st["C3H6"]),
no_(st["NO"])
{
is.readBegin("LangmuirHinshelwoodReactionRate(Istream&)");
for (int i=0; i<n_; i++)
{
is >> A_[i] >> Ta_[i];
}
is.readEnd("LangmuirHinshelwoodReactionRate(Istream&)");
}
inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
(
const speciesTable& st,

5
src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,9 +62,6 @@ public:
//- Construct null
inline LindemannFallOffFunction();
//- Construct from Istream
inline LindemannFallOffFunction(Istream&);
//- Construct from dictionary
inline LindemannFallOffFunction(const dictionary& dict);

6
src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,10 +29,6 @@ inline Foam::LindemannFallOffFunction::LindemannFallOffFunction()
{}
inline Foam::LindemannFallOffFunction::LindemannFallOffFunction(Istream&)
{}
inline Foam::LindemannFallOffFunction::LindemannFallOffFunction
(
const dictionary& dict

5
src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,9 +73,6 @@ public:
const scalar e
);
//- Construct from Istream
inline SRIFallOffFunction(Istream&);
//- Construct from dictionary
inline SRIFallOffFunction(const dictionary& dict);

14
src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -42,18 +42,6 @@ inline Foam::SRIFallOffFunction::SRIFallOffFunction
{}
inline Foam::SRIFallOffFunction::SRIFallOffFunction(Istream& is)
:
a_(readScalar(is.readBegin("SRIFallOffFunction(Istream&)"))),
b_(readScalar(is)),
c_(readScalar(is)),
d_(readScalar(is)),
e_(readScalar(is))
{
is.readEnd("SRIFallOffFunction(Istream&)");
}
inline Foam::SRIFallOffFunction::SRIFallOffFunction(const dictionary& dict)
:
a_(readScalar(dict.lookup("a"))),

5
src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,9 +73,6 @@ public:
const scalar Tss
);
//- Construct from Istream
inline TroeFallOffFunction(Istream&);
//- Construct from dictionary
inline TroeFallOffFunction(const dictionary& dict);

13
src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,17 +40,6 @@ inline Foam::TroeFallOffFunction::TroeFallOffFunction
{}
inline Foam::TroeFallOffFunction::TroeFallOffFunction(Istream& is)
:
alpha_(readScalar(is.readBegin("TroeFallOffFunction(Istream&)"))),
Tsss_(readScalar(is)),
Ts_(readScalar(is)),
Tss_(readScalar(is))
{
is.readEnd("TroeFallOffFunction(Istream&)");
}
inline Foam::TroeFallOffFunction::TroeFallOffFunction(const dictionary& dict)
:
alpha_(readScalar(dict.lookup("alpha"))),

4
src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -64,7 +64,7 @@ public:
inline infiniteReactionRate
();
//- Construct from Istream
//- Construct from dictionary
inline infiniteReactionRate
(
const speciesTable& species,

9
src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -80,13 +80,6 @@ public:
const FixedList<scalar, nCoeff_> coeffs
);
//- Construct from Istream
inline powerSeriesReactionRate
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline powerSeriesReactionRate
(

17
src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,21 +40,6 @@ inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
{}
inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
(
const speciesTable&,
Istream& is
)
:
A_(readScalar(is.readBegin("powerSeriesReactionRate(Istream&)"))),
beta_(readScalar(is)),
Ta_(readScalar(is)),
coeffs_(is)
{
is.readEnd("powerSeriesReactionRate(Istream&)");
}
inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
(
const speciesTable&,

9
src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -76,13 +76,6 @@ public:
const thirdBodyEfficiencies& tbes
);
//- Construct from Istream
inline thirdBodyArrheniusReactionRate
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline thirdBodyArrheniusReactionRate
(

19
src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,23 +38,6 @@ inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
{}
inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
(
const speciesTable& species,
Istream& is
)
:
ArrheniusReactionRate
(
species,
is.readBegin("thirdBodyArrheniusReactionRate(Istream&)")
),
thirdBodyEfficiencies_(species, is)
{
is.readEnd("thirdBodyArrheniusReactionRate(Istream&)");
}
inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
(
const speciesTable& species,

9
src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,13 +73,6 @@ public:
const scalarList& efficiencies
);
//- Construct from Istream
inline thirdBodyEfficiencies
(
const speciesTable& species,
Istream& is
);
//- Construct from dictionary
inline thirdBodyEfficiencies
(

58
src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,62 +46,6 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
}
inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
(
const speciesTable& species,
Istream& is
)
:
scalarList(species.size()),
species_(species)
{
is.readBeginList
(
"thirdBodyEfficiencies::thirdBodyEfficiencies"
"(const speciesTable& species, Istream& is)"
);
scalar defaultEff = readScalar(is);
scalarList::operator=(defaultEff);
token t;
while ((is >> t) && !t.isPunctuation())
{
if (t.isWord())
{
operator[](species[t.wordToken()]) = readScalar(is);
}
else
{
FatalIOErrorInFunction
(
is
) << "expected <word>, found " << t.info()
<< exit(FatalIOError);
}
}
if (t.pToken() != token::END_LIST)
{
FatalIOErrorInFunction
(
is
) << "expected ')', found " << t.info()
<< exit(FatalIOError);
}
if (size() != species_.size())
{
FatalIOErrorInFunction
(
is
) << "number of efficiencies = " << size()
<< " is not equal to the number of species " << species_.size()
<< exit(FatalIOError);
}
}
inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
(
const speciesTable& species,

11
src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,13 +73,6 @@ namespace Foam
); \
\
addToRunTimeSelectionTable \
( \
Reaction##Thermo, \
ReactionType##Thermo##ReactionRate, \
Istream \
); \
\
addToRunTimeSelectionTable \
( \
Reaction##Thermo, \
ReactionType##Thermo##ReactionRate, \
@ -121,7 +114,7 @@ namespace Foam
makeReaction(Thermo, NonEquilibriumReversibleReaction, ReactionRate)
#define makePressureDependentReactions(Thermo, ReactionRate, FallOffFunction) \
#define makePressureDependentReactions(Thermo, ReactionRate, FallOffFunction) \
\
makePressureDependentReaction \
( \

3
src/thermophysicalModels/specie/reaction/reactions/makeReactions.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,7 +46,6 @@ License
#define makeReactions(Thermo, Reaction) \
\
defineTemplateTypeNameAndDebug(Reaction, 0); \
defineTemplateRunTimeSelectionTable(Reaction, Istream); \
defineTemplateRunTimeSelectionTable(Reaction, dictionary); \
\
makeIRNReactions(Thermo, ArrheniusReactionRate) \

16
src/thermophysicalModels/specie/specie/specie.C
View File

@ -24,7 +24,6 @@ License
\*---------------------------------------------------------------------------*/
#include "specie.H"
#include "IOstreams.H"
#include "constants.H"
/* * * * * * * * * * * * * * * public constants * * * * * * * * * * * * * * */
@ -37,16 +36,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::specie::specie(Istream& is)
:
name_(is),
Y_(readScalar(is)),
molWeight_(readScalar(is))
{
is.check("specie::specie(Istream& is)");
}
Foam::specie::specie(const dictionary& dict)
:
name_(dict.dictName()),
@ -73,10 +62,7 @@ void Foam::specie::write(Ostream& os) const
Foam::Ostream& Foam::operator<<(Ostream& os, const specie& st)
{
os << st.name_ << tab
<< st.Y_ << tab
<< st.molWeight_;
st.write(os);
os.check("Ostream& operator<<(Ostream& os, const specie& st)");
return os;
}

6
src/thermophysicalModels/specie/specie/specie.H
View File

@ -96,15 +96,9 @@ public:
const scalar molWeight
);
//- Construct as copy
inline specie(const specie&);
//- Construct as named copy
inline specie(const word& name, const specie&);
//- Construct from Istream
specie(Istream&);
//- Construct from dictionary
specie(const dictionary& dict);

8
src/thermophysicalModels/specie/specie/specieI.H
View File

@ -58,14 +58,6 @@ inline specie::specie
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
inline specie::specie(const specie& st)
:
name_(st.name_),
Y_(st.Y_),
molWeight_(st.molWeight_)
{}
inline specie::specie(const word& name, const specie& st)
:
name_(name),

16
src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
View File

@ -28,17 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
Foam::eConstThermo<EquationOfState>::eConstThermo(Istream& is)
:
EquationOfState(is),
Cv_(readScalar(is)),
Hf_(readScalar(is))
{
is.check("eConstThermo<EquationOfState>::eConstThermo(Istream&)");
}
template<class EquationOfState>
Foam::eConstThermo<EquationOfState>::eConstThermo(const dictionary& dict)
:
@ -71,10 +60,7 @@ Foam::Ostream& Foam::operator<<
const eConstThermo<EquationOfState>& ct
)
{
os << static_cast<const EquationOfState&>(ct) << tab
<< ct.Cv_ << tab << ct.Hf_;
os.check("Ostream& operator<<(Ostream&, const eConstThermo&)");
ct.write(os);
return os;
}

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

@ -112,9 +112,6 @@ public:
// Constructors
//- Construct from Istream
eConstThermo(Istream&);
//- Construct from dictionary
eConstThermo(const dictionary& dict);
@ -124,9 +121,6 @@ public:
//- Construct and return a clone
inline autoPtr<eConstThermo> clone() const;
// Selector from Istream
inline static autoPtr<eConstThermo> New(Istream& is);
// Selector from dictionary
inline static autoPtr<eConstThermo> New(const dictionary& dict);

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

@ -65,17 +65,6 @@ Foam::eConstThermo<EquationOfState>::clone() const
}
template<class EquationOfState>
inline Foam::autoPtr<Foam::eConstThermo<EquationOfState>>
Foam::eConstThermo<EquationOfState>::New(Istream& is)
{
return autoPtr<eConstThermo<EquationOfState>>
(
new eConstThermo<EquationOfState>(is)
);
}
template<class EquationOfState>
inline Foam::autoPtr<Foam::eConstThermo<EquationOfState>>
Foam::eConstThermo<EquationOfState>::New(const dictionary& dict)

16
src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
View File

@ -28,17 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
Foam::hConstThermo<EquationOfState>::hConstThermo(Istream& is)
:
EquationOfState(is),
Cp_(readScalar(is)),
Hf_(readScalar(is))
{
is.check("hConstThermo::hConstThermo(Istream& is)");
}
template<class EquationOfState>
Foam::hConstThermo<EquationOfState>::hConstThermo(const dictionary& dict)
:
@ -71,10 +60,7 @@ Foam::Ostream& Foam::operator<<
const hConstThermo<EquationOfState>& ct
)
{
os << static_cast<const EquationOfState&>(ct) << tab
<< ct.Cp_ << tab << ct.Hf_;
os.check("Ostream& operator<<(Ostream& os, const hConstThermo& ct)");
ct.write(os);
return os;
}

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

@ -105,9 +105,6 @@ public:
// Constructors
//- Construct from Istream
hConstThermo(Istream&);
//- Construct from dictionary
hConstThermo(const dictionary& dict);
@ -117,9 +114,6 @@ public:
//- Construct and return a clone
inline autoPtr<hConstThermo> clone() const;
//- Selector from Istream
inline static autoPtr<hConstThermo> New(Istream& is);
//- Selector from dictionary
inline static autoPtr<hConstThermo> New(const dictionary& dict);

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

@ -65,17 +65,6 @@ Foam::hConstThermo<EquationOfState>::clone() const
}
template<class EquationOfState>
inline Foam::autoPtr<Foam::hConstThermo<EquationOfState>>
Foam::hConstThermo<EquationOfState>::New(Istream& is)
{
return autoPtr<hConstThermo<EquationOfState>>
(
new hConstThermo<EquationOfState>(is)
);
}
template<class EquationOfState>
inline Foam::autoPtr<Foam::hConstThermo<EquationOfState>>
Foam::hConstThermo<EquationOfState>::New(const dictionary& dict)

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

@ -28,30 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize>
Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
(
Istream& is
)
:
EquationOfState(is),
Hf_(readScalar(is)),
Sf_(readScalar(is)),
CpCoeffs_("CpCoeffs<" + Foam::name(PolySize) + '>', is),
hCoeffs_(),
sCoeffs_()
{
hCoeffs_ = CpCoeffs_.integral();
sCoeffs_ = CpCoeffs_.integralMinus1();
// Offset h poly so that it is relative to the enthalpy at Tstd
hCoeffs_[0] += Hf_ - hCoeffs_.value(Tstd);
// Offset s poly so that it is relative to the entropy at Tstd
sCoeffs_[0] += Sf_ - sCoeffs_.value(Tstd);
}
template<class EquationOfState, int PolySize>
Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
(
@ -113,21 +89,7 @@ Foam::Ostream& Foam::operator<<
const hPolynomialThermo<EquationOfState, PolySize>& pt
)
{
os << static_cast<const EquationOfState&>(pt) << tab
<< pt.Hf_ << tab
<< pt.Sf_ << tab
<< "CpCoeffs<" << Foam::name(PolySize) << '>' << tab
<< pt.CpCoeffs_/pt;
os.check
(
"operator<<"
"("
"Ostream&, "
"const hPolynomialThermo<EquationOfState, PolySize>&"
")"
);
pt.write(os);
return os;
}

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

@ -161,15 +161,9 @@ public:
// Constructors
//- Construct from Istream
hPolynomialThermo(Istream& is);
//- Construct from dictionary
hPolynomialThermo(const dictionary& dict);
//- Construct as copy
inline hPolynomialThermo(const hPolynomialThermo&);
//- Construct as a named copy
inline hPolynomialThermo(const word&, const hPolynomialThermo&);

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

@ -49,21 +49,6 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize>
inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
(
const hPolynomialThermo& pt
)
:
EquationOfState(pt),
Hf_(pt.Hf_),
Sf_(pt.Sf_),
CpCoeffs_(pt.CpCoeffs_),
hCoeffs_(pt.hCoeffs_),
sCoeffs_(pt.sCoeffs_)
{}
template<class EquationOfState, int PolySize>
inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
(

28
src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
View File

@ -28,18 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
Foam::hPowerThermo<EquationOfState>::hPowerThermo(Istream& is)
:
EquationOfState(is),
n0_(readScalar(is)),
Tref_(readScalar(is)),
Hf_(readScalar(is))
{
is.check("hPowerThermo::hPowerThermo(Istream& is)");
}
template<class EquationOfState>
Foam::hPowerThermo<EquationOfState>::hPowerThermo
(
@ -63,21 +51,7 @@ Foam::Ostream& Foam::operator<<
const hPowerThermo<EquationOfState>& et
)
{
os << static_cast<const EquationOfState&>(et) << nl
<< " " << et.c0_
<< tab << et.n0_
<< tab << et.Tref_
<< tab << et.Hf_;
os << nl << " ";
os << endl;
os.check
(
"operator<<(Ostream& os, const hPowerThermo<EquationOfState>& et)"
);
et.write(os);
return os;
}

Some files were not shown because too many files have changed in this diff Show More