diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.C b/src/thermophysicalModels/properties/solidProperties/C/C.C index 2f8dfa9ac..354746857 100644 --- a/src/thermophysicalModels/properties/solidProperties/C/C.C +++ b/src/thermophysicalModels/properties/solidProperties/C/C.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,6 @@ namespace Foam { defineTypeNameAndDebug(C, 0); addToRunTimeSelectionTable(solidProperties, C,); - addToRunTimeSelectionTable(solidProperties, C, Istream); addToRunTimeSelectionTable(solidProperties, C, dictionary); } @@ -57,24 +56,12 @@ Foam::C::C(const solidProperties& s) {} -Foam::C::C(Istream& is) -: - solidProperties(is) -{} - - Foam::C::C(const dictionary& dict) : solidProperties(dict) {} -Foam::C::C(const C& s) -: - solidProperties(s) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void Foam::C::writeData(Ostream& os) const diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.H b/src/thermophysicalModels/properties/solidProperties/C/C.H index a266b152c..7086df532 100644 --- a/src/thermophysicalModels/properties/solidProperties/C/C.H +++ b/src/thermophysicalModels/properties/solidProperties/C/C.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,15 +73,9 @@ public: //- Construct from solidProperties C(const solidProperties& s); - //- Construct from Istream - C(Istream& is); - //- Construct from dictionary C(const dictionary& dict); - //- Construct copy - C(const C& s); - //- Construct and return clone virtual autoPtr clone() const { diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C index a7dbb8bff..2bcfee1b6 100644 --- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C +++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,6 @@ namespace Foam { defineTypeNameAndDebug(CaCO3, 0); addToRunTimeSelectionTable(solidProperties, CaCO3,); - addToRunTimeSelectionTable(solidProperties, CaCO3, Istream); addToRunTimeSelectionTable(solidProperties, CaCO3, dictionary); } @@ -57,24 +56,12 @@ Foam::CaCO3::CaCO3(const solidProperties& s) {} -Foam::CaCO3::CaCO3(Istream& is) -: - solidProperties(is) -{} - - Foam::CaCO3::CaCO3(const dictionary& dict) : solidProperties(dict) {} -Foam::CaCO3::CaCO3(const CaCO3& s) -: - solidProperties(s) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void Foam::CaCO3::writeData(Ostream& os) const diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H index 0ff59dae2..92bcdead4 100644 --- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H +++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,15 +74,9 @@ public: //- Construct from solidProperties CaCO3(const solidProperties& s); - //- Construct from Istream - CaCO3(Istream& is); - //- Construct from dictionary CaCO3(const dictionary& dict); - //- Construct copy - CaCO3(const CaCO3& s); - //- Construct and return clone virtual autoPtr clone() const { diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.C b/src/thermophysicalModels/properties/solidProperties/ash/ash.C index 381191f89..4ab67b5cd 100644 --- a/src/thermophysicalModels/properties/solidProperties/ash/ash.C +++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,6 @@ namespace Foam { defineTypeNameAndDebug(ash, 0); addToRunTimeSelectionTable(solidProperties, ash,); - addToRunTimeSelectionTable(solidProperties, ash, Istream); addToRunTimeSelectionTable(solidProperties, ash, dictionary); } @@ -57,24 +56,12 @@ Foam::ash::ash(const solidProperties& s) {} -Foam::ash::ash(Istream& is) -: - solidProperties(is) -{} - - Foam::ash::ash(const dictionary& dict) : solidProperties(dict) {} -Foam::ash::ash(const ash& s) -: - solidProperties(s) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void Foam::ash::writeData(Ostream& os) const diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.H b/src/thermophysicalModels/properties/solidProperties/ash/ash.H index 2958b7984..5f6e2135b 100644 --- a/src/thermophysicalModels/properties/solidProperties/ash/ash.H +++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,15 +74,9 @@ public: //- Construct from solidProperties ash(const solidProperties& s); - //- Construct from Istream - ash(Istream& is); - //- Construct from dictionary ash(const dictionary& dict); - //- Construct copy - ash(const ash& s); - //- Construct and return clone virtual autoPtr clone() const { diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C index 9151ff5da..cca139220 100644 --- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C +++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C @@ -31,7 +31,6 @@ namespace Foam { defineTypeNameAndDebug(solidProperties, 0); defineRunTimeSelectionTable(solidProperties,); - defineRunTimeSelectionTable(solidProperties, Istream); defineRunTimeSelectionTable(solidProperties, dictionary); } @@ -54,16 +53,6 @@ Foam::solidProperties::solidProperties {} -Foam::solidProperties::solidProperties(Istream& is) -: - rho_(readScalar(is)), - Cp_(readScalar(is)), - kappa_(readScalar(is)), - Hf_(readScalar(is)), - emissivity_(readScalar(is)) -{} - - Foam::solidProperties::solidProperties(const dictionary& dict) : rho_(readScalar(dict.lookup("rho"))), @@ -74,16 +63,6 @@ Foam::solidProperties::solidProperties(const dictionary& dict) {} -Foam::solidProperties::solidProperties(const solidProperties& s) -: - rho_(s.rho_), - Cp_(s.Cp_), - kappa_(s.kappa_), - Hf_(s.Hf_), - emissivity_(s.emissivity_) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void Foam::solidProperties::writeData(Ostream& os) const diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H index c0acae07e..f42e84be6 100644 --- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H +++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H @@ -96,15 +96,6 @@ public: () ); - declareRunTimeSelectionTable - ( - autoPtr, - solidProperties, - Istream, - (Istream& is), - (is) - ); - declareRunTimeSelectionTable ( autoPtr, @@ -127,15 +118,9 @@ public: scalar emissivity ); - //- Construct from Istream - solidProperties(Istream& is); - //- Construct from dictionary solidProperties(const dictionary& dict); - //- Construct copy - solidProperties(const solidProperties& s); - //- Construct and return clone virtual autoPtr clone() const { @@ -145,9 +130,6 @@ public: // Selectors - //- Return a pointer to a new solidProperties created from input - static autoPtr New(Istream& is); - //- Return a pointer to a new solidProperties created from dictionary static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C index e9c34b572..0e6119e0f 100644 --- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C +++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,49 +28,6 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::solidProperties::New(Istream& is) -{ - if (debug) - { - InfoInFunction << "Constructing solid" << endl; - } - - const word solidType(is); - const word coeffs(is); - - if (coeffs == "defaultCoeffs") - { - ConstructorTable::iterator cstrIter = - ConstructorTablePtr_->find(solidType); - - if (cstrIter == ConstructorTablePtr_->end()) - { - FatalErrorInFunction - << "Unknown solidProperties type " << solidType << nl << nl - << "Valid solidProperties types are :" << endl - << ConstructorTablePtr_->sortedToc() - << exit(FatalError); - } - - return autoPtr(cstrIter()()); - } - else if (coeffs == "coeffs") - { - return autoPtr(new solidProperties(is)); - } - else - { - FatalErrorInFunction - << "solidProperties type " << solidType - << ", option " << coeffs << " given" - << ", should be coeffs or defaultCoeffs" - << exit(FatalError); - - return autoPtr(nullptr); - } -} - - Foam::autoPtr Foam::solidProperties::New ( const dictionary& dict diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C index c3bc3ef32..1b50a08cf 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,26 +26,6 @@ License #include "absorptionCoeffs.H" #include "IOstreams.H" -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::radiation::absorptionCoeffs::absorptionCoeffs(Istream& is) -: - Tcommon_(readScalar(is)), - Tlow_(readScalar(is)), - Thigh_(readScalar(is)), - invTemp_(readBool(is)) -{ - for (label coefLabel=0; absorptionCoeffs::nCoeffs_; coefLabel++) - { - is >> highACoeffs_[coefLabel]; - } - - for (label coefLabel=0; absorptionCoeffs::nCoeffs_; coefLabel++) - { - is >> lowACoeffs_[coefLabel]; - } -} - // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // @@ -86,12 +66,6 @@ Foam::radiation::absorptionCoeffs::coeffs } -void Foam::radiation::absorptionCoeffs::initialise(Istream&) -{ - absorptionCoeffs(Istream); -} - - void Foam::radiation::absorptionCoeffs::initialise(const dictionary& dict) { dict.lookup("Tcommon") >> Tcommon_; diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H index b2eed50da..4f18495e5 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,9 +90,6 @@ public: // Constructors - //- Construct from Istream - absorptionCoeffs(Istream&); - // Null constructor absorptionCoeffs() {} @@ -110,9 +107,6 @@ public: // Initialise from a dictionary void initialise(const dictionary&); - // Initialise from an Istream - void initialise(Istream&); - // Access Functions diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C index b5a4cfde9..bffd5f8d2 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C +++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,23 +59,6 @@ Foam::solidReaction::solidReaction {} -template -Foam::solidReaction::solidReaction -( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is -) -: - Reaction(species, thermoDatabase, is), - pyrolisisGases_(), - glhs_(), - grhs_() -{ - NotImplemented; -} - - template Foam::solidReaction::solidReaction ( diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H index 190e75812..6addc8749 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H +++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -120,15 +120,6 @@ public: ); - //- Construct from Istream - solidReaction - ( - const speciesTable& pyrolisisGases, - const HashPtrTable& thermoDatabase, - Istream& is - ); - - //- Construct from dictionary solidReaction ( diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H index 1a734a96d..c5642e627 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H +++ b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,12 +75,6 @@ public: const scalar Tcrit ); - //- Construct from Istream - inline solidArrheniusReactionRate - ( - const speciesTable& species, - Istream& is - ); //- Construct from dictionary inline solidArrheniusReactionRate diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H index 2c59b2842..1ab4bcb50 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H +++ b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,18 +39,6 @@ inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate {} -inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate -( - const speciesTable&, - Istream& is -) -: - A_(readScalar(is.readBegin("solidArrheniusReaction(Istream&)"))), - Ta_(readScalar(is)), - Tcrit_(readScalar(is)) -{} - - inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate ( const speciesTable&, @@ -101,9 +89,7 @@ inline Foam::Ostream& Foam::operator<< const solidArrheniusReactionRate& arr ) { - os << token::BEGIN_LIST - << arr.A_ << token::SPACE << arr.Ta_ << token::SPACE << arr.Tcrit_ - << token::END_LIST; + arr.write(os); return os; } diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H index bc17d12bb..b5444f1e5 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H +++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,7 +54,6 @@ namespace Foam typedef ReactionType \ ReactionType##Thermo##ReactionRate; \ \ - defineTemplateRunTimeSelectionTable(Reaction##Thermo, Istream); \ defineTemplateRunTimeSelectionTable(Reaction##Thermo, dictionary); \ \ defineTemplateTypeNameAndDebug(solidReaction##Thermo, 0); \ @@ -69,13 +68,6 @@ namespace Foam ); \ \ addToRunTimeSelectionTable \ - ( \ - Reaction##Thermo, \ - ReactionType##Thermo##ReactionRate, \ - Istream \ - ); \ - \ - addToRunTimeSelectionTable \ ( \ Reaction##Thermo, \ ReactionType##Thermo##ReactionRate, \ diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C index bef810294..5a99f4caa 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,14 +64,7 @@ Foam::Ostream& Foam::operator<< const constAnIsoSolidTransport& ct ) { - operator<<(os, static_cast(ct)); - os << tab << ct.kappa_; - - os.check - ( - "Ostream& operator<<(Ostream& os,const constAnIsoSolidTransport& ct)" - ); - + ct.write(os); return os; } diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C index 02684194f..2d9135e81 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,14 +64,7 @@ Foam::Ostream& Foam::operator<< const constIsoSolidTransport& ct ) { - operator<<(os, static_cast(ct)); - os << tab << ct.kappa_; - - os.check - ( - "Ostream& operator<<(Ostream& os,const constIsoSolidTransport& ct)" - ); - + ct.write(os); return os; } diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H index f290b4288..5de4c38fc 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H +++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H @@ -94,7 +94,7 @@ public: const constIsoSolidTransport& ); - //- Construct from Istream + //- Construct from dictionary constIsoSolidTransport(const dictionary& dict); // Selector from dictionary diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C index 24abeac8a..02d6635d3 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,14 +72,7 @@ Foam::Ostream& Foam::operator<< Ostream& os, const exponentialSolidTransport& et ) { - operator<<(os, static_cast(et)); - os << tab << et.kappa0_ << tab << et.n0_ << tab << et.Tref_; - - os.check - ( - "Ostream& operator<<(Ostream& os, const exponentialSolidTransport& et)" - ); - + et.write(os); return os; } diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C index e43b30a2e..0a2d0a665 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,18 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::polynomialSolidTransport::polynomialSolidTransport -( - Istream& is -) -: - Thermo(is), - kappaCoeffs_("kappaCoeffs<" + Foam::name(PolySize) + '>', is) -{ -} - - template Foam::polynomialSolidTransport::polynomialSolidTransport ( @@ -85,19 +73,7 @@ Foam::Ostream& Foam::operator<< const polynomialSolidTransport& pt ) { - os << static_cast(pt) << tab - << "kappaCoeffs<" << Foam::name(PolySize) << '>' << tab - << pt.kappaCoeffs_; - - os.check - ( - "Ostream& operator<<" - "(" - "Ostream&, " - "const polynomialSolidTransport&" - ")" - ); - + pt.write(os); return os; } diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H index 716284cb1..3cb7a3b3e 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H +++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H @@ -127,9 +127,6 @@ public: // Constructors - //- Construct copy - inline polynomialSolidTransport(const polynomialSolidTransport&); - //- Construct as named copy inline polynomialSolidTransport ( @@ -137,18 +134,12 @@ public: const polynomialSolidTransport& ); - //- Construct from Istream - polynomialSolidTransport(Istream& is); - //- Construct from dictionary polynomialSolidTransport(const dictionary& dict); //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New ( diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H index 1a923d490..727e2be6b 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H +++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H @@ -27,18 +27,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline Foam::polynomialSolidTransport:: -polynomialSolidTransport -( - const polynomialSolidTransport& pt -) -: - Thermo(pt), - kappaCoeffs_(pt.kappaCoeffs_) -{} - - template inline Foam::polynomialSolidTransport:: polynomialSolidTransport @@ -76,17 +64,6 @@ Foam::polynomialSolidTransport::clone() const } -template -inline Foam::autoPtr> -Foam::polynomialSolidTransport::New(Istream& is) -{ - return autoPtr> - ( - new polynomialSolidTransport(is) - ); -} - - template inline Foam::autoPtr> Foam::polynomialSolidTransport::New(const dictionary& dict) diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C index 12286d13f..66ae9a7cf 100644 --- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C +++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C @@ -28,22 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::Boussinesq::Boussinesq(Istream& is) -: - Specie(is), - rho0_(readScalar(is)), - T0_(readScalar(is)), - beta_(readScalar(is)) -{ - is.check - ( - "Boussinesq::" - "Boussinesq(Istream& is)" - ); -} - - template Foam::Boussinesq::Boussinesq ( @@ -81,16 +65,7 @@ Foam::Ostream& Foam::operator<< const Boussinesq& b ) { - os << static_cast(b) - << token::SPACE << b.rho0_ - << token::SPACE << b.T0_ - << token::SPACE << b.beta_; - - os.check - ( - "Ostream& operator<<" - "(Ostream& os, const Boussinesq& st)" - ); + b.write(os); return os; } diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H index 720483c07..4c91afbf2 100644 --- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H +++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H @@ -115,12 +115,6 @@ public: const scalar beta ); - //- Construct from Boussinesq - inline Boussinesq(const Boussinesq& sp); - - //- Construct from Istream - Boussinesq(Istream&); - //- Construct from dictionary Boussinesq(const dictionary& dict); @@ -134,9 +128,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New ( diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H index 45b9d58cf..814a9a1e8 100644 --- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H +++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H @@ -41,19 +41,6 @@ inline Foam::Boussinesq::Boussinesq {} -template -inline Foam::Boussinesq::Boussinesq -( - const Boussinesq& b -) -: - Specie(b), - rho0_(b.rho0_), - T0_(b.T0_), - beta_(b.beta_) -{} - - template inline Foam::Boussinesq::Boussinesq ( @@ -79,20 +66,6 @@ Foam::Boussinesq::clone() const } -template -inline Foam::autoPtr> -Foam::Boussinesq::New -( - Istream& is -) -{ - return autoPtr> - ( - new Boussinesq(is) - ); -} - - template inline Foam::autoPtr> Foam::Boussinesq::New diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C index eeaa0a2ce..e61f40d5f 100644 --- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C +++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C @@ -28,20 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::PengRobinsonGas::PengRobinsonGas(Istream& is) -: - Specie(is), - Tc_(readScalar(is)), - Vc_(readScalar(is)), - Zc_(readScalar(is)), - Pc_(readScalar(is)), - omega_(readScalar(is)) -{ - is.check("PengRobinsonGas::PengRobinsonGas(Istream& is)"); -} - - template Foam::PengRobinsonGas::PengRobinsonGas ( @@ -78,17 +64,7 @@ Foam::Ostream& Foam::operator<< const PengRobinsonGas& pg ) { - os << static_cast(pg) - << token::SPACE << pg.Tc_ - << token::SPACE << pg.Vc_ - << token::SPACE << pg.Zc_ - << token::SPACE << pg.Pc_ - << token::SPACE << pg.omega_; - - os.check - ( - "Ostream& operator<<(Ostream& os, const PengRobinsonGas& st)" - ); + pg.write(os); return os; } diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H index 3f0498bb5..8f15ae892 100644 --- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H +++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H @@ -119,9 +119,6 @@ public: const scalar& omega ); - //- Construct from Istream - PengRobinsonGas(Istream&); - //- Construct from dictionary PengRobinsonGas(const dictionary& dict); @@ -131,9 +128,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New ( diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H index d4553eb38..85df8cea5 100644 --- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H +++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H @@ -77,17 +77,6 @@ Foam::PengRobinsonGas::clone() const } -template -inline Foam::autoPtr> -Foam::PengRobinsonGas::New -( - Istream& is -) -{ - return autoPtr>(new PengRobinsonGas(is)); -} - - template inline Foam::autoPtr> Foam::PengRobinsonGas::New diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C index a8609cb7a..2c415b874 100644 --- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C +++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C @@ -28,22 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::adiabaticPerfectFluid::adiabaticPerfectFluid(Istream& is) -: - Specie(is), - p0_(readScalar(is)), - rho0_(readScalar(is)), - gamma_(readScalar(is)), - B_(readScalar(is)) -{ - is.check - ( - "adiabaticPerfectFluid::adiabaticPerfectFluid(Istream& is)" - ); -} - - template Foam::adiabaticPerfectFluid::adiabaticPerfectFluid ( @@ -84,17 +68,7 @@ Foam::Ostream& Foam::operator<< const adiabaticPerfectFluid& pf ) { - os << static_cast(pf) - << token::SPACE << pf.R_ - << token::SPACE << pf.rho0_ - << token::SPACE << pf.gamma_ - << token::SPACE << pf.B_; - - os.check - ( - "Ostream& operator<<(Ostream&, const adiabaticPerfectFluid&)" - ); - + pf.write(os); return os; } diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H index f22275cf9..bfb2dc19d 100644 --- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H +++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H @@ -114,9 +114,6 @@ public: const scalar B ); - //- Construct from Istream - adiabaticPerfectFluid(Istream&); - //- Construct from dictionary adiabaticPerfectFluid(const dictionary& dict); @@ -130,9 +127,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New ( diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H index c6275c990..57424a902 100644 --- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H +++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H @@ -73,17 +73,6 @@ Foam::adiabaticPerfectFluid::clone() const } -template -inline Foam::autoPtr> -Foam::adiabaticPerfectFluid::New(Istream& is) -{ - return autoPtr> - ( - new adiabaticPerfectFluid(is) - ); -} - - template inline Foam::autoPtr> Foam::adiabaticPerfectFluid::New diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C index 472ff3e5f..fb5b0f5da 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C @@ -33,14 +33,6 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -icoPolynomial::icoPolynomial(Istream& is) -: - Specie(is), - rhoCoeffs_("rhoCoeffs<" + Foam::name(PolySize) + '>', is) -{} - - template icoPolynomial::icoPolynomial(const dictionary& dict) : @@ -78,16 +70,7 @@ void icoPolynomial::write(Ostream& os) const template Ostream& operator<<(Ostream& os, const icoPolynomial& ip) { - os << static_cast(ip) << tab - << "rhoCoeffs<" << Foam::name(PolySize) << '>' << tab - << ip.rhoCoeffs_; - - os.check - ( - "Ostream& operator<<" - "(Ostream& os, const icoPolynomial& ip)" - ); - + ip.write(os); return os; } diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H index 2ba542512..e57f2b905 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H @@ -131,24 +131,15 @@ public: const Polynomial& rhoPoly ); - //- Construct from Istream - icoPolynomial(Istream&); - //- Construct from dictionary icoPolynomial(const dictionary& dict); - //- Construct as copy - inline icoPolynomial(const icoPolynomial&); - //- Construct as named copy inline icoPolynomial(const word& name, const icoPolynomial&); //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H index 5358f425e..66edf3f84 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H @@ -41,17 +41,6 @@ inline Foam::icoPolynomial::icoPolynomial // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline Foam::icoPolynomial::icoPolynomial -( - const icoPolynomial& ip -) -: - Specie(ip), - rhoCoeffs_(ip.rhoCoeffs_) -{} - - template inline Foam::icoPolynomial::icoPolynomial ( @@ -75,17 +64,6 @@ Foam::icoPolynomial::clone() const } -template -inline Foam::autoPtr> -Foam::icoPolynomial::New(Istream& is) -{ - return autoPtr> - ( - new icoPolynomial(is) - ); -} - - template inline Foam::autoPtr> Foam::icoPolynomial::New(const dictionary& dict) diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C index 02955422b..c2aa3c0a8 100644 --- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C +++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C @@ -28,20 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::incompressiblePerfectGas::incompressiblePerfectGas(Istream& is) -: - Specie(is), - pRef_(readScalar(is)) -{ - is.check - ( - "incompressiblePerfectGas::" - "incompressiblePerfectGas(Istream& is)" - ); -} - - template Foam::incompressiblePerfectGas::incompressiblePerfectGas ( @@ -75,14 +61,7 @@ Foam::Ostream& Foam::operator<< const incompressiblePerfectGas& pg ) { - os << static_cast(pg) - << token::SPACE << pg.pRef_; - - os.check - ( - "Ostream& operator<<" - "(Ostream& os, const incompressiblePerfectGas& st)" - ); + pg.write(os); return os; } diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H index cf0c73dbf..26027dc6a 100644 --- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H +++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H @@ -100,12 +100,6 @@ public: //- Construct from components inline incompressiblePerfectGas(const Specie& sp, const scalar pRef); - //- Construct from incompressiblePerfectGas - inline incompressiblePerfectGas(const incompressiblePerfectGas& sp); - - //- Construct from Istream - incompressiblePerfectGas(Istream&); - //- Construct from dictionary incompressiblePerfectGas(const dictionary& dict); @@ -119,9 +113,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New ( diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H index f1772442b..d04880a6d 100644 --- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H +++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H @@ -39,17 +39,6 @@ inline Foam::incompressiblePerfectGas::incompressiblePerfectGas {} -template -inline Foam::incompressiblePerfectGas::incompressiblePerfectGas -( - const incompressiblePerfectGas& ipg -) -: - Specie(ipg), - pRef_(ipg.pRef_) -{} - - template inline Foam::incompressiblePerfectGas::incompressiblePerfectGas ( @@ -73,20 +62,6 @@ Foam::incompressiblePerfectGas::clone() const } -template -inline Foam::autoPtr> -Foam::incompressiblePerfectGas::New -( - Istream& is -) -{ - return autoPtr> - ( - new incompressiblePerfectGas(is) - ); -} - - template inline Foam::autoPtr> Foam::incompressiblePerfectGas::New diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.C b/src/thermophysicalModels/specie/equationOfState/linear/linear.C index 6259930ae..723eef463 100644 --- a/src/thermophysicalModels/specie/equationOfState/linear/linear.C +++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.C @@ -28,17 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::linear::linear(Istream& is) -: - Specie(is), - psi_(readScalar(is)), - rho0_(readScalar(is)) -{ - is.check("linear::linear(Istream& is)"); -} - - template Foam::linear::linear(const dictionary& dict) : @@ -68,11 +57,7 @@ void Foam::linear::write(Ostream& os) const template Foam::Ostream& Foam::operator<<(Ostream& os, const linear& pf) { - os << static_cast(pf) - << token::SPACE << pf.psi_ - << token::SPACE << pf.rho0_; - - os.check("Ostream& operator<<(Ostream&, const linear&)"); + pf.write(os); return os; } diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.H b/src/thermophysicalModels/specie/equationOfState/linear/linear.H index 9bff7e46f..85be3d50d 100644 --- a/src/thermophysicalModels/specie/equationOfState/linear/linear.H +++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.H @@ -110,9 +110,6 @@ public: const scalar rho0 ); - //- Construct from Istream - linear(Istream&); - //- Construct from dictionary linear(const dictionary& dict); @@ -122,9 +119,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H index 951268eab..c3d361d2d 100644 --- a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H +++ b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H @@ -64,14 +64,6 @@ Foam::linear::clone() const } -template -inline Foam::autoPtr> -Foam::linear::New(Istream& is) -{ - return autoPtr>(new linear(is)); -} - - template inline Foam::autoPtr> Foam::linear::New diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C index 1857552c6..cf64fb75a 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C +++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C @@ -28,17 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::perfectFluid::perfectFluid(Istream& is) -: - Specie(is), - R_(readScalar(is)), - rho0_(readScalar(is)) -{ - is.check("perfectFluid::perfectFluid(Istream& is)"); -} - - template Foam::perfectFluid::perfectFluid(const dictionary& dict) : @@ -68,11 +57,7 @@ void Foam::perfectFluid::write(Ostream& os) const template Foam::Ostream& Foam::operator<<(Ostream& os, const perfectFluid& pf) { - os << static_cast(pf) - << token::SPACE << pf.R_ - << token::SPACE << pf.rho0_; - - os.check("Ostream& operator<<(Ostream&, const perfectFluid&)"); + pf.write(os); return os; } diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H index 89fcab787..614183d0a 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H +++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H @@ -106,9 +106,6 @@ public: const scalar rho0 ); - //- Construct from Istream - perfectFluid(Istream&); - //- Construct from dictionary perfectFluid(const dictionary& dict); @@ -118,9 +115,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H index 133902b87..a16c06c15 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H +++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H @@ -65,14 +65,6 @@ Foam::perfectFluid::clone() const } -template -inline Foam::autoPtr> -Foam::perfectFluid::New(Istream& is) -{ - return autoPtr>(new perfectFluid(is)); -} - - template inline Foam::autoPtr> Foam::perfectFluid::New diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C index f63ffbbc6..8f9972cda 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C +++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C @@ -28,15 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::perfectGas::perfectGas(Istream& is) -: - Specie(is) -{ - is.check("perfectGas::perfectGas(Istream& is)"); -} - - template Foam::perfectGas::perfectGas(const dictionary& dict) : @@ -58,9 +49,7 @@ void Foam::perfectGas::write(Ostream& os) const template Foam::Ostream& Foam::operator<<(Ostream& os, const perfectGas& pg) { - os << static_cast(pg); - - os.check("Ostream& operator<<(Ostream& os, const perfectGas& st)"); + pg.write(os); return os; } diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H index 6d519c75c..bbb910125 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H +++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H @@ -93,9 +93,6 @@ public: //- Construct from components inline perfectGas(const Specie& sp); - //- Construct from Istream - perfectGas(Istream&); - //- Construct from dictionary perfectGas(const dictionary& dict); @@ -105,9 +102,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H index 764a53dfe..7795e465b 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H +++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H @@ -55,14 +55,6 @@ Foam::perfectGas::clone() const } -template -inline Foam::autoPtr> -Foam::perfectGas::New(Istream& is) -{ - return autoPtr>(new perfectGas(is)); -} - - template inline Foam::autoPtr> Foam::perfectGas::New ( diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C index 895ec1859..f7ccfdb5a 100644 --- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C +++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,16 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::rhoConst::rhoConst(Istream& is) -: - Specie(is), - rho_(readScalar(is)) -{ - is.check("rhoConst::rhoConst(Istream& is)"); -} - - template Foam::rhoConst::rhoConst(const dictionary& dict) : @@ -65,10 +55,7 @@ void Foam::rhoConst::write(Ostream& os) const template Foam::Ostream& Foam::operator<<(Ostream& os, const rhoConst& ico) { - os << static_cast(ico) - << token::SPACE << ico.rho_; - - os.check("Ostream& operator<<(Ostream& os, const rhoConst& ico)"); + ico.write(os); return os; } diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H index a60f52581..5cefe1f1e 100644 --- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H +++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H @@ -98,9 +98,6 @@ public: //- Construct from components inline rhoConst(const Specie& sp, const scalar rho); - //- Construct from Istream - rhoConst(Istream&); - //- Construct from dictionary rhoConst(const dictionary& dict); @@ -110,9 +107,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Member functions diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H index fb5e10124..ee41587e8 100644 --- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H +++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H @@ -61,14 +61,6 @@ Foam::rhoConst::clone() const } -template -inline Foam::autoPtr> -Foam::rhoConst::New(Istream& is) -{ - return autoPtr>(new rhoConst(is)); -} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C index c691af189..32a301fab 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,25 +45,6 @@ IrreversibleReaction {} -template -< - template class ReactionType, - class ReactionThermo, - class ReactionRate -> -Foam::IrreversibleReaction:: -IrreversibleReaction -( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is -) -: - ReactionType(species, thermoDatabase, is), - k_(species, is) -{} - - template < template class ReactionType, diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H index c5273d830..3c3aa7ead 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,14 +103,6 @@ public: const speciesTable& species ); - //- Construct from Istream - IrreversibleReaction - ( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is - ); - //- Construct from dictionary IrreversibleReaction ( diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C index f2f8b175b..255cf2b93 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,32 +52,6 @@ NonEquilibriumReversibleReaction {} - -template -< - template class ReactionType, - class ReactionThermo, - class ReactionRate -> -Foam::NonEquilibriumReversibleReaction -< - ReactionType, - ReactionThermo, - ReactionRate ->:: -NonEquilibriumReversibleReaction -( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is -) -: - ReactionType(species, thermoDatabase, is), - fk_(species, is), - rk_(species, is) -{} - - template < template class ReactionType, diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H index f1b23abfe..8e76691d3 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,14 +97,6 @@ public: const speciesTable& species ); - //- Construct from Istream - NonEquilibriumReversibleReaction - ( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is - ); - //- Construct from dictionary NonEquilibriumReversibleReaction ( diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index dc43975c4..7d36f1418 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -320,23 +320,6 @@ void Foam::Reaction::setLRhs } -template -Foam::Reaction::Reaction -( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is -) -: - ReactionThermo::thermoType(*thermoDatabase[species[0]]), - name_("un-named-reaction" + Foam::name(getNewReactionID())), - species_(species) -{ - setLRhs(is, species, lhs_, rhs_); - setThermo(thermoDatabase); -} - - template Foam::Reaction::Reaction ( @@ -362,50 +345,6 @@ Foam::Reaction::Reaction // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -template -Foam::autoPtr> -Foam::Reaction::New -( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is -) -{ - if (is.eof()) - { - FatalIOErrorInFunction - ( - is - ) << "Reaction type not specified" << nl << nl - << "Valid Reaction types are :" << nl - << IstreamConstructorTablePtr_->sortedToc() - << exit(FatalIOError); - } - - const word reactionTypeName(is); - - typename IstreamConstructorTable::iterator cstrIter - = IstreamConstructorTablePtr_->find(reactionTypeName); - - if (cstrIter == IstreamConstructorTablePtr_->end()) - { - FatalIOErrorInFunction - ( - is - ) << "Unknown reaction type " - << reactionTypeName << nl << nl - << "Valid reaction types are :" << nl - << IstreamConstructorTablePtr_->sortedToc() - << exit(FatalIOError); - } - - return autoPtr> - ( - cstrIter()(species, thermoDatabase, is) - ); -} - - template Foam::autoPtr> Foam::Reaction::New diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H index ead361e11..d96134aac 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -164,19 +164,6 @@ public: // Declare run-time constructor selection tables - declareRunTimeSelectionTable - ( - autoPtr, - Reaction, - Istream, - ( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is - ), - (species, thermoDatabase, is) - ); - declareRunTimeSelectionTable ( autoPtr, @@ -191,36 +178,6 @@ public: ); - // Public classes - - //- Class used for the read-construction of PtrLists of reaction - class iNew - { - const speciesTable& species_; - const HashPtrTable& thermoDatabase_; - - public: - - iNew - ( - const speciesTable& species, - const HashPtrTable& thermoDatabase - ) - : - species_(species), - thermoDatabase_(thermoDatabase) - {} - - autoPtr operator()(Istream& is) const - { - return autoPtr - ( - Reaction::New(species_, thermoDatabase_, is) - ); - } - }; - - // Constructors //- Construct from components @@ -235,14 +192,6 @@ public: //- Construct as copy given new speciesTable Reaction(const Reaction&, const speciesTable& species); - //- Construct from Istream - Reaction - ( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is - ); - //- Construct from dictionary Reaction ( @@ -275,14 +224,6 @@ public: // Selectors - //- Return a pointer to new patchField created on freestore from input - static autoPtr> New - ( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is - ); - //- Return a pointer to new patchField created on freestore from dict static autoPtr> New ( @@ -312,10 +253,10 @@ public: virtual const List& grhs() const; virtual const List& glhs() const; - // - Access to specie list + //- Access to specie list const speciesTable& species() const; - // - Access to gas specie list + //- Access to gas specie list virtual const speciesTable& gasSpecies() const; //- Construct the left- and right-hand-side reaction coefficients diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C index ca0334107..6d3f2539f 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,25 +60,6 @@ Foam::ReactionList::ReactionList } -template -Foam::ReactionList::ReactionList -( - const speciesTable& species, - const HashPtrTable& thermoDb, - const fileName& fName -) -: - SLPtrList> - ( - dictionary(IFstream(fName)()).lookup("reactions"), - Reaction::iNew(species, thermoDb) - ), - species_(species), - thermoDb_(thermoDb), - dict_(dictionary::null) -{} - - template Foam::ReactionList::ReactionList(const ReactionList& reactions) : diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H index c9a4b2c00..6251fda9e 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,14 +93,6 @@ public: const dictionary& dict ); - //- Construct from file using (Istream) - ReactionList - ( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - const fileName& fName - ); - //- Construct copy ReactionList(const ReactionList& reactions); diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C index fb62950ff..2183986e2 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,25 +45,6 @@ ReversibleReaction {} -template -< - template class ReactionType, - class ReactionThermo, - class ReactionRate -> -Foam::ReversibleReaction:: -ReversibleReaction -( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is -) -: - ReactionType(species, thermoDatabase, is), - k_(species, is) -{} - - template < template class ReactionType, diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H index fd801d347..798b75759 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,14 +103,6 @@ public: const speciesTable& species ); - //- Construct from Istream - ReversibleReaction - ( - const speciesTable& species, - const HashPtrTable& thermoDatabase, - Istream& is - ); - //- Construct from dictionary ReversibleReaction ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H index deb1bb2eb..fbe89154b 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,13 +77,6 @@ public: const scalar Ta ); - //- Construct from Istream - inline ArrheniusReactionRate - ( - const speciesTable& species, - Istream& is - ); - //- Construct from dictionary inline ArrheniusReactionRate ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H index 273e15fd9..5c67a60e9 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,20 +38,6 @@ inline Foam::ArrheniusReactionRate::ArrheniusReactionRate {} -inline Foam::ArrheniusReactionRate::ArrheniusReactionRate -( - const speciesTable&, - Istream& is -) -: - A_(readScalar(is.readBegin("ArrheniusReactionRate(Istream&)"))), - beta_(readScalar(is)), - Ta_(readScalar(is)) -{ - is.readEnd("ArrheniusReactionRate(Istream&)"); -} - - inline Foam::ArrheniusReactionRate::ArrheniusReactionRate ( const speciesTable&, diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H index 75a8fa507..87eab0d40 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,13 +84,6 @@ public: const thirdBodyEfficiencies& tbes ); - //- Construct from Istream - inline ChemicallyActivatedReactionRate - ( - const speciesTable& species, - Istream& is - ); - //- Construct from dictionary inline ChemicallyActivatedReactionRate ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H index 952ceaa74..f8e71fd4e 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,26 +45,6 @@ inline Foam::ChemicallyActivatedReactionRate {} -template -inline Foam::ChemicallyActivatedReactionRate -< - ReactionRate, - ChemicallyActivationFunction ->::ChemicallyActivatedReactionRate -( - const speciesTable& species, - Istream& is -) -: - k0_(species, is.readBegin("ChemicallyActivatedReactionRate(Istream&)")), - kInf_(species, is), - F_(is), - thirdBodyEfficiencies_(species, is) -{ - is.readEnd("ChemicallyActivatedReactionRate(Istream&)"); -} - - template inline Foam::ChemicallyActivatedReactionRate < diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H index d668f214d..e89aa8949 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,13 +83,6 @@ public: const thirdBodyEfficiencies& tbes ); - //- Construct from Istream - inline FallOffReactionRate - ( - const speciesTable& species, - Istream& is - ); - //- Construct from dictionary inline FallOffReactionRate ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H index 954816aca..0b7fa5f03 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,23 +42,6 @@ FallOffReactionRate {} -template -inline Foam::FallOffReactionRate:: -FallOffReactionRate -( - const speciesTable& species, - Istream& is -) -: - k0_(species, is.readBegin("FallOffReactionRate(Istream&)")), - kInf_(species, is), - F_(is), - thirdBodyEfficiencies_(species, is) -{ - is.readEnd("FallOffReactionRate(Istream&)"); -} - - template inline Foam::FallOffReactionRate:: FallOffReactionRate diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H index bf3d10c6b..ab37e054f 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,13 +80,6 @@ public: const FixedList b ); - //- Construct from Istream - inline JanevReactionRate - ( - const speciesTable& species, - Istream& is - ); - //- Construct from dictionary inline JanevReactionRate ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H index 381a94e58..055d6291d 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,21 +40,6 @@ inline Foam::JanevReactionRate::JanevReactionRate {} -inline Foam::JanevReactionRate::JanevReactionRate -( - const speciesTable&, - Istream& is -) -: - A_(readScalar(is.readBegin("JanevReactionRate(Istream&)"))), - beta_(readScalar(is)), - Ta_(readScalar(is)), - b_(is) -{ - is.readEnd("JanevReactionRate(Istream&)"); -} - - inline Foam::JanevReactionRate::JanevReactionRate ( const speciesTable&, diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H index cba8b20cb..c353475be 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,13 +79,6 @@ public: const scalar C ); - //- Construct from Istream - inline LandauTellerReactionRate - ( - const speciesTable& species, - Istream& is - ); - //- Construct from dictionary inline LandauTellerReactionRate ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H index d3b1b79ec..56a636e9c 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,22 +42,6 @@ inline Foam::LandauTellerReactionRate::LandauTellerReactionRate {} -inline Foam::LandauTellerReactionRate::LandauTellerReactionRate -( - const speciesTable&, - Istream& is -) -: - A_(readScalar(is.readBegin("LandauTellerReactionRate(Istream&)"))), - beta_(readScalar(is)), - Ta_(readScalar(is)), - B_(readScalar(is)), - C_(readScalar(is)) -{ - is.readEnd("LandauTellerReactionRate(Istream&)"); -} - - inline Foam::LandauTellerReactionRate::LandauTellerReactionRate ( const speciesTable&, diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H index e96f9ea20..1d1c5dd33 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,13 +81,6 @@ public: const label no ); - //- Construct from Istream - inline LangmuirHinshelwoodReactionRate - ( - const speciesTable& species, - Istream& is - ); - //- Construct from dictionary inline LangmuirHinshelwoodReactionRate ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H index 26fd07bfa..029d25444 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,27 +49,6 @@ inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate } -inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate -( - const speciesTable& st, - Istream& is -) -: - co_(st["CO"]), - c3h6_(st["C3H6"]), - no_(st["NO"]) -{ - is.readBegin("LangmuirHinshelwoodReactionRate(Istream&)"); - - for (int i=0; i> A_[i] >> Ta_[i]; - } - - is.readEnd("LangmuirHinshelwoodReactionRate(Istream&)"); -} - - inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate ( const speciesTable& st, diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H index 298ca332c..76c2f3acc 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,9 +62,6 @@ public: //- Construct null inline LindemannFallOffFunction(); - //- Construct from Istream - inline LindemannFallOffFunction(Istream&); - //- Construct from dictionary inline LindemannFallOffFunction(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H index 1dd6ba4b5..8421898b6 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,10 +29,6 @@ inline Foam::LindemannFallOffFunction::LindemannFallOffFunction() {} -inline Foam::LindemannFallOffFunction::LindemannFallOffFunction(Istream&) -{} - - inline Foam::LindemannFallOffFunction::LindemannFallOffFunction ( const dictionary& dict diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H index 60e9bdfbd..2a73db4be 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,9 +73,6 @@ public: const scalar e ); - //- Construct from Istream - inline SRIFallOffFunction(Istream&); - //- Construct from dictionary inline SRIFallOffFunction(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H index 6c3dd203d..df4588547 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,18 +42,6 @@ inline Foam::SRIFallOffFunction::SRIFallOffFunction {} -inline Foam::SRIFallOffFunction::SRIFallOffFunction(Istream& is) -: - a_(readScalar(is.readBegin("SRIFallOffFunction(Istream&)"))), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)), - e_(readScalar(is)) -{ - is.readEnd("SRIFallOffFunction(Istream&)"); -} - - inline Foam::SRIFallOffFunction::SRIFallOffFunction(const dictionary& dict) : a_(readScalar(dict.lookup("a"))), diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H index ba1437831..18b39038f 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,9 +73,6 @@ public: const scalar Tss ); - //- Construct from Istream - inline TroeFallOffFunction(Istream&); - //- Construct from dictionary inline TroeFallOffFunction(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H index 74a8e0a17..ff504a29f 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,17 +40,6 @@ inline Foam::TroeFallOffFunction::TroeFallOffFunction {} -inline Foam::TroeFallOffFunction::TroeFallOffFunction(Istream& is) -: - alpha_(readScalar(is.readBegin("TroeFallOffFunction(Istream&)"))), - Tsss_(readScalar(is)), - Ts_(readScalar(is)), - Tss_(readScalar(is)) -{ - is.readEnd("TroeFallOffFunction(Istream&)"); -} - - inline Foam::TroeFallOffFunction::TroeFallOffFunction(const dictionary& dict) : alpha_(readScalar(dict.lookup("alpha"))), diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H index 47dde38b4..ec8abe2cd 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ public: inline infiniteReactionRate (); - //- Construct from Istream + //- Construct from dictionary inline infiniteReactionRate ( const speciesTable& species, diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H index a8561815b..f12d3ba0d 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,13 +80,6 @@ public: const FixedList coeffs ); - //- Construct from Istream - inline powerSeriesReactionRate - ( - const speciesTable& species, - Istream& is - ); - //- Construct from dictionary inline powerSeriesReactionRate ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H index c14d32964..5cee7f9b7 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,21 +40,6 @@ inline Foam::powerSeriesReactionRate::powerSeriesReactionRate {} -inline Foam::powerSeriesReactionRate::powerSeriesReactionRate -( - const speciesTable&, - Istream& is -) -: - A_(readScalar(is.readBegin("powerSeriesReactionRate(Istream&)"))), - beta_(readScalar(is)), - Ta_(readScalar(is)), - coeffs_(is) -{ - is.readEnd("powerSeriesReactionRate(Istream&)"); -} - - inline Foam::powerSeriesReactionRate::powerSeriesReactionRate ( const speciesTable&, diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H index 9e7599ac7..c12d914c6 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,13 +76,6 @@ public: const thirdBodyEfficiencies& tbes ); - //- Construct from Istream - inline thirdBodyArrheniusReactionRate - ( - const speciesTable& species, - Istream& is - ); - //- Construct from dictionary inline thirdBodyArrheniusReactionRate ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H index 0cba38cee..711dfde0e 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,23 +38,6 @@ inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate {} -inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate -( - const speciesTable& species, - Istream& is -) -: - ArrheniusReactionRate - ( - species, - is.readBegin("thirdBodyArrheniusReactionRate(Istream&)") - ), - thirdBodyEfficiencies_(species, is) -{ - is.readEnd("thirdBodyArrheniusReactionRate(Istream&)"); -} - - inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate ( const speciesTable& species, diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H index 8b164da17..62b80cb37 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,13 +73,6 @@ public: const scalarList& efficiencies ); - //- Construct from Istream - inline thirdBodyEfficiencies - ( - const speciesTable& species, - Istream& is - ); - //- Construct from dictionary inline thirdBodyEfficiencies ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H index 59c25bcf4..d77df740b 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,62 +46,6 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies } -inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies -( - const speciesTable& species, - Istream& is -) -: - scalarList(species.size()), - species_(species) -{ - is.readBeginList - ( - "thirdBodyEfficiencies::thirdBodyEfficiencies" - "(const speciesTable& species, Istream& is)" - ); - scalar defaultEff = readScalar(is); - scalarList::operator=(defaultEff); - - token t; - - while ((is >> t) && !t.isPunctuation()) - { - if (t.isWord()) - { - operator[](species[t.wordToken()]) = readScalar(is); - } - else - { - FatalIOErrorInFunction - ( - is - ) << "expected , found " << t.info() - << exit(FatalIOError); - } - } - - if (t.pToken() != token::END_LIST) - { - FatalIOErrorInFunction - ( - is - ) << "expected ')', found " << t.info() - << exit(FatalIOError); - } - - if (size() != species_.size()) - { - FatalIOErrorInFunction - ( - is - ) << "number of efficiencies = " << size() - << " is not equal to the number of species " << species_.size() - << exit(FatalIOError); - } -} - - inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies ( const speciesTable& species, diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H index 74cf7c1e4..ba51a746c 100644 --- a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H +++ b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,13 +73,6 @@ namespace Foam ); \ \ addToRunTimeSelectionTable \ - ( \ - Reaction##Thermo, \ - ReactionType##Thermo##ReactionRate, \ - Istream \ - ); \ - \ - addToRunTimeSelectionTable \ ( \ Reaction##Thermo, \ ReactionType##Thermo##ReactionRate, \ @@ -121,7 +114,7 @@ namespace Foam makeReaction(Thermo, NonEquilibriumReversibleReaction, ReactionRate) -#define makePressureDependentReactions(Thermo, ReactionRate, FallOffFunction) \ +#define makePressureDependentReactions(Thermo, ReactionRate, FallOffFunction) \ \ makePressureDependentReaction \ ( \ diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C index 96352b2c9..d6b9a3c0b 100644 --- a/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C +++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,6 @@ License #define makeReactions(Thermo, Reaction) \ \ defineTemplateTypeNameAndDebug(Reaction, 0); \ - defineTemplateRunTimeSelectionTable(Reaction, Istream); \ defineTemplateRunTimeSelectionTable(Reaction, dictionary); \ \ makeIRNReactions(Thermo, ArrheniusReactionRate) \ diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C index b507212cd..508d75562 100644 --- a/src/thermophysicalModels/specie/specie/specie.C +++ b/src/thermophysicalModels/specie/specie/specie.C @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "specie.H" -#include "IOstreams.H" #include "constants.H" /* * * * * * * * * * * * * * * public constants * * * * * * * * * * * * * * */ @@ -37,16 +36,6 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::specie::specie(Istream& is) -: - name_(is), - Y_(readScalar(is)), - molWeight_(readScalar(is)) -{ - is.check("specie::specie(Istream& is)"); -} - - Foam::specie::specie(const dictionary& dict) : name_(dict.dictName()), @@ -73,10 +62,7 @@ void Foam::specie::write(Ostream& os) const Foam::Ostream& Foam::operator<<(Ostream& os, const specie& st) { - os << st.name_ << tab - << st.Y_ << tab - << st.molWeight_; - + st.write(os); os.check("Ostream& operator<<(Ostream& os, const specie& st)"); return os; } diff --git a/src/thermophysicalModels/specie/specie/specie.H b/src/thermophysicalModels/specie/specie/specie.H index 52ebcbe13..192c42931 100644 --- a/src/thermophysicalModels/specie/specie/specie.H +++ b/src/thermophysicalModels/specie/specie/specie.H @@ -96,15 +96,9 @@ public: const scalar molWeight ); - //- Construct as copy - inline specie(const specie&); - //- Construct as named copy inline specie(const word& name, const specie&); - //- Construct from Istream - specie(Istream&); - //- Construct from dictionary specie(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/specie/specieI.H b/src/thermophysicalModels/specie/specie/specieI.H index fb8255dbe..222ca1cee 100644 --- a/src/thermophysicalModels/specie/specie/specieI.H +++ b/src/thermophysicalModels/specie/specie/specieI.H @@ -58,14 +58,6 @@ inline specie::specie // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -inline specie::specie(const specie& st) -: - name_(st.name_), - Y_(st.Y_), - molWeight_(st.molWeight_) -{} - - inline specie::specie(const word& name, const specie& st) : name_(name), diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C index d38693c03..fa283c711 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C @@ -28,17 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::eConstThermo::eConstThermo(Istream& is) -: - EquationOfState(is), - Cv_(readScalar(is)), - Hf_(readScalar(is)) -{ - is.check("eConstThermo::eConstThermo(Istream&)"); -} - - template Foam::eConstThermo::eConstThermo(const dictionary& dict) : @@ -71,10 +60,7 @@ Foam::Ostream& Foam::operator<< const eConstThermo& ct ) { - os << static_cast(ct) << tab - << ct.Cv_ << tab << ct.Hf_; - - os.check("Ostream& operator<<(Ostream&, const eConstThermo&)"); + ct.write(os); return os; } diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H index 9f5354ca9..2a9c599ff 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H @@ -112,9 +112,6 @@ public: // Constructors - //- Construct from Istream - eConstThermo(Istream&); - //- Construct from dictionary eConstThermo(const dictionary& dict); @@ -124,9 +121,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H index e6c1b84af..4b5ba8005 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H @@ -65,17 +65,6 @@ Foam::eConstThermo::clone() const } -template -inline Foam::autoPtr> -Foam::eConstThermo::New(Istream& is) -{ - return autoPtr> - ( - new eConstThermo(is) - ); -} - - template inline Foam::autoPtr> Foam::eConstThermo::New(const dictionary& dict) diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C index 2f892cbbf..1bfc38045 100644 --- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C +++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C @@ -28,17 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::hConstThermo::hConstThermo(Istream& is) -: - EquationOfState(is), - Cp_(readScalar(is)), - Hf_(readScalar(is)) -{ - is.check("hConstThermo::hConstThermo(Istream& is)"); -} - - template Foam::hConstThermo::hConstThermo(const dictionary& dict) : @@ -71,10 +60,7 @@ Foam::Ostream& Foam::operator<< const hConstThermo& ct ) { - os << static_cast(ct) << tab - << ct.Cp_ << tab << ct.Hf_; - - os.check("Ostream& operator<<(Ostream& os, const hConstThermo& ct)"); + ct.write(os); return os; } diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H index 7c04be81e..dadbb0712 100644 --- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H +++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H @@ -105,9 +105,6 @@ public: // Constructors - //- Construct from Istream - hConstThermo(Istream&); - //- Construct from dictionary hConstThermo(const dictionary& dict); @@ -117,9 +114,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - //- Selector from Istream - inline static autoPtr New(Istream& is); - //- Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H index ebed57e43..09dcb9860 100644 --- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H @@ -65,17 +65,6 @@ Foam::hConstThermo::clone() const } -template -inline Foam::autoPtr> -Foam::hConstThermo::New(Istream& is) -{ - return autoPtr> - ( - new hConstThermo(is) - ); -} - - template inline Foam::autoPtr> Foam::hConstThermo::New(const dictionary& dict) diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C index 0aa43c1f7..2f7817e0b 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C @@ -28,30 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::hPolynomialThermo::hPolynomialThermo -( - Istream& is -) -: - EquationOfState(is), - Hf_(readScalar(is)), - Sf_(readScalar(is)), - CpCoeffs_("CpCoeffs<" + Foam::name(PolySize) + '>', is), - hCoeffs_(), - sCoeffs_() -{ - hCoeffs_ = CpCoeffs_.integral(); - sCoeffs_ = CpCoeffs_.integralMinus1(); - - // Offset h poly so that it is relative to the enthalpy at Tstd - hCoeffs_[0] += Hf_ - hCoeffs_.value(Tstd); - - // Offset s poly so that it is relative to the entropy at Tstd - sCoeffs_[0] += Sf_ - sCoeffs_.value(Tstd); -} - - template Foam::hPolynomialThermo::hPolynomialThermo ( @@ -113,21 +89,7 @@ Foam::Ostream& Foam::operator<< const hPolynomialThermo& pt ) { - os << static_cast(pt) << tab - << pt.Hf_ << tab - << pt.Sf_ << tab - << "CpCoeffs<" << Foam::name(PolySize) << '>' << tab - << pt.CpCoeffs_/pt; - - os.check - ( - "operator<<" - "(" - "Ostream&, " - "const hPolynomialThermo&" - ")" - ); - + pt.write(os); return os; } diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H index d8acaee18..f9b73bd93 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H @@ -161,15 +161,9 @@ public: // Constructors - //- Construct from Istream - hPolynomialThermo(Istream& is); - //- Construct from dictionary hPolynomialThermo(const dictionary& dict); - //- Construct as copy - inline hPolynomialThermo(const hPolynomialThermo&); - //- Construct as a named copy inline hPolynomialThermo(const word&, const hPolynomialThermo&); diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H index 26049dfc5..fb5ac1bde 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H @@ -49,21 +49,6 @@ inline Foam::hPolynomialThermo::hPolynomialThermo // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline Foam::hPolynomialThermo::hPolynomialThermo -( - const hPolynomialThermo& pt -) -: - EquationOfState(pt), - Hf_(pt.Hf_), - Sf_(pt.Sf_), - CpCoeffs_(pt.CpCoeffs_), - hCoeffs_(pt.hCoeffs_), - sCoeffs_(pt.sCoeffs_) -{} - - template inline Foam::hPolynomialThermo::hPolynomialThermo ( diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C index bab5f226a..5e742e238 100644 --- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C +++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C @@ -28,18 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::hPowerThermo::hPowerThermo(Istream& is) -: - EquationOfState(is), - n0_(readScalar(is)), - Tref_(readScalar(is)), - Hf_(readScalar(is)) -{ - is.check("hPowerThermo::hPowerThermo(Istream& is)"); -} - - template Foam::hPowerThermo::hPowerThermo ( @@ -63,21 +51,7 @@ Foam::Ostream& Foam::operator<< const hPowerThermo& et ) { - os << static_cast(et) << nl - << " " << et.c0_ - << tab << et.n0_ - << tab << et.Tref_ - << tab << et.Hf_; - - os << nl << " "; - - os << endl; - - os.check - ( - "operator<<(Ostream& os, const hPowerThermo& et)" - ); - + et.write(os); return os; } diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H index be30a506a..7ca3b2bbd 100644 --- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H +++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H @@ -122,9 +122,6 @@ public: // Constructors - //- Construct from Istream - hPowerThermo(Istream&); - //- Construct from dictionary hPowerThermo(const dictionary&); @@ -138,9 +135,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - //- Selector from Istream - inline static autoPtr New(Istream& is); - //- Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H index e5160d973..3f22215db 100644 --- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H @@ -90,17 +90,6 @@ Foam::hPowerThermo::clone() const } -template -inline Foam::autoPtr> -Foam::hPowerThermo::New(Istream& is) -{ - return autoPtr> - ( - new hPowerThermo(is) - ); -} - - template inline Foam::autoPtr> Foam::hPowerThermo::New(const dictionary& dict) diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C index a73c8748f..c7a8cb422 100644 --- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C +++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C @@ -28,19 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::hRefConstThermo::hRefConstThermo(Istream& is) -: - EquationOfState(is), - Cp_(readScalar(is)), - Hf_(readScalar(is)), - Tref_(readScalar(is)), - Href_(readScalar(is)) -{ - is.check("hRefConstThermo::hRefConstThermo(Istream& is)"); -} - - template Foam::hRefConstThermo::hRefConstThermo(const dictionary& dict) : @@ -77,11 +64,7 @@ Foam::Ostream& Foam::operator<< const hRefConstThermo& ct ) { - os << static_cast(ct) << tab - << ct.Cp_ << tab << ct.Hf_ << tab - << ct.Tref_ << tab << ct.Href_; - - os.check("Ostream& operator<<(Ostream& os, const hRefConstThermo& ct)"); + ct.write(os); return os; } diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H index 0bb182038..5af026540 100644 --- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H +++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H @@ -109,9 +109,6 @@ public: // Constructors - //- Construct from Istream - hRefConstThermo(Istream&); - //- Construct from dictionary hRefConstThermo(const dictionary& dict); @@ -121,9 +118,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - //- Selector from Istream - inline static autoPtr New(Istream& is); - //- Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H index 941c4b5e8..575a648dd 100644 --- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H @@ -71,17 +71,6 @@ Foam::hRefConstThermo::clone() const } -template -inline Foam::autoPtr> -Foam::hRefConstThermo::New(Istream& is) -{ - return autoPtr> - ( - new hRefConstThermo(is) - ); -} - - template inline Foam::autoPtr> Foam::hRefConstThermo::New(const dictionary& dict) diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C index 44c053e0f..6a4d0d4dc 100644 --- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C +++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C @@ -112,32 +112,7 @@ Foam::Ostream& Foam::operator<< const janafThermo& jt ) { - os << static_cast(jt) << nl - << " " << jt.Tlow_ - << tab << jt.Thigh_ - << tab << jt.Tcommon_; - - os << nl << " "; - - forAll(jt.highCpCoeffs_, i) - { - os << jt.highCpCoeffs_[i]/jt.R() << ' '; - } - - os << nl << " "; - - forAll(jt.lowCpCoeffs_, i) - { - os << jt.lowCpCoeffs_[i]/jt.R() << ' '; - } - - os << endl; - - os.check - ( - "operator<<(Ostream& os, const janafThermo& jt)" - ); - + jt.write(os); return os; } diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.C b/src/thermophysicalModels/specie/thermo/thermo/thermo.C index 400c2d4a8..09ce3f1d5 100644 --- a/src/thermophysicalModels/specie/thermo/thermo/thermo.C +++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "thermo.H" -#include "IOstreams.H" /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */ @@ -37,15 +36,6 @@ const int Foam::species::thermo::maxIter_ = 100; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template class Type> -Foam::species::thermo::thermo(Istream& is) -: - Thermo(is) -{ - is.check("thermo::thermo(Istream&)"); -} - - template class Type> Foam::species::thermo::thermo(const dictionary& dict) : @@ -70,9 +60,7 @@ Foam::Ostream& Foam::species::operator<< Ostream& os, const thermo& st ) { - os << static_cast(st); - - os.check("Ostream& operator<<(Ostream&, const thermo&)"); + st.write(os); return os; } diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H index cc25cbaad..a5cdba6ec 100644 --- a/src/thermophysicalModels/specie/thermo/thermo/thermo.H +++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H @@ -127,9 +127,6 @@ public: //- Construct from components inline thermo(const Thermo& sp); - //- Construct from Istream - thermo(Istream&); - //- Construct from dictionary thermo(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C index 92e4a19e4..8b709c9c8 100644 --- a/src/thermophysicalModels/specie/transport/const/constTransport.C +++ b/src/thermophysicalModels/specie/transport/const/constTransport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,17 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::constTransport::constTransport(Istream& is) -: - Thermo(is), - mu_(readScalar(is)), - rPr_(1.0/readScalar(is)) -{ - is.check("constTransport::constTransport(Istream& is)"); -} - - template Foam::constTransport::constTransport(const dictionary& dict) : @@ -72,11 +61,7 @@ void Foam::constTransport::constTransport::write(Ostream& os) const template Foam::Ostream& Foam::operator<<(Ostream& os, const constTransport& ct) { - operator<<(os, static_cast(ct)); - os << tab << ct.mu_ << tab << 1.0/ct.rPr_; - - os.check("Ostream& operator<<(Ostream&, const constTransport&)"); - + ct.write(os); return os; } diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H index 2c4be8d4d..1caad9bd7 100644 --- a/src/thermophysicalModels/specie/transport/const/constTransport.H +++ b/src/thermophysicalModels/specie/transport/const/constTransport.H @@ -105,18 +105,12 @@ public: //- Construct as named copy inline constTransport(const word&, const constTransport&); - //- Construct from Istream - constTransport(Istream&); - //- Construct from dictionary constTransport(const dictionary& dict); //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H index 71a210217..ab865dd9a 100644 --- a/src/thermophysicalModels/specie/transport/const/constTransportI.H +++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H @@ -63,20 +63,6 @@ Foam::constTransport::clone() const } -template -inline Foam::autoPtr> -Foam::constTransport::New -( - Istream& is -) -{ - return autoPtr> - ( - new constTransport(is) - ); -} - - template inline Foam::autoPtr> Foam::constTransport::New diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C index 0d53683fc..27366f289 100644 --- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C +++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C @@ -28,18 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::logPolynomialTransport::logPolynomialTransport -( - Istream& is -) -: - Thermo(is), - muCoeffs_("muLogCoeffs<" + Foam::name(PolySize) + '>', is), - kappaCoeffs_("kappaLogCoeffs<" + Foam::name(PolySize) + '>', is) -{} - - template Foam::logPolynomialTransport::logPolynomialTransport ( @@ -100,21 +88,7 @@ Foam::Ostream& Foam::operator<< const logPolynomialTransport& pt ) { - os << static_cast(pt) << tab - << "muLogCoeffs<" << Foam::name(PolySize) << '>' << tab - << pt.muCoeffs_ << tab - << "kappaLogCoeffs<" << Foam::name(PolySize) << '>' << tab - << pt.kappaCoeffs_; - - os.check - ( - "Ostream& operator<<" - "(" - "Ostream&, " - "const logPolynomialTransport&" - ")" - ); - + pt.write(os); return os; } diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H index 01b4fc9f3..712ae3311 100644 --- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H +++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H @@ -149,9 +149,6 @@ public: // Constructors - //- Construct copy - inline logPolynomialTransport(const logPolynomialTransport&); - //- Construct as named copy inline logPolynomialTransport ( @@ -159,18 +156,12 @@ public: const logPolynomialTransport& ); - //- Construct from Istream - logPolynomialTransport(Istream& is); - //- Construct from dictionary logPolynomialTransport(const dictionary& dict); //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New ( diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H index 514d243de..29c155369 100644 --- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H +++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H @@ -27,18 +27,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline Foam::logPolynomialTransport::logPolynomialTransport -( - const logPolynomialTransport& pt -) -: - Thermo(pt), - muCoeffs_(pt.muCoeffs_), - kappaCoeffs_(pt.kappaCoeffs_) -{} - - template inline Foam::logPolynomialTransport::logPolynomialTransport ( @@ -77,17 +65,6 @@ Foam::logPolynomialTransport::clone() const } -template -inline Foam::autoPtr> -Foam::logPolynomialTransport::New(Istream& is) -{ - return autoPtr> - ( - new logPolynomialTransport(is) - ); -} - - template inline Foam::autoPtr> Foam::logPolynomialTransport::New(const dictionary& dict) diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C index adcc8485d..cb907dd01 100644 --- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C +++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C @@ -28,15 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::polynomialTransport::polynomialTransport(Istream& is) -: - Thermo(is), - muCoeffs_("muCoeffs<" + Foam::name(PolySize) + '>', is), - kappaCoeffs_("kappaCoeffs<" + Foam::name(PolySize) + '>', is) -{} - - template Foam::polynomialTransport::polynomialTransport ( @@ -97,21 +88,7 @@ Foam::Ostream& Foam::operator<< const polynomialTransport& pt ) { - os << static_cast(pt) << tab - << "muCoeffs<" << Foam::name(PolySize) << '>' << tab - << pt.muCoeffs_ << tab - << "kappaCoeffs<" << Foam::name(PolySize) << '>' << tab - << pt.kappaCoeffs_; - - os.check - ( - "Ostream& operator<<" - "(" - "Ostream&, " - "const polynomialTransport&" - ")" - ); - + pt.write(os); return os; } diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H index 8b7c95ced..425706f02 100644 --- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H +++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H @@ -138,24 +138,15 @@ public: // Constructors - //- Construct copy - inline polynomialTransport(const polynomialTransport&); - //- Construct as named copy inline polynomialTransport(const word&, const polynomialTransport&); - //- Construct from Istream - polynomialTransport(Istream& is); - //- Construct from dictionary polynomialTransport(const dictionary& dict); //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H index 501c9f063..3715ccbb1 100644 --- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H +++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H @@ -27,18 +27,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline Foam::polynomialTransport::polynomialTransport -( - const polynomialTransport& pt -) -: - Thermo(pt), - muCoeffs_(pt.muCoeffs_), - kappaCoeffs_(pt.kappaCoeffs_) -{} - - template inline Foam::polynomialTransport::polynomialTransport ( @@ -77,17 +65,6 @@ Foam::polynomialTransport::clone() const } -template -inline Foam::autoPtr> -Foam::polynomialTransport::New(Istream& is) -{ - return autoPtr> - ( - new polynomialTransport(is) - ); -} - - template inline Foam::autoPtr> Foam::polynomialTransport::New(const dictionary& dict) diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C index db8cc7302..1fa078901 100644 --- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C +++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,17 +41,6 @@ Foam::scalar Foam::sutherlandTransport::readCoeff // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::sutherlandTransport::sutherlandTransport(Istream& is) -: - Thermo(is), - As_(readScalar(is)), - Ts_(readScalar(is)) -{ - is.check("sutherlandTransport::sutherlandTransport(Istream&)"); -} - - template Foam::sutherlandTransport::sutherlandTransport(const dictionary& dict) : @@ -102,13 +91,7 @@ Foam::Ostream& Foam::operator<< const sutherlandTransport& st ) { - os << static_cast(st) << tab << st.As_ << tab << st.Ts_; - - os.check - ( - "Ostream& operator<<(Ostream&, const sutherlandTransport&)" - ); - + st.write(os); return os; } diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H index 1acc05bcc..0551a566f 100644 --- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H +++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H @@ -127,9 +127,6 @@ public: //- Construct as named copy inline sutherlandTransport(const word&, const sutherlandTransport&); - //- Construct from Istream - sutherlandTransport(Istream&); - //- Construct from dictionary sutherlandTransport(const dictionary& dict); @@ -139,9 +136,6 @@ public: //- Construct and return a clone inline autoPtr clone() const; - // Selector from Istream - inline static autoPtr New(Istream& is); - // Selector from dictionary inline static autoPtr New(const dictionary& dict); diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H index 71b444907..b5a0f6835 100644 --- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H +++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H @@ -98,20 +98,6 @@ Foam::sutherlandTransport::clone() const } -template -inline Foam::autoPtr> -Foam::sutherlandTransport::New -( - Istream& is -) -{ - return autoPtr> - ( - new sutherlandTransport(is) - ); -} - - template inline Foam::autoPtr> Foam::sutherlandTransport::New diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C index c28171c3b..ff23b1840 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C +++ b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,12 +32,6 @@ namespace Foam { defineTypeNameAndDebug(APIdiffCoefFunc, 0); addToRunTimeSelectionTable - ( - thermophysicalFunction, - APIdiffCoefFunc, - Istream - ); - addToRunTimeSelectionTable ( thermophysicalFunction, APIdiffCoefFunc, @@ -64,17 +58,6 @@ Foam::APIdiffCoefFunc::APIdiffCoefFunc {} -Foam::APIdiffCoefFunc::APIdiffCoefFunc(Istream& is) -: - a_(readScalar(is)), - b_(readScalar(is)), - wf_(readScalar(is)), - wa_(readScalar(is)), - alpha_(sqrt(1/wf_ + 1/wa_)), - beta_(sqr((cbrt(a_) + cbrt(b_)))) -{} - - Foam::APIdiffCoefFunc::APIdiffCoefFunc(const dictionary& dict) : a_(readScalar(dict.lookup("a"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H index 164be51f0..a431bdee6 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H +++ b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,9 +79,6 @@ public: const scalar wa ); - //- Construct from Istream - APIdiffCoefFunc(Istream& is); - //- Construct from dictionary APIdiffCoefFunc(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C index fa6bf14bb..0fccd567f 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,6 @@ License namespace Foam { defineTypeNameAndDebug(NSRDSfunc0, 0); - addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc0, Istream); addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc0, dictionary); } @@ -56,17 +55,6 @@ Foam::NSRDSfunc0::NSRDSfunc0 {} -Foam::NSRDSfunc0::NSRDSfunc0(Istream& is) -: - a_(readScalar(is)), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)), - e_(readScalar(is)), - f_(readScalar(is)) -{} - - Foam::NSRDSfunc0::NSRDSfunc0(const dictionary& dict) : a_(readScalar(dict.lookup("a"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H index a6da31dad..38a4e7d2b 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,9 +94,6 @@ public: const scalar f ); - //- Construct from Istream - NSRDSfunc0(Istream& is); - //- Construct from dictionary NSRDSfunc0(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C index b7db74837..60b61614b 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,6 @@ License namespace Foam { defineTypeNameAndDebug(NSRDSfunc1, 0); - addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc1, Istream); addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc1, dictionary); } @@ -54,16 +53,6 @@ Foam::NSRDSfunc1::NSRDSfunc1 {} -Foam::NSRDSfunc1::NSRDSfunc1(Istream& is) -: - a_(readScalar(is)), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)), - e_(readScalar(is)) -{} - - Foam::NSRDSfunc1::NSRDSfunc1(const dictionary& dict) : a_(readScalar(dict.lookup("a"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H index 87ba13277..c9c8e1088 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,9 +93,6 @@ public: const scalar e ); - //- Construct from Istream - NSRDSfunc1(Istream& is); - //- Construct from dictionary NSRDSfunc1(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C index b8e8c4431..b5aa06693 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,6 @@ License namespace Foam { defineTypeNameAndDebug(NSRDSfunc14, 0); - addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc14, Istream); addToRunTimeSelectionTable ( thermophysicalFunction, @@ -59,16 +58,6 @@ Foam::NSRDSfunc14::NSRDSfunc14 {} -Foam::NSRDSfunc14::NSRDSfunc14(Istream& is) -: - Tc_(readScalar(is)), - a_(readScalar(is)), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)) -{} - - Foam::NSRDSfunc14::NSRDSfunc14(const dictionary& dict) : Tc_(readScalar(dict.lookup("Tc"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H index 4e1890384..719aa0789 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,9 +93,6 @@ public: const scalar d ); - //- Construct from Istream - NSRDSfunc14(Istream& is); - //- Construct from dictionary NSRDSfunc14(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C index 93da6a1ce..3365d08c5 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,6 @@ License namespace Foam { defineTypeNameAndDebug(NSRDSfunc2, 0); - addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc2, Istream); addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc2, dictionary); } @@ -52,15 +51,6 @@ Foam::NSRDSfunc2::NSRDSfunc2 {} -Foam::NSRDSfunc2::NSRDSfunc2(Istream& is) -: - a_(readScalar(is)), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)) -{} - - Foam::NSRDSfunc2::NSRDSfunc2(const dictionary& dict) : a_(readScalar(dict.lookup("a"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H index 3434eb9ef..58a7d4612 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,9 +92,6 @@ public: const scalar d ); - //- Construct from Istream - NSRDSfunc2(Istream& is); - //- Construct from dictionary NSRDSfunc2(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C index 9ed62c747..2c25a0ae6 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,6 @@ License namespace Foam { defineTypeNameAndDebug(NSRDSfunc3, 0); - addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc3, Istream); addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc3, dictionary); } @@ -52,15 +51,6 @@ Foam::NSRDSfunc3::NSRDSfunc3 {} -Foam::NSRDSfunc3::NSRDSfunc3(Istream& is) -: - a_(readScalar(is)), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)) -{} - - Foam::NSRDSfunc3::NSRDSfunc3(const dictionary& dict) : a_(readScalar(dict.lookup("a"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H index 18d8bc496..ad9809af7 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,9 +92,6 @@ public: const scalar d ); - //- Construct from Istream - NSRDSfunc3(Istream& is); - //- Construct from dictionary NSRDSfunc3(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C index 626b00366..809af7aa4 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,6 @@ License namespace Foam { defineTypeNameAndDebug(NSRDSfunc4, 0); - addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc4, Istream); addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc4, dictionary); } @@ -54,16 +53,6 @@ Foam::NSRDSfunc4::NSRDSfunc4 {} -Foam::NSRDSfunc4::NSRDSfunc4(Istream& is) -: - a_(readScalar(is)), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)), - e_(readScalar(is)) -{} - - Foam::NSRDSfunc4::NSRDSfunc4(const dictionary& dict) : a_(readScalar(dict.lookup("a"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H index 275ecbc82..6da5500b7 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,9 +93,6 @@ public: const scalar e ); - //- Construct from Istream - NSRDSfunc4(Istream& is); - //- Construct from dictionary NSRDSfunc4(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C index 151a17f26..0c6100beb 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,6 @@ License namespace Foam { defineTypeNameAndDebug(NSRDSfunc5, 0); - addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc5, Istream); addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc5, dictionary); } @@ -52,15 +51,6 @@ Foam::NSRDSfunc5::NSRDSfunc5 {} -Foam::NSRDSfunc5::NSRDSfunc5(Istream& is) -: - a_(readScalar(is)), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)) -{} - - Foam::NSRDSfunc5::NSRDSfunc5(const dictionary& dict) : a_(readScalar(dict.lookup("a"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H index ec6372c71..222c8686a 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,9 +92,6 @@ public: const scalar d ); - //- Construct from Istream - NSRDSfunc5(Istream& is); - //- Construct from dictionary NSRDSfunc5(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C index 5bfce5c5b..766d9e883 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,6 @@ License namespace Foam { defineTypeNameAndDebug(NSRDSfunc6, 0); - addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc6, Istream); addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc6, dictionary); } @@ -56,17 +55,6 @@ Foam::NSRDSfunc6::NSRDSfunc6 {} -Foam::NSRDSfunc6::NSRDSfunc6(Istream& is) -: - Tc_(readScalar(is)), - a_(readScalar(is)), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)), - e_(readScalar(is)) -{} - - Foam::NSRDSfunc6::NSRDSfunc6(const dictionary& dict) : Tc_(readScalar(dict.lookup("Tc"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H index e061dbb2b..4d8241ce9 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,9 +94,6 @@ public: const scalar e ); - //- Construct from Istream - NSRDSfunc6(Istream& is); - //- Construct from dictionary NSRDSfunc6(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C index 82f095e73..a508c91d9 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,6 @@ License namespace Foam { defineTypeNameAndDebug(NSRDSfunc7, 0); - addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc7, Istream); addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc7, dictionary); } @@ -54,16 +53,6 @@ Foam::NSRDSfunc7::NSRDSfunc7 {} -Foam::NSRDSfunc7::NSRDSfunc7(Istream& is) -: - a_(readScalar(is)), - b_(readScalar(is)), - c_(readScalar(is)), - d_(readScalar(is)), - e_(readScalar(is)) -{} - - Foam::NSRDSfunc7::NSRDSfunc7(const dictionary& dict) : a_(readScalar(dict.lookup("a"))), diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H index 0ce3da7c9..f61ec13c3 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H +++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,9 +93,6 @@ public: const scalar e ); - //- Construct from Istream - NSRDSfunc7(Istream& is); - //- Construct from dictionary NSRDSfunc7(const dictionary& dict); diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C index 16e8f0971..673e80162 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C +++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,45 +31,12 @@ License namespace Foam { defineTypeNameAndDebug(thermophysicalFunction, 0); - defineRunTimeSelectionTable(thermophysicalFunction, Istream); defineRunTimeSelectionTable(thermophysicalFunction, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr Foam::thermophysicalFunction::New -( - Istream& is -) -{ - if (debug) - { - InfoInFunction - << "Constructing thermophysicalFunction" - << endl; - } - - const word thermophysicalFunctionType(is); - - IstreamConstructorTable::iterator cstrIter = - IstreamConstructorTablePtr_->find(thermophysicalFunctionType); - - if (cstrIter == IstreamConstructorTablePtr_->end()) - { - FatalErrorInFunction - << "Unknown thermophysicalFunction type " - << thermophysicalFunctionType - << nl << nl - << "Valid thermophysicalFunction types are :" << endl - << IstreamConstructorTablePtr_->sortedToc() - << abort(FatalError); - } - - return autoPtr(cstrIter()(is)); -} - - Foam::autoPtr Foam::thermophysicalFunction::New ( const dictionary& dict @@ -87,7 +54,7 @@ Foam::autoPtr Foam::thermophysicalFunction::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(thermophysicalFunctionType); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (cstrIter == dictionaryConstructorTablePtr_->end()) { FatalErrorInFunction << "Unknown thermophysicalFunction type " diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H index 63d3b2887..8f263ed55 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H +++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,15 +59,6 @@ public: // Declare run-time constructor selection tables - declareRunTimeSelectionTable - ( - autoPtr, - thermophysicalFunction, - Istream, - (Istream& is), - (is) - ); - declareRunTimeSelectionTable ( autoPtr, @@ -84,9 +75,6 @@ public: thermophysicalFunction() {} - //- Return pointer to new thermophysicalFunction created from input - static autoPtr New(Istream& is); - //- Return pointer to new thermophysicalFunction created from dict static autoPtr New(const dictionary& dict);