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

liquidProperties: Removed unused construction from Istream

Browse Source
This commit is contained in:
Henry Weller
2017-02-17 13:41:05 +00:00
parent abc50e214c
commit 565576b13c
62 changed files with 8 additions and 1404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
View File

@ -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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
View File

@ -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
{

39
src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
View File

@ -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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
View File

@ -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
{

39
src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
View File

@ -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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
View File

@ -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
{

39
src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
View File

@ -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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
View File

@ -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
{

39
src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
View File

@ -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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
View File

@ -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
{

39
src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
View File

@ -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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
View File

@ -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
{

39
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
View File

@ -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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
View File

@ -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
{

39
src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
View File

@ -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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
View File

@ -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
{

38
src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C2H6O, 0);
addToRunTimeSelectionTable(liquidProperties, C2H6O,);
addToRunTimeSelectionTable(liquidProperties, C2H6O, Istream);
addToRunTimeSelectionTable(liquidProperties, C2H6O, dictionary);
}
@ -128,24 +127,6 @@ Foam::C2H6O::C2H6O
{}
Foam::C2H6O::C2H6O(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::C2H6O::C2H6O(const dictionary& dict)
:
@ -166,23 +147,4 @@ Foam::C2H6O::C2H6O(const dictionary& dict)
{}
Foam::C2H6O::C2H6O(const C2H6O& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C2H6O(Istream& is);
//- Construct from dictionary
C2H6O(const dictionary& dict);
//- Construct copy
C2H6O(const C2H6O& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C3H6O, 0);
addToRunTimeSelectionTable(liquidProperties, C3H6O,);
addToRunTimeSelectionTable(liquidProperties, C3H6O, Istream);
addToRunTimeSelectionTable(liquidProperties, C3H6O, dictionary);
}
@ -128,25 +127,6 @@ Foam::C3H6O::C3H6O
{}
Foam::C3H6O::C3H6O(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::C3H6O::C3H6O(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::C3H6O::C3H6O(const dictionary& dict)
{}
Foam::C3H6O::C3H6O(const C3H6O& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C3H6O(Istream& is);
//- Construct from dictionary
C3H6O(const dictionary& dict);
//- Construct copy
C3H6O(const C3H6O& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C3H8, 0);
addToRunTimeSelectionTable(liquidProperties, C3H8,);
addToRunTimeSelectionTable(liquidProperties, C3H8, Istream);
addToRunTimeSelectionTable(liquidProperties, C3H8, dictionary);
}
@ -118,25 +117,6 @@ Foam::C3H8::C3H8
{}
Foam::C3H8::C3H8(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::C3H8::C3H8(const dictionary& dict)
:
liquidProperties(dict),
@ -156,23 +136,4 @@ Foam::C3H8::C3H8(const dictionary& dict)
{}
Foam::C3H8::C3H8(const C3H8& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C3H8(Istream& is);
//- Construct from dictionary
C3H8(const dictionary& dict);
//- Construct copy
C3H8(const C3H8& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C4H10O, 0);
addToRunTimeSelectionTable(liquidProperties, C4H10O,);
addToRunTimeSelectionTable(liquidProperties, C4H10O, Istream);
addToRunTimeSelectionTable(liquidProperties, C4H10O, dictionary);
}
@ -128,25 +127,6 @@ Foam::C4H10O::C4H10O
{}
Foam::C4H10O::C4H10O(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::C4H10O::C4H10O(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::C4H10O::C4H10O(const dictionary& dict)
{}
Foam::C4H10O::C4H10O(const C4H10O& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C4H10O(Istream& is);
//- Construct from dictionary
C4H10O(const dictionary& dict);
//- Construct copy
C4H10O(const C4H10O& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C6H14, 0);
addToRunTimeSelectionTable(liquidProperties, C6H14,);
addToRunTimeSelectionTable(liquidProperties, C6H14, Istream);
addToRunTimeSelectionTable(liquidProperties, C6H14, dictionary);
}
@ -128,25 +127,6 @@ Foam::C6H14::C6H14
{}
Foam::C6H14::C6H14(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::C6H14::C6H14(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::C6H14::C6H14(const dictionary& dict)
{}
Foam::C6H14::C6H14(const C6H14& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C6H14(Istream& is);
//- Construct from dictionary
C6H14(const dictionary& dict);
//- Construct copy
C6H14(const C6H14& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C6H6, 0);
addToRunTimeSelectionTable(liquidProperties, C6H6,);
addToRunTimeSelectionTable(liquidProperties, C6H6, Istream);
addToRunTimeSelectionTable(liquidProperties, C6H6, dictionary);
}
@ -128,25 +127,6 @@ Foam::C6H6::C6H6
{}
Foam::C6H6::C6H6(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::C6H6::C6H6(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::C6H6::C6H6(const dictionary& dict)
{}
Foam::C6H6::C6H6(const C6H6& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C6H6(Istream& is);
//- Construct from dictionary
C6H6(const dictionary& dict);
//- Construct copy
C6H6(const C6H6& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C7H16, 0);
addToRunTimeSelectionTable(liquidProperties, C7H16,);
addToRunTimeSelectionTable(liquidProperties, C7H16, Istream);
addToRunTimeSelectionTable(liquidProperties, C7H16, dictionary);
}
@ -127,25 +126,6 @@ Foam::C7H16::C7H16
{}
Foam::C7H16::C7H16(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::C7H16::C7H16(const dictionary& dict)
:
liquidProperties(dict),
@ -165,23 +145,4 @@ Foam::C7H16::C7H16(const dictionary& dict)
{}
Foam::C7H16::C7H16(const C7H16& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C7H16(Istream& is);
//- Construct from dictionary
C7H16(const dictionary& dict);
//- Construct copy
C7H16(const C7H16& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C7H8, 0);
addToRunTimeSelectionTable(liquidProperties, C7H8,);
addToRunTimeSelectionTable(liquidProperties, C7H8, Istream);
addToRunTimeSelectionTable(liquidProperties, C7H8, dictionary);
}
@ -128,25 +127,6 @@ Foam::C7H8::C7H8
{}
Foam::C7H8::C7H8(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::C7H8::C7H8(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::C7H8::C7H8(const dictionary& dict)
{}
Foam::C7H8::C7H8(const C7H8& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C7H8(Istream& is);
//- Construct from dictionary
C7H8(const dictionary& dict);
//- Construct copy
C7H8(const C7H8& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C8H10, 0);
addToRunTimeSelectionTable(liquidProperties, C8H10,);
addToRunTimeSelectionTable(liquidProperties, C8H10, Istream);
addToRunTimeSelectionTable(liquidProperties, C8H10, dictionary);
}
@ -128,25 +127,6 @@ Foam::C8H10::C8H10
{}
Foam::C8H10::C8H10(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::C8H10::C8H10(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::C8H10::C8H10(const dictionary& dict)
{}
Foam::C8H10::C8H10(const C8H10& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
View File

@ -106,15 +106,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C8H10(Istream& is);
//- Construct from dictionary
C8H10(const dictionary& dict);
//- Construct copy
C8H10(const C8H10& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C8H18, 0);
addToRunTimeSelectionTable(liquidProperties, C8H18,);
addToRunTimeSelectionTable(liquidProperties, C8H18, Istream);
addToRunTimeSelectionTable(liquidProperties, C8H18, dictionary);
}
@ -128,25 +127,6 @@ Foam::C8H18::C8H18
{}
Foam::C8H18::C8H18(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::C8H18::C8H18(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::C8H18::C8H18(const dictionary& dict)
{}
Foam::C8H18::C8H18(const C8H18& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C8H18(Istream& is);
//- Construct from dictionary
C8H18(const dictionary& dict);
//- Construct copy
C8H18(const C8H18& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(C9H20, 0);
addToRunTimeSelectionTable(liquidProperties, C9H20,);
addToRunTimeSelectionTable(liquidProperties, C9H20, Istream);
addToRunTimeSelectionTable(liquidProperties, C9H20, dictionary);
}
@ -128,25 +127,6 @@ Foam::C9H20::C9H20
{}
Foam::C9H20::C9H20(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::C9H20::C9H20(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::C9H20::C9H20(const dictionary& dict)
{}
Foam::C9H20::C9H20(const C9H20& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
C9H20(Istream& is);
//- Construct from dictionary
C9H20(const dictionary& dict);
//- Construct copy
C9H20(const C9H20& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(CH3OH, 0);
addToRunTimeSelectionTable(liquidProperties, CH3OH,);
addToRunTimeSelectionTable(liquidProperties, CH3OH, Istream);
addToRunTimeSelectionTable(liquidProperties, CH3OH, dictionary);
}
@ -128,25 +127,6 @@ Foam::CH3OH::CH3OH
{}
Foam::CH3OH::CH3OH(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::CH3OH::CH3OH(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::CH3OH::CH3OH(const dictionary& dict)
{}
Foam::CH3OH::CH3OH(const CH3OH& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
CH3OH(Istream& is);
//- Construct from dictionary
CH3OH(const dictionary& dict);
//- Construct copy
CH3OH(const CH3OH& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(CH4N2O, 0);
addToRunTimeSelectionTable(liquidProperties, CH4N2O,);
addToRunTimeSelectionTable(liquidProperties, CH4N2O, Istream);
addToRunTimeSelectionTable(liquidProperties, CH4N2O, dictionary);
}
@ -112,25 +111,6 @@ Foam::CH4N2O::CH4N2O
{}
Foam::CH4N2O::CH4N2O(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::CH4N2O::CH4N2O(const dictionary& dict)
:
liquidProperties(dict),
@ -150,23 +130,4 @@ Foam::CH4N2O::CH4N2O(const dictionary& dict)
{}
Foam::CH4N2O::CH4N2O(const CH4N2O& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
CH4N2O(Istream& is);
//- Construct from dictionary
CH4N2O(const dictionary& dict);
//- Construct copy
CH4N2O(const CH4N2O& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

48
src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(H2O, 0);
addToRunTimeSelectionTable(liquidProperties, H2O,);
addToRunTimeSelectionTable(liquidProperties, H2O, Istream);
addToRunTimeSelectionTable(liquidProperties, H2O, dictionary);
}
@ -135,31 +134,17 @@ Foam::H2O::H2O
{}
Foam::H2O::H2O(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::H2O::H2O(const dictionary& dict)
:
H2O()
// :
{
// liquidProperties(dict),
// rho_(dict.subDict("rho")),
InfoInFunction;
if (dict.found("rho"))
{
rho_ = NSRDSfunc5(dict.subDict("rho"));
}
// pv_(dict.subDict("pv")),
// hl_(dict.subDict("hl")),
// Cp_(dict.subDict("Cp")),
@ -172,26 +157,7 @@ Foam::H2O::H2O(const dictionary& dict)
// kappag_(dict.subDict("kappag")),
// sigma_(dict.subDict("sigma")),
// D_(dict.subDict("D"))
{}
Foam::H2O::H2O(const H2O& 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_)
{}
}
// ************************************************************************* //

7
src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
View File

@ -106,15 +106,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
H2O(Istream& is);
//- Construct from dictionary
H2O(const dictionary& dict);
//- Construct copy
H2O(const H2O& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
@ -188,7 +182,6 @@ public:
D_.writeData(os); os << endl;
}
//- Ostream Operator
friend Ostream& operator<<(Ostream& os, const H2O& l)
{

39
src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(IC8H18, 0);
addToRunTimeSelectionTable(liquidProperties, IC8H18,);
addToRunTimeSelectionTable(liquidProperties, IC8H18, Istream);
addToRunTimeSelectionTable(liquidProperties, IC8H18, dictionary);
}
@ -128,25 +127,6 @@ Foam::IC8H18::IC8H18
{}
Foam::IC8H18::IC8H18(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::IC8H18::IC8H18(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::IC8H18::IC8H18(const dictionary& dict)
{}
Foam::IC8H18::IC8H18(const IC8H18& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
IC8H18(Istream& is);
//- Construct from dictionary
IC8H18(const dictionary& dict);
//- Construct copy
IC8H18(const IC8H18& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(IDEA, 0);
addToRunTimeSelectionTable(liquidProperties, IDEA,);
addToRunTimeSelectionTable(liquidProperties, IDEA, Istream);
addToRunTimeSelectionTable(liquidProperties, IDEA, dictionary);
}
@ -148,25 +147,6 @@ Foam::IDEA::IDEA
{}
Foam::IDEA::IDEA(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::IDEA::IDEA(const dictionary& dict)
:
liquidProperties(dict),
@ -186,23 +166,4 @@ Foam::IDEA::IDEA(const dictionary& dict)
{}
Foam::IDEA::IDEA(const IDEA& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
View File

@ -129,15 +129,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
IDEA(Istream& is);
//- Construct from dictionary
IDEA(const dictionary& dict);
//- Construct copy
IDEA(const IDEA& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/MB/MB.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(MB, 0);
addToRunTimeSelectionTable(liquidProperties, MB,);
addToRunTimeSelectionTable(liquidProperties, MB, Istream);
addToRunTimeSelectionTable(liquidProperties, MB, dictionary);
}
@ -112,25 +111,6 @@ Foam::MB::MB
{}
Foam::MB::MB(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::MB::MB(const dictionary& dict)
:
liquidProperties(dict),
@ -150,23 +130,4 @@ Foam::MB::MB(const dictionary& dict)
{}
Foam::MB::MB(const MB& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/MB/MB.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
MB(Istream& is);
//- Construct from dictionary
MB(const dictionary& dict);
//- Construct copy
MB(const MB& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/N2/N2.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(N2, 0);
addToRunTimeSelectionTable(liquidProperties, N2,);
addToRunTimeSelectionTable(liquidProperties, N2, Istream);
addToRunTimeSelectionTable(liquidProperties, N2, dictionary);
}
@ -128,25 +127,6 @@ Foam::N2::N2
{}
Foam::N2::N2(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::N2::N2(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::N2::N2(const dictionary& dict)
{}
Foam::N2::N2(const N2& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/N2/N2.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
N2(Istream& is);
//- Construct from dictionary
N2(const dictionary& dict);
//- Construct copy
N2(const N2& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(aC10H7CH3, 0);
addToRunTimeSelectionTable(liquidProperties, aC10H7CH3,);
addToRunTimeSelectionTable(liquidProperties, aC10H7CH3, Istream);
addToRunTimeSelectionTable(liquidProperties, aC10H7CH3, dictionary);
}
@ -120,25 +119,6 @@ Foam::aC10H7CH3::aC10H7CH3
{}
Foam::aC10H7CH3::aC10H7CH3(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::aC10H7CH3::aC10H7CH3(const dictionary& dict)
:
liquidProperties(dict),
@ -158,23 +138,4 @@ Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
{}
Foam::aC10H7CH3::aC10H7CH3(const aC10H7CH3& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
aC10H7CH3(Istream& is);
//- Construct from dictionary
aC10H7CH3(const dictionary& dict);
//- Construct copy
aC10H7CH3(const aC10H7CH3& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

38
src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(bC10H7CH3, 0);
addToRunTimeSelectionTable(liquidProperties, bC10H7CH3,);
addToRunTimeSelectionTable(liquidProperties, bC10H7CH3, Istream);
addToRunTimeSelectionTable(liquidProperties, bC10H7CH3, dictionary);
}
@ -120,24 +119,6 @@ Foam::bC10H7CH3::bC10H7CH3
{}
Foam::bC10H7CH3::bC10H7CH3(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::bC10H7CH3::bC10H7CH3(const dictionary& dict)
:
@ -158,23 +139,4 @@ Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
{}
Foam::bC10H7CH3::bC10H7CH3(const bC10H7CH3& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
View File

@ -107,15 +107,9 @@ public:
const APIdiffCoefFunc& vapourDiffussivity
);
//- Construct from Istream
bC10H7CH3(Istream& is);
//- Construct from dictionary
bC10H7CH3(const dictionary& dict);
//- Construct copy
bC10H7CH3(const bC10H7CH3& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

39
src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(iC3H8O, 0);
addToRunTimeSelectionTable(liquidProperties, iC3H8O,);
addToRunTimeSelectionTable(liquidProperties, iC3H8O, Istream);
addToRunTimeSelectionTable(liquidProperties, iC3H8O, dictionary);
}
@ -128,25 +127,6 @@ Foam::iC3H8O::iC3H8O
{}
Foam::iC3H8O::iC3H8O(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::iC3H8O::iC3H8O(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::iC3H8O::iC3H8O(const dictionary& dict)
{}
Foam::iC3H8O::iC3H8O(const iC3H8O& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
View File

@ -105,15 +105,9 @@ public:
const NSRDSfunc1& vapourDiffussivity
);
//- Construct from Istream
iC3H8O(Istream& is);
//- Construct from dictionary
iC3H8O(const dictionary& dict);
//- Construct copy
iC3H8O(const iC3H8O& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{

34
src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
View File

@ -33,7 +33,6 @@ namespace Foam
{
defineTypeNameAndDebug(liquidProperties, 0);
defineRunTimeSelectionTable(liquidProperties,);
defineRunTimeSelectionTable(liquidProperties, Istream);
defineRunTimeSelectionTable(liquidProperties, dictionary);
}
@ -68,22 +67,6 @@ Foam::liquidProperties::liquidProperties
{}
Foam::liquidProperties::liquidProperties(Istream& is)
:
W_(readScalar(is)),
Tc_(readScalar(is)),
Pc_(readScalar(is)),
Vc_(readScalar(is)),
Zc_(readScalar(is)),
Tt_(readScalar(is)),
Pt_(readScalar(is)),
Tb_(readScalar(is)),
dipm_(readScalar(is)),
omega_(readScalar(is)),
delta_(readScalar(is))
{}
Foam::liquidProperties::liquidProperties(const dictionary& dict)
:
W_(readScalar(dict.lookup("W"))),
@ -100,22 +83,6 @@ Foam::liquidProperties::liquidProperties(const dictionary& dict)
{}
Foam::liquidProperties::liquidProperties(const liquidProperties& liq)
:
W_(liq.W_),
Tc_(liq.Tc_),
Pc_(liq.Pc_),
Vc_(liq.Vc_),
Zc_(liq.Zc_),
Tt_(liq.Tt_),
Pt_(liq.Pt_),
Tb_(liq.Tb_),
dipm_(liq.dipm_),
omega_(liq.omega_),
delta_(liq.delta_)
{}
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
@ -310,7 +277,6 @@ Foam::scalar Foam::liquidProperties::pvInvert(scalar p) const
void Foam::liquidProperties::writeData(Ostream& os) const
{
os << W_ << token::SPACE
<< Tc_ << token::SPACE
<< Pc_ << token::SPACE

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

@ -105,15 +105,6 @@ public:
()
);
declareRunTimeSelectionTable
(
autoPtr,
liquidProperties,
Istream,
(Istream& is),
(is)
);
declareRunTimeSelectionTable
(
autoPtr,
@ -142,15 +133,9 @@ public:
scalar delta
);
//- Construct from Istream
liquidProperties(Istream& is);
//- Construct from dictionary
liquidProperties(const dictionary& dict);
//- Construct copy
liquidProperties(const liquidProperties& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{
@ -160,9 +145,6 @@ public:
// Selectors
//- Return a pointer to a new liquidProperties created from input
// static autoPtr<liquidProperties> New(Istream& is);
//- Return a pointer to a new liquidProperties created from dictionary
static autoPtr<liquidProperties> New(const dictionary& dict);

39
src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
View File

@ -32,7 +32,6 @@ namespace Foam
{
defineTypeNameAndDebug(nC3H8O, 0);
addToRunTimeSelectionTable(liquidProperties, nC3H8O,);
addToRunTimeSelectionTable(liquidProperties, nC3H8O, Istream);
addToRunTimeSelectionTable(liquidProperties, nC3H8O, dictionary);
}
@ -128,25 +127,6 @@ Foam::nC3H8O::nC3H8O
{}
Foam::nC3H8O::nC3H8O(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::nC3H8O::nC3H8O(const dictionary& dict)
:
liquidProperties(dict),
@ -166,23 +146,4 @@ Foam::nC3H8O::nC3H8O(const dictionary& dict)
{}
Foam::nC3H8O::nC3H8O(const nC3H8O& 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_)
{}
// ************************************************************************* //

6
src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
View File

@ -105,15 +105,9 @@ public:
const NSRDSfunc1& vapourDiffussivity
);
//- Construct from Istream
nC3H8O(Istream& is);
//- Construct from dictionary
nC3H8O(const dictionary& dict);
//- Construct copy
nC3H8O(const nC3H8O& liq);
//- Construct and return clone
virtual autoPtr<liquidProperties> clone() const
{