diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C index 8a4844a72..c6bcfbdc1 100644 --- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C +++ b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H index c26405a96..f5710401d 100644 --- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H +++ b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C index 6358c3bd4..5d82ef6da 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C +++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H index bfa91a6a3..2f747a27b 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H +++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C index 54a5124af..3f5271210 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C +++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H index c665f2678..23c1ad907 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H +++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C index 1f9eb06b6..a4011182a 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C +++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H index 6962ea8a5..4ed22aafe 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H +++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C index 5c0cd60c5..98fbbc8f7 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C +++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H index f1ea7dff2..bfa65436d 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H +++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C index f583cc271..12a00555b 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C +++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H index e1c39b9a2..36085db54 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H +++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C index ad3a0b167..a9d441a94 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C +++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H index 526d7fe49..7296b4e34 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H +++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C index b118dc310..9cab052a7 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C +++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H index 74b7f1a01..ebed8aa44 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H +++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C index 1a9ba151a..bf0528dc0 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C +++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H index b85d7273e..0477b7993 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H +++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C index d0e3a5c16..f617fd592 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C +++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H index 3e58a5fb0..9cafa3431 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H +++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C index 669dd0056..58abb7117 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C +++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H index ab345407e..9d451dcd6 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H +++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C index 32e217cd4..1012d7bcf 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C +++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H index c3e04909c..16072f1c8 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H +++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C index 0aa12512f..dfd50d0e3 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C +++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H index 574b249b4..9769fc41d 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H +++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C index ff3e040ef..a4c10bea0 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C +++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H index 8f682060c..260f228e8 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H +++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C index 90651a711..c2032f547 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C +++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H index b8032cd91..f18c7bf38 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H +++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C index a9026f39d..8b070065b 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C +++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H index 7e01f058b..28e018d7f 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H +++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C index 8c8484270..95822a69f 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C +++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H index 4e36b5429..d53a9dc76 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H +++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C index d50c15e0a..0bd8dad72 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C +++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H index 8bd606d1e..3146c7f78 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H +++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C index 4db12992a..803ec867f 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C +++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H index 7cd448be5..61ea898d9 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H +++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C index f656c0bc9..7e3918fc7 100644 --- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C +++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H index 43d9b7acf..705493ab0 100644 --- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H +++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C index 0e271803e..7c218a20b 100644 --- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C +++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H index ceca9fc4e..3a459e2a9 100644 --- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H +++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C index fc1c64a5c..5f705a706 100644 --- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C +++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C @@ -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_) -{} +} // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H index 2b599e186..542dfd66c 100644 --- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H +++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H @@ -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 clone() const { @@ -188,7 +182,6 @@ public: D_.writeData(os); os << endl; } - //- Ostream Operator friend Ostream& operator<<(Ostream& os, const H2O& l) { diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C index fc793c8c7..77ba4be1d 100644 --- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C +++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H index d044ccfaa..9a2e06fdf 100644 --- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H +++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C index fc950df61..01777a26c 100644 --- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C +++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H index ec19b1098..b34a7db9e 100644 --- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H +++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C index f2cce3c18..d98ef565b 100644 --- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C +++ b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H index 2d204bf85..4f7e5a5db 100644 --- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H +++ b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C index 3470173d9..f22e3b068 100644 --- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C +++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H index 77c155d58..9bcc0cb67 100644 --- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H +++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C index 83e9e894f..562a59198 100644 --- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C +++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H index 06a25fdca..04bdf8720 100644 --- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H +++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C index 159b7c9de..d2c2fd82d 100644 --- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C +++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H index 7869b2db5..6f8966edf 100644 --- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H +++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C index 48d92becb..c77141a9b 100644 --- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C +++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H index 8ad465f51..bac19d8d7 100644 --- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H +++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H @@ -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 clone() const { diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C index 7e0f43c7e..c5db6942f 100644 --- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C +++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C @@ -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::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 diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H index 5cbfebf26..54eb237b1 100644 --- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H +++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H @@ -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 clone() const { @@ -160,9 +145,6 @@ public: // Selectors - //- Return a pointer to a new liquidProperties created from input - // static autoPtr New(Istream& is); - //- Return a pointer to a new liquidProperties created from dictionary static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C index 2369adffd..419c0c192 100644 --- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C +++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C @@ -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_) -{} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H index a55a0e53f..d5dec6a85 100644 --- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H +++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H @@ -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 clone() const {