diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C index 4e3a2fb252..1b6db173ce 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C @@ -35,11 +35,8 @@ Foam::chemistryModel::chemistryModel ) : CompType(mesh), - ODE(), - Y_(this->thermo().composition().Y()), - reactions_ ( dynamic_cast&>(this->thermo()) diff --git a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C index e4d6d974b1..63b3fd0dd3 100644 --- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C +++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C @@ -37,7 +37,7 @@ ODESolidChemistryModel : CompType(mesh), ODE(), - Ys_(this->solid().composition().Y()), + Ys_(this->solidThermo().composition().Y()), pyrolisisGases_ ( mesh.lookupObject @@ -45,12 +45,17 @@ ODESolidChemistryModel ), reactions_ ( - dynamic_cast& >(this->solid()) + dynamic_cast& > + ( + this->solidThermo() + ) ), solidThermo_ ( dynamic_cast& > - (this->solid()).solidData() + ( + this->solidThermo() + ).solidData() ), gasThermo_(pyrolisisGases_.size()), nGases_(pyrolisisGases_.size()), @@ -147,7 +152,7 @@ ODESolidChemistryModel // Calculate inital values of Ysi0 = rho*delta*Yi Ys0_[fieldI].internalField() = - this->solid().rho() + this->solidThermo().rho() *max(Ys_[fieldI], scalar(0.001))*mesh.V(); } } @@ -564,7 +569,7 @@ void Foam::ODESolidChemistryModel::calculate() IOobject::NO_WRITE, false ), - this->solid().rho() + this->solidThermo().rho() ); forAll(RRs_, i) @@ -585,8 +590,8 @@ void Foam::ODESolidChemistryModel::calculate() if (reactingCells_[celli]) { scalar rhoi = rho[celli]; - scalar Ti = this->solid().T()[celli]; - scalar pi = this->solid().p()[celli]; + scalar Ti = this->solidThermo().T()[celli]; + scalar pi = this->solidThermo().p()[celli]; scalarField c(nSpecie_, 0.0); for (label i=0; i::solve IOobject::NO_WRITE, false ), - this->solid().rho() + this->solidThermo().rho() ); forAll(RRs_, i) @@ -656,8 +661,8 @@ Foam::ODESolidChemistryModel::solve cellCounter_ = celli; scalar rhoi = rho[celli]; - scalar Ti = this->solid().T()[celli]; - scalar pi = this->solid().p()[celli]; + scalar Ti = this->solidThermo().T()[celli]; + scalar pi = this->solidThermo().p()[celli]; scalarField c(nSpecie_, 0.0); scalarField c0(nSpecie_, 0.0); diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H index 165188506c..bc5be73b72 100644 --- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H +++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H @@ -110,10 +110,10 @@ public: // Member Functions //- Return access to the solid thermo package - inline solidReactionThermo& solid(); + inline solidReactionThermo& solidThermo(); //- Return const access to the solid thermo package - inline const solidReactionThermo& solid() const; + inline const solidReactionThermo& solidThermo() const; //- Return total gases mass source term [kg/m3/s] virtual tmp > RRg() const = 0; diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H index 736a61076c..240f9c7118 100644 --- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H +++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.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-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,14 +25,14 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -inline Foam::solidReactionThermo& Foam::solidChemistryModel::solid() +inline Foam::solidReactionThermo& Foam::solidChemistryModel::solidThermo() { return solidThermo_(); } inline const Foam::solidReactionThermo& -Foam::solidChemistryModel::solid() const +Foam::solidChemistryModel::solidThermo() const { return solidThermo_(); } diff --git a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H index 15b0a1c6ea..c1269e8000 100644 --- a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H +++ b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H @@ -39,7 +39,6 @@ Description #include "constIsoSolidTransport.H" #include "constAnIsoSolidTransport.H" #include "exponentialSolidTransport.H" -#include "constSolidRad.H" #include "sensibleEnthalpy.H" #include "thermo.H" @@ -50,16 +49,13 @@ namespace Foam typedef constIsoSolidTransport < - constSolidRad + species::thermo < - species::thermo + hConstThermo < - hConstThermo - < - rhoConst - >, - sensibleEnthalpy - > + rhoConst + >, + sensibleEnthalpy > > hConstSolidThermoPhysics; @@ -67,16 +63,13 @@ namespace Foam typedef exponentialSolidTransport < - constSolidRad + species::thermo < - species::thermo + hExponentialThermo < - hExponentialThermo - < - rhoConst - >, - sensibleEnthalpy - > + rhoConst + >, + sensibleEnthalpy > > hExponentialSolidThermoPhysics; diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.C b/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.C deleted file mode 100644 index 8348899c45..0000000000 --- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.C +++ /dev/null @@ -1,78 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "constSolidRad.H" -#include "IOstreams.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -constSolidRad::constSolidRad(const dictionary& dict) -: - thermo(dict), - kappaRad_(readScalar(dict.subDict("radiation").lookup("kappaRad"))), - sigmaS_(readScalar(dict.subDict("radiation").lookup("sigmaS"))), - emissivity_(readScalar(dict.subDict("radiation").lookup("emissivity"))) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::constSolidRad::constSolidRad::write(Ostream& os) const -{ - thermo::write(os); - - dictionary dict("radiation"); - dict.add("kappaRad", kappaRad_); - dict.add("sigmaS", sigmaS_); - dict.add("emissivity", emissivity_); - os << indent << dict.dictName() << dict; -} - - -// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // - -template -Ostream& operator<<(Ostream& os, const constSolidRad& pg) -{ - os << static_cast(pg); - os << tab << pg.kappaRad_ << tab << pg.sigmaS_ << tab << pg.emissivity_; - - os.check("Ostream& operator<<(Ostream& os, const constSolidRad& st)"); - return os; -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H b/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H deleted file mode 100644 index b9d19591b3..0000000000 --- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H +++ /dev/null @@ -1,171 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::constSolidRad - -Description - Constant radiative properties - -SourceFiles - constSolidRadI.H - constSolidRad.C - -\*---------------------------------------------------------------------------*/ - -#ifndef constSolidRad_H -#define constSolidRad_H - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -template class constSolidRad; - -template -inline constSolidRad operator* -( - const scalar, - const constSolidRad& -); - -template -Ostream& operator<< -( - Ostream&, - const constSolidRad& -); - -/*---------------------------------------------------------------------------*\ - Class constSolidRad Declaration -\*---------------------------------------------------------------------------*/ - -template -class constSolidRad -: - public Thermo -{ - // Private data - - //- Absorption coefficient - scalar kappaRad_; - - //- Scattering coefficient - scalar sigmaS_; - - //- Emissivity coefficient - scalar emissivity_; - - - //- Construct from components - inline constSolidRad - ( - const Thermo& t, - const scalar kappaRad, - const scalar sigmaS, - const scalar emissivity - ); - - -public: - - // Constructors - - //- Construct from Istream - constSolidRad(const dictionary&); - - //- Construct as named copy - inline constSolidRad(const word& name, const constSolidRad&); - - //- Construct and return a clone - inline autoPtr clone() const; - - // Selector from Istream - inline static autoPtr New(Istream& is); - - - // Member functions - - //- Return the instantiated type name - static word typeName() - { - return "const<" + Thermo::typeName() + '>'; - } - - //- Return absorption coefficient [1/m] - inline scalar kappaRad(scalar T) const; - - //- Return scattering [1/m] - inline scalar sigmaS(scalar T) const; - - //- Return emissivity[] - inline scalar emissivity(scalar T) const; - - //- Write to Ostream - void write(Ostream& os) const; - - - // Member operators - - inline constSolidRad& operator=(const constSolidRad&); - inline void operator+=(const constSolidRad&); - inline void operator-=(const constSolidRad&); - - - // Friend operators - - friend constSolidRad operator* - ( - const scalar, - const constSolidRad& - ); - - - // Ostream Operator - - friend Ostream& operator<< - ( - Ostream&, - const constSolidRad& - ); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "constSolidRadI.H" - -#ifdef NoRepository -# include "constSolidRad.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRadI.H b/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRadI.H deleted file mode 100644 index 2e7ce65cc1..0000000000 --- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRadI.H +++ /dev/null @@ -1,179 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "constSolidRad.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template -inline Foam::constSolidRad::constSolidRad -( - const thermo& t, - const scalar kappaRad, - const scalar sigmaS, - const scalar emissivity -) -: - thermo(t), - kappaRad_(kappaRad), - sigmaS_(sigmaS), - emissivity_(emissivity) -{} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - - -template -inline Foam::constSolidRad::constSolidRad -( - const word& name, - const constSolidRad& pg -) -: - thermo(name, pg), - kappaRad_(pg.kappaRad_), - sigmaS_(pg.sigmaS_), - emissivity_(pg.emissivity_) -{} - - -template -inline Foam::autoPtr > -Foam::constSolidRad::clone() const -{ - return autoPtr >(new constSolidRad(*this)); -} - - -template -inline Foam::autoPtr > -Foam::constSolidRad::New(Istream& is) -{ - return autoPtr >(new constSolidRad(is)); -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -inline Foam::scalar Foam::constSolidRad::kappaRad(scalar) const -{ - return kappaRad_; -} - - -template -inline Foam::scalar Foam::constSolidRad::sigmaS(scalar) const -{ - return sigmaS_; -} - - -template -inline Foam::scalar Foam::constSolidRad::emissivity(scalar) const -{ - return emissivity_; -} - - -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline Foam::constSolidRad& -Foam::constSolidRad::operator=(const constSolidRad& ct) -{ - thermo::operator=(ct); - - kappaRad_ = ct.kappaRad_; - sigmaS_ = ct.sigmaS_; - emissivity_ = ct.emissivity_; - - return *this; -} - - -template -inline void Foam::constSolidRad::operator+= -( - const constSolidRad& ct -) -{ - scalar molr1 = this->nMoles(); - - thermo::operator+=(ct); - - molr1 /= this->nMoles(); - scalar molr2 = ct.nMoles()/this->nMoles(); - - kappaRad_ = molr1*kappaRad_ + molr2*ct.kappaRad_; - sigmaS_ = molr1*sigmaS_ + molr2*ct.sigmaS_; - emissivity_ = molr1*emissivity_ + molr2*ct.emissivity_; -} - - -template -inline void Foam::constSolidRad::operator-= -( - const constSolidRad& ct -) -{ - scalar molr1 = this->nMoles(); - - thermo::operator-=(ct); - - molr1 /= this->nMoles(); - scalar molr2 = ct.nMoles()/this->nMoles(); - - kappaRad_ = molr1*kappaRad_ - molr2*ct.kappaRad_; - sigmaS_ = molr1*sigmaS_ - molr2*ct.sigmaS_; - emissivity_ = molr1*emissivity_ - molr2*ct.emissivity_; -} - -// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // - -template -inline Foam::constSolidRad Foam::operator* -( - const scalar s, - const constSolidRad& ct -) -{ - return constSolidRad - ( - s*static_cast(ct), - ct.kappaRad_, - ct.sigmaS_, - ct.emissivity_ - ); -} - - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidThermo/Make/files b/src/thermophysicalModels/solidThermo/Make/files index 8710badef6..8ed7c05dfd 100644 --- a/src/thermophysicalModels/solidThermo/Make/files +++ b/src/thermophysicalModels/solidThermo/Make/files @@ -1,11 +1,8 @@ solidThermo/solidThermo.C -solidThermo/solidThermoNew.C solidThermo/solidThermos.C mixtures/basicSolidMixture/basicSolidMixture.C - solidReactionThermo/solidReactionThermo.C -solidReactionThermo/solidReactionThermoNew.C solidReactionThermo/solidReactionThermos.C LIB = $(FOAM_LIBBIN)/libsolidThermo diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C index b0f985f2f3..77184b166b 100644 --- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C +++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C @@ -54,6 +54,27 @@ Foam::solidReactionThermo::solidReactionThermo {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::solidReactionThermo::New +( + const fvMesh& mesh +) +{ + return basicThermo::New(mesh); +} + + +Foam::autoPtr Foam::solidReactionThermo::New +( + const fvMesh& mesh, + const dictionary& dict +) +{ + return basicThermo::New(mesh, dict); +} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::solidReactionThermo::~solidReactionThermo() diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C deleted file mode 100644 index 38d044c9f1..0000000000 --- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C +++ /dev/null @@ -1,107 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "solidReactionThermo.H" -#include "fvMesh.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Foam::autoPtr Foam::solidReactionThermo::New -( - const fvMesh& mesh -) -{ - // get model name, but do not register the dictionary - // otherwise it is registered in the database twice - const word modelType - ( - IOdictionary - ( - IOobject - ( - "thermophysicalProperties", - mesh.time().constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ).lookup("thermoType") - ); - - Info<< "Selecting thermodynamics package " << modelType << endl; - - fvMeshConstructorTable::iterator cstrIter = - fvMeshConstructorTablePtr_->find(modelType); - - if (cstrIter == fvMeshConstructorTablePtr_->end()) - { - FatalErrorIn("solidReactionThermo::New(const fvMesh&)") - << "Unknown solidReactionThermo type " - << modelType << nl << nl - << "Valid solidReactionThermo types:" << nl - << fvMeshConstructorTablePtr_->sortedToc() << nl - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); -} - - -Foam::autoPtr Foam::solidReactionThermo::New -( - const fvMesh& mesh, - const dictionary& dict -) -{ - if (debug) - { - Info<< "solidReactionThermo::New(const fvMesh&, const dictionary&): " - << "constructing solidReactionThermo" - << endl; - } - - const word thermoType = dict.lookup("thermoType"); - - dictionaryConstructorTable::iterator cstrIter = - dictionaryConstructorTablePtr_->find(thermoType); - - if (cstrIter == dictionaryConstructorTablePtr_->end()) - { - FatalErrorIn - ( - "solidReactionThermo::New(const fvMesh&, const dictionary&)" - ) << "Unknown solidReactionThermo type " << thermoType - << endl << endl - << "Valid solidReactionThermo types are :" << endl - << dictionaryConstructorTablePtr_->toc() - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh, dict)); -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C index c5ebf5731c..faf4ea6155 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C @@ -81,6 +81,27 @@ Foam::solidThermo::solidThermo {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::solidThermo::New +( + const fvMesh& mesh +) +{ + return basicThermo::New(mesh); +} + + +Foam::autoPtr Foam::solidThermo::New +( + const fvMesh& mesh, + const dictionary& dict +) +{ + return basicThermo::New(mesh, dict); +} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::solidThermo::~solidThermo() diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C deleted file mode 100644 index 798bb04cad..0000000000 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C +++ /dev/null @@ -1,84 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "solidThermo.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Foam::autoPtr Foam::solidThermo::New -( - const fvMesh& mesh -) -{ - return basicThermo::New(mesh); -} - - -Foam::autoPtr Foam::solidThermo::New -( - const fvMesh& mesh, - const dictionary& dict -) -{ - return basicThermo::New(mesh, dict); -} - -/* -Foam::autoPtr Foam::solidThermo::New -( - const fvMesh& mesh, - const dictionary& dict -) -{ - if (debug) - { - Info<< "solidThermo::New(const fvMesh&, const dictionary&): " - << "constructing solidThermo" - << endl; - } - - const word thermoType = dict.lookup("thermoType"); - - dictionaryConstructorTable::iterator cstrIter = - dictionaryConstructorTablePtr_->find(thermoType); - - if (cstrIter == dictionaryConstructorTablePtr_->end()) - { - FatalErrorIn - ( - "solidThermo::New(const fvMesh&, const dictionary&)" - ) << "Unknown solidThermo type " << thermoType - << endl << endl - << "Valid solidThermo types are :" << endl - << dictionaryConstructorTablePtr_->toc() - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh, dict)); -} -*/ - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //