Commit 72b705ed authored by Henry Weller's avatar Henry Weller
Browse files

thermophysicalModels: Removed unused and unmaintained Istream constructors

parent 3e4d253c
......@@ -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
......
......@@ -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
{
......
......@@ -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
......
......@@ -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
{
......
......@@ -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
......
......@@ -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
{
......
......@@ -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
......
......@@ -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);
......
......@@ -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
......
......@@ -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_;
......
......@@ -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
......
......@@ -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
(
......
......@@ -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
(
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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 \
( \