Commit 3e4d253c authored by Henry Weller's avatar Henry Weller
Browse files

liquidProperties: Removed unused construction from Istream

parent c52e4b58
......@@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(Ar, 0);
addToRunTimeSelectionTable(liquidProperties, Ar,);
addToRunTimeSelectionTable(liquidProperties, Ar, Istream);
addToRunTimeSelectionTable(liquidProperties, Ar, dictionary);
}
......@@ -120,25 +119,6 @@ Foam::Ar::Ar
{}
Foam::Ar::Ar(Istream& is)
:
liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
Cp_(is),
h_(is),
Cpg_(is),
B_(is),
mu_(is),
mug_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
Foam::Ar::Ar(const dictionary& dict)
:
liquidProperties(dict),
......@@ -158,23 +138,4 @@ Foam::Ar::Ar(const dictionary& dict)
{}
Foam::Ar::Ar(const Ar& liq)
:
liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
Cp_(liq.Cp_),
h_(liq.h_),
Cpg_(liq.Cpg_),
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}
// ************************************************************************* //
......@@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
Ar(Istream& is);
//- Construct from dictionary
Ar(const dictionary& dict);
//- Construct copy
Ar(const Ar& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
......
......@@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C10H22, 0);
addToRunTimeSelectionTable(liquidProperties, C10H22,);
addToRunTimeSelectionTable(liquidProperties, C10H22, Istream);
addToRunTimeSelectionTable(liquidProperties, C10H22, dictionary);
}
......@@ -128,25 +127,6 @@ Foam::C10H22::C10H22
{}
Foam::C10H22::C10H22(Istream& is)
:
liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
Cp_(is),
h_(is),
Cpg_(is),
B_(is),
mu_(is),
mug_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
Foam::C10H22::C10H22(const dictionary& dict)
:
liquidProperties(dict),
......@@ -166,23 +146,4 @@ Foam::C10H22::C10H22(const dictionary& dict)
{}
Foam::C10H22::C10H22(const C10H22& liq)
:
liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
Cp_(liq.Cp_),
h_(liq.h_),
Cpg_(liq.Cpg_),
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}
// ************************************************************************* //
......@@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C10H22(Istream& is);
//- Construct from dictionary
C10H22(const dictionary& dict);
//- Construct copy
C10H22(const C10H22& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
......
......@@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C12H26, 0);
addToRunTimeSelectionTable(liquidProperties, C12H26,);
addToRunTimeSelectionTable(liquidProperties, C12H26, Istream);
addToRunTimeSelectionTable(liquidProperties, C12H26, dictionary);
}
......@@ -120,25 +119,6 @@ Foam::C12H26::C12H26
{}
Foam::C12H26::C12H26(Istream& is)
:
liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
Cp_(is),
h_(is),
Cpg_(is),
B_(is),
mu_(is),
mug_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
Foam::C12H26::C12H26(const dictionary& dict)
:
liquidProperties(dict),
......@@ -158,23 +138,4 @@ Foam::C12H26::C12H26(const dictionary& dict)
{}
Foam::C12H26::C12H26(const C12H26& liq)
:
liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
Cp_(liq.Cp_),
h_(liq.h_),
Cpg_(liq.Cpg_),
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}
// ************************************************************************* //
......@@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C12H26(Istream& is);
//- Construct from dictionary
C12H26(const dictionary& dict);
//- Construct copy
C12H26(const C12H26& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
......
......@@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C13H28, 0);
addToRunTimeSelectionTable(liquidProperties, C13H28,);
addToRunTimeSelectionTable(liquidProperties, C13H28, Istream);
addToRunTimeSelectionTable(liquidProperties, C13H28, dictionary);
}
......@@ -128,25 +127,6 @@ Foam::C13H28::C13H28
{}
Foam::C13H28::C13H28(Istream& is)
:
liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
Cp_(is),
h_(is),
Cpg_(is),
B_(is),
mu_(is),
mug_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
Foam::C13H28::C13H28(const dictionary& dict)
:
liquidProperties(dict),
......@@ -166,23 +146,4 @@ Foam::C13H28::C13H28(const dictionary& dict)
{}
Foam::C13H28::C13H28(const C13H28& liq)
:
liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
Cp_(liq.Cp_),
h_(liq.h_),
Cpg_(liq.Cpg_),
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}
// ************************************************************************* //
......@@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C13H28(Istream& is);
//- Construct from dictionary
C13H28(const dictionary& dict);
//- Construct copy
C13H28(const C13H28& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
......
......@@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C14H30, 0);
addToRunTimeSelectionTable(liquidProperties, C14H30,);
addToRunTimeSelectionTable(liquidProperties, C14H30, Istream);
addToRunTimeSelectionTable(liquidProperties, C14H30, dictionary);
}
......@@ -128,25 +127,6 @@ Foam::C14H30::C14H30
{}
Foam::C14H30::C14H30(Istream& is)
:
liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
Cp_(is),
h_(is),
Cpg_(is),
B_(is),
mu_(is),
mug_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
Foam::C14H30::C14H30(const dictionary& dict)
:
liquidProperties(dict),
......@@ -166,23 +146,4 @@ Foam::C14H30::C14H30(const dictionary& dict)
{}
Foam::C14H30::C14H30(const C14H30& liq)
:
liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
Cp_(liq.Cp_),
h_(liq.h_),
Cpg_(liq.Cpg_),
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}
// ************************************************************************* //
......@@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C14H30(Istream& is);
//- Construct from dictionary
C14H30(const dictionary& dict);
//- Construct copy
C14H30(const C14H30& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
......
......@@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C16H34, 0);
addToRunTimeSelectionTable(liquidProperties, C16H34,);
addToRunTimeSelectionTable(liquidProperties, C16H34, Istream);
addToRunTimeSelectionTable(liquidProperties, C16H34, dictionary);
}
......@@ -128,25 +127,6 @@ Foam::C16H34::C16H34
{}
Foam::C16H34::C16H34(Istream& is)
:
liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
Cp_(is),
h_(is),
Cpg_(is),
B_(is),
mu_(is),
mug_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
Foam::C16H34::C16H34(const dictionary& dict)
:
liquidProperties(dict),
......@@ -166,23 +146,4 @@ Foam::C16H34::C16H34(const dictionary& dict)
{}
Foam::C16H34::C16H34(const C16H34& liq)
:
liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
Cp_(liq.Cp_),
h_(liq.h_),
Cpg_(liq.Cpg_),
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}
// ************************************************************************* //
......@@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C16H34(Istream& is);
//- Construct from dictionary
C16H34(const dictionary& dict);
//- Construct copy
C16H34(const C16H34& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
......
......@@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C2H5OH, 0);
addToRunTimeSelectionTable(liquidProperties, C2H5OH,);
addToRunTimeSelectionTable(liquidProperties, C2H5OH, Istream);
addToRunTimeSelectionTable(liquidProperties, C2H5OH, dictionary);
}
......@@ -128,25 +127,6 @@ Foam::C2H5OH::C2H5OH
{}
Foam::C2H5OH::C2H5OH(Istream& is)
:
liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
Cp_(is),
h_(is),
Cpg_(is),
B_(is),
mu_(is),
mug_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
Foam::C2H5OH::C2H5OH(const dictionary& dict)
:
liquidProperties(dict),
......@@ -166,23 +146,4 @@ Foam::C2H5OH::C2H5OH(const dictionary& dict)
{}
Foam::C2H5OH::C2H5OH(const C2H5OH& liq)
:
liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
Cp_(liq.Cp_),
h_(liq.h_),
Cpg_(liq.Cpg_),
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}
// ************************************************************************* //
......@@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C2H5OH(Istream& is);
//- Construct from dictionary
C2H5OH(const dictionary& dict);
//- Construct copy
C2H5OH(const C2H5OH& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
......
......@@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C2H6, 0);
addToRunTimeSelectionTable(liquidProperties, C2H6,);
addToRunTimeSelectionTable(liquidProperties, C2H6, Istream);
addToRunTimeSelectionTable(liquidProperties, C2H6, dictionary);
}
......@@ -119,25 +118,6 @@ Foam::C2H6::C2H6
{}
Foam::C2H6::C2H6(Istream& is)
:
liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
Cp_(is),
h_(is),
Cpg_(is),
B_(is),
mu_(is),
mug_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
Foam::C2H6::C2H6(const dictionary& dict)
:
liquidProperties(dict),
......@@ -157,23 +137,4 @@ Foam::C2H6::C2H6(const dictionary& dict)
{}
Foam::C2H6::C2H6(const C2H6& liq)
:
liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
Cp_(liq.Cp_),
h_(liq.h_),
Cpg_(liq.Cpg_),
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}
// ************************************************************************* //
......@@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C2H6(Istream& is);
//- Construct from dictionary
C2H6(const dictionary& dict);
//- Construct copy
C2H6(const C2H6& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
......