zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StandardChemistryModel: Renamed as standardChemistryModel for consistency with the run-time selection name "standard"

Browse Source 
which simplifies dynamic compilation of chemistry and error messages.
This commit is contained in:
Henry Weller
2021-04-28 17:47:08 +01:00
parent 80139f6116
commit 07d583e989
13 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
etc/codeTemplates/dynamicCode/basicChemistryModel
View File

@ -32,11 +32,6 @@ method
TDAC
);
methodRenamed
(
standard Standard
);
codeOptions
#{
EXE_INC = \

2
etc/codeTemplates/dynamicCode/basicChemistryModel.C
View File

@ -94,7 +94,7 @@ namespace Foam
namespace Foam
{
defineChemistrySolver(StandardChemistryModel, ThermoPhysics);
defineChemistrySolver(standardChemistryModel, ThermoPhysics);
defineChemistryReductionMethod(nullArg, ThermoPhysics);
defineChemistryTabulationMethod(nullArg, ThermoPhysics);
}

2
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
View File

@ -36,7 +36,7 @@ Foam::TDACChemistryModel<ThermoType>::TDACChemistryModel
const fluidReactionThermo& thermo
)
:
StandardChemistryModel<ThermoType>(thermo),
standardChemistryModel<ThermoType>(thermo),
timeSteps_(0),
NsDAC_(this->nSpecie_),
completeC_(this->nSpecie_, 0),

10
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.H
View File

@ -25,7 +25,7 @@ Class
Foam::TDACChemistryModel
Description
Extends StandardChemistryModel by adding the TDAC method.
Extends standardChemistryModel by adding the TDAC method.
References:
\verbatim
@ -64,7 +64,7 @@ SourceFiles
#ifndef TDACChemistryModel_H
#define TDACChemistryModel_H
#include "StandardChemistryModel.H"
#include "standardChemistryModel.H"
#include "chemistryReductionMethod.H"
#include "chemistryTabulationMethod.H"
#include "OFstream.H"
@ -81,7 +81,7 @@ namespace Foam
template<class ThermoType>
class TDACChemistryModel
:
public StandardChemistryModel<ThermoType>
public standardChemistryModel<ThermoType>
{
// Private member data
@ -177,7 +177,7 @@ public:
// Chemistry model functions (overriding functions in
// StandardChemistryModel to use the private solve function)
// standardChemistryModel to use the private solve function)
//- Solve the reaction system for the given time step
// and return the characteristic time
@ -188,7 +188,7 @@ public:
virtual scalar solve(const scalarField& deltaT);
// ODE functions (overriding functions in StandardChemistryModel to take
// ODE functions (overriding functions in standardChemistryModel to take
// into account the variable number of species)
virtual void derivatives

2
src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelNew.C
View File

@ -53,7 +53,7 @@ Foam::autoPtr<Foam::basicChemistryModel> Foam::basicChemistryModel::New
<< "Template parameter based chemistry solver selection is no "
<< "longer supported. Please create a chemistryType dictionary"
<< "instead." << endl << endl << "For example, the entry:" << endl
<< " chemistrySolver ode<StandardChemistryModel<"
<< " chemistrySolver ode<standardChemistryModel<"
<< "rhoChemistryModel,sutherland<specie<janaf<perfectGas>,"
<< "sensibleInternalEnergy>>>>" << endl << endl << "becomes:"
<< endl << " chemistryType" << endl << " {" << endl

28
src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C → src/thermophysicalModels/chemistryModel/chemistryModel/standardChemistryModel/standardChemistryModel.C
View File

@ -23,14 +23,14 @@ License
\*---------------------------------------------------------------------------*/
#include "StandardChemistryModel.H"
#include "standardChemistryModel.H"
#include "UniformField.H"
#include "extrapolatedCalculatedFvPatchFields.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ThermoType>
Foam::StandardChemistryModel<ThermoType>::StandardChemistryModel
Foam::standardChemistryModel<ThermoType>::standardChemistryModel
(
const fluidReactionThermo& thermo
)
@ -70,7 +70,7 @@ Foam::StandardChemistryModel<ThermoType>::StandardChemistryModel
);
}
Info<< "StandardChemistryModel: Number of species = " << nSpecie_
Info<< "standardChemistryModel: Number of species = " << nSpecie_
<< " and reactions = " << nReaction_ << endl;
}
@ -78,14 +78,14 @@ Foam::StandardChemistryModel<ThermoType>::StandardChemistryModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class ThermoType>
Foam::StandardChemistryModel<ThermoType>::~StandardChemistryModel()
Foam::standardChemistryModel<ThermoType>::~standardChemistryModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ThermoType>
void Foam::StandardChemistryModel<ThermoType>::omega
void Foam::standardChemistryModel<ThermoType>::omega
(
const scalar p,
const scalar T,
@ -106,7 +106,7 @@ void Foam::StandardChemistryModel<ThermoType>::omega
template<class ThermoType>
void Foam::StandardChemistryModel<ThermoType>::derivatives
void Foam::standardChemistryModel<ThermoType>::derivatives
(
const scalar t,
const scalarField& c,
@ -149,7 +149,7 @@ void Foam::StandardChemistryModel<ThermoType>::derivatives
template<class ThermoType>
void Foam::StandardChemistryModel<ThermoType>::jacobian
void Foam::standardChemistryModel<ThermoType>::jacobian
(
const scalar t,
const scalarField& c,
@ -232,7 +232,7 @@ void Foam::StandardChemistryModel<ThermoType>::jacobian
template<class ThermoType>
Foam::tmp<Foam::volScalarField>
Foam::StandardChemistryModel<ThermoType>::tc() const
Foam::standardChemistryModel<ThermoType>::tc() const
{
tmp<volScalarField> ttc
(
@ -321,7 +321,7 @@ Foam::StandardChemistryModel<ThermoType>::tc() const
template<class ThermoType>
Foam::tmp<Foam::volScalarField>
Foam::StandardChemistryModel<ThermoType>::Qdot() const
Foam::standardChemistryModel<ThermoType>::Qdot() const
{
tmp<volScalarField> tQdot
(
@ -355,7 +355,7 @@ Foam::StandardChemistryModel<ThermoType>::Qdot() const
template<class ThermoType>
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::StandardChemistryModel<ThermoType>::calculateRR
Foam::standardChemistryModel<ThermoType>::calculateRR
(
const label ri,
const label si
@ -422,7 +422,7 @@ Foam::StandardChemistryModel<ThermoType>::calculateRR
template<class ThermoType>
void Foam::StandardChemistryModel<ThermoType>::calculate()
void Foam::standardChemistryModel<ThermoType>::calculate()
{
if (!this->chemistry_)
{
@ -461,7 +461,7 @@ void Foam::StandardChemistryModel<ThermoType>::calculate()
template<class ThermoType>
template<class DeltaTType>
Foam::scalar Foam::StandardChemistryModel<ThermoType>::solve
Foam::scalar Foam::standardChemistryModel<ThermoType>::solve
(
const DeltaTType& deltaT
)
@ -536,7 +536,7 @@ Foam::scalar Foam::StandardChemistryModel<ThermoType>::solve
template<class ThermoType>
Foam::scalar Foam::StandardChemistryModel<ThermoType>::solve
Foam::scalar Foam::standardChemistryModel<ThermoType>::solve
(
const scalar deltaT
)
@ -551,7 +551,7 @@ Foam::scalar Foam::StandardChemistryModel<ThermoType>::solve
template<class ThermoType>
Foam::scalar Foam::StandardChemistryModel<ThermoType>::solve
Foam::scalar Foam::standardChemistryModel<ThermoType>::solve
(
const scalarField& deltaT
)

30
src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.H → src/thermophysicalModels/chemistryModel/chemistryModel/standardChemistryModel/standardChemistryModel.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::StandardChemistryModel
Foam::standardChemistryModel
Description
Extends base chemistry model by adding a thermo package, and ODE functions.
@ -30,13 +30,13 @@ Description
terms.
SourceFiles
StandardChemistryModelI.H
StandardChemistryModel.C
standardChemistryModelI.H
standardChemistryModel.C
\*---------------------------------------------------------------------------*/
#ifndef StandardChemistryModel_H
#define StandardChemistryModel_H
#ifndef standardChemistryModel_H
#define standardChemistryModel_H
#include "basicChemistryModel.H"
#include "ReactionList.H"
@ -53,11 +53,11 @@ namespace Foam
class fvMesh;
/*---------------------------------------------------------------------------*\
Class StandardChemistryModel Declaration
Class standardChemistryModel Declaration
\*---------------------------------------------------------------------------*/
template<class ThermoType>
class StandardChemistryModel
class standardChemistryModel
:
public basicChemistryModel,
public ODESystem
@ -79,13 +79,13 @@ protected:
// destruction.
class reactionEvaluationScope
{
const StandardChemistryModel<ThermoType>& chemistry_;
const standardChemistryModel<ThermoType>& chemistry_;
public:
reactionEvaluationScope
(
const StandardChemistryModel<ThermoType>& chemistry
const standardChemistryModel<ThermoType>& chemistry
)
:
chemistry_(chemistry)
@ -155,14 +155,14 @@ public:
// Constructors
//- Construct from thermo
StandardChemistryModel(const fluidReactionThermo& thermo);
standardChemistryModel(const fluidReactionThermo& thermo);
//- Disallow default bitwise copy construction
StandardChemistryModel(const StandardChemistryModel&) = delete;
standardChemistryModel(const standardChemistryModel&) = delete;
//- Destructor
virtual ~StandardChemistryModel();
virtual ~standardChemistryModel();
// Member Functions
@ -275,7 +275,7 @@ public:
// Member Operators
//- Disallow default bitwise assignment
void operator=(const StandardChemistryModel&) = delete;
void operator=(const standardChemistryModel&) = delete;
};
@ -285,12 +285,12 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "StandardChemistryModelI.H"
#include "standardChemistryModelI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "StandardChemistryModel.C"
#include "standardChemistryModel.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

22
src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModelI.H → src/thermophysicalModels/chemistryModel/chemistryModel/standardChemistryModel/standardChemistryModelI.H
View File

@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ThermoType>
inline Foam::label Foam::StandardChemistryModel<ThermoType>::nEqns() const
inline Foam::label Foam::standardChemistryModel<ThermoType>::nEqns() const
{
// nEqns = number of species + temperature + pressure
return nSpecie_ + 2;
@ -38,7 +38,7 @@ inline Foam::label Foam::StandardChemistryModel<ThermoType>::nEqns() const
template<class ThermoType>
inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>&
Foam::StandardChemistryModel<ThermoType>::RR()
Foam::standardChemistryModel<ThermoType>::RR()
{
return RR_;
}
@ -46,7 +46,7 @@ Foam::StandardChemistryModel<ThermoType>::RR()
template<class ThermoType>
inline const Foam::multiComponentMixture<ThermoType>&
Foam::StandardChemistryModel<ThermoType>::mixture() const
Foam::standardChemistryModel<ThermoType>::mixture() const
{
return mixture_;
}
@ -54,7 +54,7 @@ Foam::StandardChemistryModel<ThermoType>::mixture() const
template<class ThermoType>
inline const Foam::PtrList<Foam::Reaction<ThermoType>>&
Foam::StandardChemistryModel<ThermoType>::reactions() const
Foam::standardChemistryModel<ThermoType>::reactions() const
{
return reactions_;
}
@ -62,35 +62,35 @@ Foam::StandardChemistryModel<ThermoType>::reactions() const
template<class ThermoType>
inline const Foam::PtrList<ThermoType>&
Foam::StandardChemistryModel<ThermoType>::specieThermos() const
Foam::standardChemistryModel<ThermoType>::specieThermos() const
{
return specieThermos_;
}
template<class ThermoType>
inline Foam::label Foam::StandardChemistryModel<ThermoType>::nSpecie() const
inline Foam::label Foam::standardChemistryModel<ThermoType>::nSpecie() const
{
return nSpecie_;
}
template<class ThermoType>
inline Foam::label Foam::StandardChemistryModel<ThermoType>::nReaction() const
inline Foam::label Foam::standardChemistryModel<ThermoType>::nReaction() const
{
return nReaction_;
}
template<class ThermoType>
inline Foam::scalar Foam::StandardChemistryModel<ThermoType>::Treact() const
inline Foam::scalar Foam::standardChemistryModel<ThermoType>::Treact() const
{
return Treact_;
}
template<class ThermoType>
inline Foam::scalar& Foam::StandardChemistryModel<ThermoType>::Treact()
inline Foam::scalar& Foam::standardChemistryModel<ThermoType>::Treact()
{
return Treact_;
}
@ -98,14 +98,14 @@ inline Foam::scalar& Foam::StandardChemistryModel<ThermoType>::Treact()
template<class ThermoType>
inline const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
Foam::StandardChemistryModel<ThermoType>::RR(const label i) const
Foam::standardChemistryModel<ThermoType>::RR(const label i) const
{
return RR_[i];
}
template<class ThermoType>
Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
Foam::StandardChemistryModel<ThermoType>::RR(const label i)
Foam::standardChemistryModel<ThermoType>::RR(const label i)
{
return RR_[i];
}

2
src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicitChemistrySolvers.C
View File

@ -25,7 +25,7 @@ License
#include "EulerImplicit.H"
#include "StandardChemistryModel.H"
#include "standardChemistryModel.H"
#include "TDACChemistryModel.H"
#include "forGases.H"

2
src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolvers.C
View File

@ -25,7 +25,7 @@ License
#include "chemistrySolver.H"
#include "StandardChemistryModel.H"
#include "standardChemistryModel.H"
#include "TDACChemistryModel.H"
#include "forGases.H"

6
src/thermophysicalModels/chemistryModel/chemistrySolver/makeChemistrySolver.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,7 +75,7 @@ License
#define defineChemistrySolvers(nullArg, ThermoPhysics) \
defineChemistrySolver \
( \
StandardChemistryModel, \
standardChemistryModel, \
ThermoPhysics \
); \
defineChemistrySolver \
@ -88,7 +88,7 @@ License
makeChemistrySolver \
( \
Solver, \
StandardChemistryModel, \
standardChemistryModel, \
ThermoPhysics \
); \
makeChemistrySolver \

2
src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolvers.C
View File

@ -25,7 +25,7 @@ License
#include "noChemistrySolver.H"
#include "StandardChemistryModel.H"
#include "standardChemistryModel.H"
#include "TDACChemistryModel.H"
#include "forGases.H"

2
src/thermophysicalModels/chemistryModel/chemistrySolver/ode/odeChemistrySolvers.C
View File

@ -25,7 +25,7 @@ License
#include "ode.H"
#include "StandardChemistryModel.H"
#include "standardChemistryModel.H"
#include "TDACChemistryModel.H"
#include "forGases.H"