From 0929b4869809c20e981c2d18af733abcea44714f Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 12 Jun 2009 13:28:02 +0100
Subject: [PATCH] simplifying i-o for chemistry models + thermo
---
.../coalChemistryFoam/coalChemistryFoam.C | 2 +-
.../ODEChemistryModel/ODEChemistryModel.C | 18 ++++--
.../ODEChemistryModel/ODEChemistryModel.H | 7 ++-
.../basicChemistryModel/basicChemistryModel.C | 4 +-
.../psiChemistryModel/newPsiChemistryModel.C | 32 +++++++---
.../psiChemistryModel/psiChemistryModel.C | 8 ++-
.../psiChemistryModel/psiChemistryModel.H | 8 ++-
.../rhoChemistryModel/newRhoChemistryModel.C | 32 +++++++---
.../rhoChemistryModel/rhoChemistryModel.C | 8 ++-
.../rhoChemistryModel/rhoChemistryModel.H | 8 ++-
.../EulerImplicit/EulerImplicit.C | 7 ++-
.../EulerImplicit/EulerImplicit.H | 6 +-
.../chemistrySolver/chemistrySolver.C | 6 +-
.../chemistrySolver/chemistrySolver.H | 18 ++++--
.../chemistrySolver/newChemistrySolver.C | 39 +++++++++---
.../chemistryModel/chemistrySolver/ode/ode.C | 7 ++-
.../chemistryModel/chemistrySolver/ode/ode.H | 6 +-
.../chemistrySolver/sequential/sequential.C | 7 ++-
.../chemistrySolver/sequential/sequential.H | 6 +-
.../hCombustionThermo/hCombustionThermo.H | 13 +++-
.../hCombustionThermo/newhCombustionThermo.C | 62 +++++++++++++++++++
.../hReactionThermo/hReactionThermo.H | 13 +++-
.../hReactionThermo/newhReactionThermo.C | 62 +++++++++++++++++++
.../constant/chemistryProperties | 6 +-
.../constant/thermophysicalProperties | 2 +-
25 files changed, 320 insertions(+), 67 deletions(-)
diff --git a/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
index 9c40b73b5dc..9abc94a8297 100644
--- a/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
turbulence->correct();
- rho = thermo->rho();
+ rho = thermo.rho();
runTime.write();
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
index 727bbb442f1..2904b312255 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
@@ -33,10 +33,12 @@ License
template<class CompType, class ThermoType>
Foam::ODEChemistryModel<CompType, ThermoType>::ODEChemistryModel
(
- const fvMesh& mesh
+ const fvMesh& mesh,
+ const word& compTypeName,
+ const word& thermoTypeName
)
:
- CompType(mesh),
+ CompType(mesh, thermoTypeName),
ODE(),
@@ -46,7 +48,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::ODEChemistryModel
(
dynamic_cast<const reactingMixture<ThermoType>&>(this->thermo())
),
- specieThermo_
+ specieThermo_
(
dynamic_cast<const reactingMixture<ThermoType>&>
(this->thermo()).speciesData()
@@ -55,7 +57,15 @@ Foam::ODEChemistryModel<CompType, ThermoType>::ODEChemistryModel
nSpecie_(Y_.size()),
nReaction_(reactions_.size()),
- solver_(chemistrySolver<CompType, ThermoType>::New(*this)),
+ solver_
+ (
+ chemistrySolver<CompType, ThermoType>::New
+ (
+ *this,
+ compTypeName,
+ thermoTypeName
+ )
+ ),
RR_(nSpecie_)
{
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H
index cd234007445..ac8c10e086f 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H
@@ -110,7 +110,12 @@ public:
// Constructors
//- Construct from components
- ODEChemistryModel(const fvMesh& mesh);
+ ODEChemistryModel
+ (
+ const fvMesh& mesh,
+ const word& compTypeName,
+ const word& thermoTypeName
+ );
//- Destructor
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
index 99f60ccf9b2..e7bd4f1e359 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
@@ -57,9 +57,7 @@ Foam::basicChemistryModel::basicChemistryModel(const fvMesh& mesh)
mesh.nCells(),
readScalar(lookup("initialChemicalTimeStep"))
)
-{
- Info<< "basicChemistryModel(const fvMesh&)" << endl;
-}
+{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
index 39ff8ed1fc3..5195801f251 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
@@ -34,6 +34,8 @@ Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
)
{
word psiChemistryModelType;
+ word thermoTypeName;
+ word userSel;
// Enclose the creation of the chemistrtyProperties to ensure it is
// deleted before the chemistrtyProperties is created otherwise the
@@ -51,25 +53,41 @@ Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
)
);
- chemistryPropertiesDict.lookup("psiChemistryModel") >>
- psiChemistryModelType;
+ chemistryPropertiesDict.lookup("psiChemistryModel") >> userSel;
+
+ // construct chemistry model type name by inserting first template
+ // argument
+ label tempOpen = userSel.find('<');
+ label tempClose = userSel.find('>');
+
+ word className = userSel(0, tempOpen);
+ thermoTypeName = userSel(tempOpen + 1, tempClose - tempOpen - 1);
+
+ psiChemistryModelType =
+ className + '<' + typeName + ',' + thermoTypeName + '>';
}
- Info<< "Selecting psiChemistryModel " << psiChemistryModelType << endl;
+ Info<< "Selecting psiChemistryModel " << userSel << endl;
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(psiChemistryModelType);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
+ wordList models = fvMeshConstructorTablePtr_->toc();
+ forAll(models, i)
+ {
+ models[i] = models[i].replace(typeName + ',', "");
+ }
+
FatalErrorIn("psiChemistryModelBase::New(const mesh&)")
- << "Unknown psiChemistryModel type " << psiChemistryModelType
+ << "Unknown psiChemistryModel type " << userSel
<< nl << nl << "Valid psiChemistryModel types are:" << nl
- << fvMeshConstructorTablePtr_->toc() << nl
- << exit(FatalError);
+ << models << nl << exit(FatalError);
}
- return autoPtr<psiChemistryModel>(cstrIter()(mesh));
+ return autoPtr<psiChemistryModel>
+ (cstrIter()(mesh, typeName, thermoTypeName));
}
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
index 4354b7ecbcb..7381d12a1df 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
@@ -38,10 +38,14 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::psiChemistryModel::psiChemistryModel(const fvMesh& mesh)
+Foam::psiChemistryModel::psiChemistryModel
+(
+ const fvMesh& mesh,
+ const word& thermoTypeName
+)
:
basicChemistryModel(mesh),
- thermo_(hCombustionThermo::New(mesh))
+ thermo_(hCombustionThermo::NewType(mesh, thermoTypeName))
{}
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
index c1a16d7ca7d..4cf7af58ec8 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
@@ -89,16 +89,18 @@ public:
psiChemistryModel,
fvMesh,
(
- const fvMesh& mesh
+ const fvMesh& mesh,
+ const word& compTypeName,
+ const word& thermoTypeName
),
- (mesh)
+ (mesh, compTypeName, thermoTypeName)
);
// Constructors
//- Construct from mesh
- psiChemistryModel(const fvMesh& mesh);
+ psiChemistryModel(const fvMesh& mesh, const word& thermoTypeName);
//- Selector
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
index fd87c3539f2..938b8412217 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
@@ -34,6 +34,8 @@ Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
)
{
word rhoChemistryModelType;
+ word thermoTypeName;
+ word userSel;
// Enclose the creation of the chemistrtyProperties to ensure it is
// deleted before the chemistrtyProperties is created otherwise the
@@ -51,25 +53,41 @@ Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
)
);
- chemistryPropertiesDict.lookup("rhoChemistryModel") >>
- rhoChemistryModelType;
+ chemistryPropertiesDict.lookup("rhoChemistryModelType") >> userSel;
+
+ // construct chemistry model type name by inserting first template
+ // argument
+ label tempOpen = userSel.find('<');
+ label tempClose = userSel.find('>');
+
+ word className = userSel(0, tempOpen);
+ thermoTypeName = userSel(tempOpen + 1, tempClose - tempOpen - 1);
+
+ rhoChemistryModelType =
+ className + '<' + typeName + ',' + thermoTypeName + '>';
}
- Info<< "Selecting rhoChemistryModel " << rhoChemistryModelType << endl;
+ Info<< "Selecting rhoChemistryModel " << userSel << endl;
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(rhoChemistryModelType);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
+ wordList models = fvMeshConstructorTablePtr_->toc();
+ forAll(models, i)
+ {
+ models[i] = models[i].replace(typeName + ',', "");
+ }
+
FatalErrorIn("rhoChemistryModelBase::New(const mesh&)")
- << "Unknown rhoChemistryModel type " << rhoChemistryModelType
+ << "Unknown rhoChemistryModel type " << userSel
<< nl << nl << "Valid rhoChemistryModel types are:" << nl
- << fvMeshConstructorTablePtr_->toc() << nl
- << exit(FatalError);
+ << models << nl << exit(FatalError);
}
- return autoPtr<rhoChemistryModel>(cstrIter()(mesh));
+ return autoPtr<rhoChemistryModel>
+ (cstrIter()(mesh, typeName, thermoTypeName));
}
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
index 46a6827b4bf..73a3f00e9cf 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
@@ -38,10 +38,14 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::rhoChemistryModel::rhoChemistryModel(const fvMesh& mesh)
+Foam::rhoChemistryModel::rhoChemistryModel
+(
+ const fvMesh& mesh,
+ const word& thermoTypeName
+)
:
basicChemistryModel(mesh),
- thermo_(hReactionThermo::New(mesh))
+ thermo_(hReactionThermo::NewType(mesh, thermoTypeName))
{}
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
index 2e164f8bc28..43df6e0406e 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
@@ -89,16 +89,18 @@ public:
rhoChemistryModel,
fvMesh,
(
- const fvMesh& mesh
+ const fvMesh& mesh,
+ const word& compTypeName,
+ const word& thermoTypeName
),
- (mesh)
+ (mesh, compTypeName, thermoTypeName)
);
// Constructors
//- Construct from mesh
- rhoChemistryModel(const fvMesh& mesh);
+ rhoChemistryModel(const fvMesh& mesh, const word& thermoTypeName);
//- Selector
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
index 1290f234382..95cfc763881 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
@@ -33,11 +33,12 @@ License
template<class CompType, class ThermoType>
Foam::EulerImplicit<CompType, ThermoType>::EulerImplicit
(
- ODEChemistryModel<CompType, ThermoType>& model
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& modelName
)
:
- chemistrySolver<CompType, ThermoType>(model),
- coeffsDict_(model.subDict(typeName + "Coeffs")),
+ chemistrySolver<CompType, ThermoType>(model, modelName),
+ coeffsDict_(model.subDict(modelName + "Coeffs")),
cTauChem_(readScalar(coeffsDict_.lookup("cTauChem"))),
equil_(coeffsDict_.lookup("equilibriumRateLimiter"))
{}
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
index 414fb85b42d..521a06e2768 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
@@ -75,7 +75,11 @@ public:
// Constructors
//- Construct from components
- EulerImplicit(ODEChemistryModel<CompType, ThermoType>& chemistry);
+ EulerImplicit
+ (
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& modelName
+ );
//- Destructor
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C
index c0a24a10193..129bcabb00e 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C
@@ -34,10 +34,12 @@ namespace Foam
template<class CompType, class ThermoType>
Foam::chemistrySolver<CompType, ThermoType>::chemistrySolver
(
- ODEChemistryModel<CompType, ThermoType>& model
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& modelName
)
:
- model_(model)
+ model_(model),
+ name_(modelName)
{}
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
index ff133123c74..0a21a2755c2 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
@@ -65,6 +65,9 @@ protected:
//- Reference to the chemistry model
ODEChemistryModel<CompType, ThermoType>& model_;
+ //- Name of the chemistry solver
+ const word name_;
+
public:
@@ -79,22 +82,29 @@ public:
chemistrySolver,
dictionary,
(
- ODEChemistryModel<CompType, ThermoType>& model
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& modelName
),
- (model)
+ (model, modelName)
);
// Constructors
//- Construct from components
- chemistrySolver(ODEChemistryModel<CompType, ThermoType>& model);
+ chemistrySolver
+ (
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& modelName
+ );
//- Selector
static autoPtr<chemistrySolver> New
(
- ODEChemistryModel<CompType, ThermoType>& model
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& compTypeName,
+ const word& thermoTypeName
);
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
index 43273dba2b4..b0baa00fbe9 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
@@ -32,27 +32,48 @@ template<class CompType, class ThermoType>
Foam::autoPtr<Foam::chemistrySolver<CompType, ThermoType> >
Foam::chemistrySolver<CompType, ThermoType>::New
(
- ODEChemistryModel<CompType, ThermoType>& model
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& compTypeName,
+ const word& thermoTypeName
)
{
- word chemistrySolverType(model.CompType::lookup("chemistrySolver"));
+ word modelName(model.lookup("chemistrySolver"));
+
+ word chemistrySolverType =
+ modelName + '<' + compTypeName + ',' + thermoTypeName + '>';
+
+ Info<< "Selecting chemistrySolver " << modelName << endl;
typename dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(chemistrySolverType);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
+ wordList models = dictionaryConstructorTablePtr_->toc();
+ forAll(models, i)
+ {
+ models[i] = models[i].replace
+ (
+ '<' + compTypeName + ',' + thermoTypeName + '>',
+ ""
+ );
+ }
+
FatalErrorIn
(
- "chemistrySolver::New(const dictionary&, const ODEChemistryModel&)"
- ) << "Unknown chemistrySolver type " << chemistrySolverType
- << nl << nl
- << "Valid chemistrySolver types are:" << nl
- << dictionaryConstructorTablePtr_->toc() << nl
- << exit(FatalError);
+ "chemistrySolver::New"
+ "("
+ "const ODEChemistryModel&, "
+ "const word&, "
+ "const word&"
+ ")"
+ ) << "Unknown chemistrySolver type " << modelName
+ << nl << nl << "Valid chemistrySolver types are:" << nl
+ << models << nl << exit(FatalError);
}
- return autoPtr<chemistrySolver<CompType, ThermoType> >(cstrIter()(model));
+ return autoPtr<chemistrySolver<CompType, ThermoType> >
+ (cstrIter()(model, modelName));
}
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
index 803c5884619..7a4bde923f7 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
@@ -32,11 +32,12 @@ License
template<class CompType, class ThermoType>
Foam::ode<CompType, ThermoType>::ode
(
- ODEChemistryModel<CompType, ThermoType>& model
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& modelName
)
:
- chemistrySolver<CompType, ThermoType>(model),
- coeffsDict_(model.subDict(typeName + "Coeffs")),
+ chemistrySolver<CompType, ThermoType>(model, modelName),
+ coeffsDict_(model.subDict(modelName + "Coeffs")),
solverName_(coeffsDict_.lookup("ODESolver")),
odeSolver_(ODESolver::New(solverName_, model)),
eps_(readScalar(coeffsDict_.lookup("eps"))),
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
index 8318b0bc3df..faac5ca2ad2 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
@@ -78,7 +78,11 @@ public:
// Constructors
//- Construct from components
- ode(ODEChemistryModel<CompType, ThermoType>& model);
+ ode
+ (
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& modelName
+ );
//- Destructor
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
index aee8a25bf2d..d929c5aea2e 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
@@ -32,11 +32,12 @@ License
template<class CompType, class ThermoType>
Foam::sequential<CompType, ThermoType>::sequential
(
- ODEChemistryModel<CompType, ThermoType>& model
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& modelName
)
:
- chemistrySolver<CompType, ThermoType>(model),
- coeffsDict_(model.subDict(typeName + "Coeffs")),
+ chemistrySolver<CompType, ThermoType>(model, modelName),
+ coeffsDict_(model.subDict(modelName + "Coeffs")),
cTauChem_(readScalar(coeffsDict_.lookup("cTauChem"))),
equil_(coeffsDict_.lookup("equilibriumRateLimiter"))
{}
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H
index 276d7d5341c..c72692a40fa 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H
@@ -78,7 +78,11 @@ public:
//- Construct from components
- sequential(ODEChemistryModel<CompType, ThermoType>& model);
+ sequential
+ (
+ ODEChemistryModel<CompType, ThermoType>& model,
+ const word& modelName
+ );
//- Destructor
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.H
index fc4f20dfae3..b4b66b55bdb 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.H
@@ -86,8 +86,17 @@ public:
hCombustionThermo(const fvMesh&);
- //- Selector
- static autoPtr<hCombustionThermo> New(const fvMesh&);
+ // Selectors
+
+ //- Standard selection based on fvMesh
+ static autoPtr<hCombustionThermo> New(const fvMesh&);
+
+ //- Select and check that package contains 'thermoType'
+ static autoPtr<hCombustionThermo> NewType
+ (
+ const fvMesh&,
+ const word& thermoType
+ );
//- Destructor
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
index cb223d0c42e..175c7d4756b 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
@@ -75,4 +75,66 @@ Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::New
}
+Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::NewType
+(
+ const fvMesh& mesh,
+ const word& thermoType
+)
+{
+ word hCombustionThermoTypeName;
+
+ // Enclose the creation of the thermophysicalProperties to ensure it is
+ // deleted before the turbulenceModel is created otherwise the dictionary
+ // is entered in the database twice
+ {
+ IOdictionary thermoDict
+ (
+ IOobject
+ (
+ "thermophysicalProperties",
+ mesh.time().constant(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ )
+ );
+
+ thermoDict.lookup("thermoType") >> hCombustionThermoTypeName;
+
+ if (hCombustionThermoTypeName.find(thermoType) == string::npos)
+ {
+ FatalErrorIn
+ (
+ "autoPtr<hCombustionThermo> hCombustionThermo::NewType"
+ "("
+ "const fvMesh&, "
+ "const word&"
+ ")"
+ ) << "Inconsistent thermo package selected:" << nl << nl
+ << hCombustionThermoTypeName << nl << nl << "Please select a "
+ << "thermo package based on " << thermoType << nl << nl
+ << exit(FatalError);
+ }
+ }
+
+ Info<< "Selecting thermodynamics package " << hCombustionThermoTypeName
+ << endl;
+
+ fvMeshConstructorTable::iterator cstrIter =
+ fvMeshConstructorTablePtr_->find(hCombustionThermoTypeName);
+
+ if (cstrIter == fvMeshConstructorTablePtr_->end())
+ {
+ FatalErrorIn("hCombustionThermo::New(const fvMesh&)")
+ << "Unknown hCombustionThermo type "
+ << hCombustionThermoTypeName << nl << nl
+ << "Valid hCombustionThermo types are:" << nl
+ << fvMeshConstructorTablePtr_->toc() << nl
+ << exit(FatalError);
+ }
+
+ return autoPtr<hCombustionThermo>(cstrIter()(mesh));
+}
+
+
// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.H b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.H
index 82d653048ba..3d5c37614c3 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.H
@@ -86,8 +86,17 @@ public:
hReactionThermo(const fvMesh&);
- //- Selector
- static autoPtr<hReactionThermo> New(const fvMesh&);
+ // Selectors
+
+ //- Standard selection based on fvMesh
+ static autoPtr<hReactionThermo> New(const fvMesh&);
+
+ //- Select and check that package contains 'thermoType'
+ static autoPtr<hReactionThermo> NewType
+ (
+ const fvMesh&,
+ const word& thermoType
+ );
//- Destructor
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
index 104c66f6132..ceeba892255 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
@@ -75,4 +75,66 @@ Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::New
}
+Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::NewType
+(
+ const fvMesh& mesh,
+ const word& thermoType
+)
+{
+ word hReactionThermoTypeName;
+
+ // Enclose the creation of the thermophysicalProperties to ensure it is
+ // deleted before the turbulenceModel is created otherwise the dictionary
+ // is entered in the database twice
+ {
+ IOdictionary thermoDict
+ (
+ IOobject
+ (
+ "thermophysicalProperties",
+ mesh.time().constant(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ )
+ );
+
+ thermoDict.lookup("thermoType") >> hReactionThermoTypeName;
+
+ if (hReactionThermoTypeName.find(thermoType) == string::npos)
+ {
+ FatalErrorIn
+ (
+ "autoPtr<hReactionThermo> hReactionThermo::NewType"
+ "("
+ "const fvMesh&, "
+ "const word&"
+ ")"
+ ) << "Inconsistent thermo package selected:" << nl << nl
+ << hReactionThermoTypeName << nl << nl << "Please select a "
+ << "thermo package based on " << thermoType << nl << nl
+ << exit(FatalError);
+ }
+ }
+
+ Info<< "Selecting thermodynamics package " << hReactionThermoTypeName
+ << endl;
+
+ fvMeshConstructorTable::iterator cstrIter =
+ fvMeshConstructorTablePtr_->find(hReactionThermoTypeName);
+
+ if (cstrIter == fvMeshConstructorTablePtr_->end())
+ {
+ FatalErrorIn("hReactionThermo::New(const fvMesh&)")
+ << "Unknown hReactionThermo type "
+ << hReactionThermoTypeName << nl << nl
+ << "Valid hReactionThermo types are:" << nl
+ << fvMeshConstructorTablePtr_->toc() << nl
+ << exit(FatalError);
+ }
+
+ return autoPtr<hReactionThermo>(cstrIter()(mesh));
+}
+
+
// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
index a13dc664a59..20d9d19a8f5 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
@@ -15,11 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+
chemistry on;
turbulentReaction on;
-chemistrySolver ODE;
+chemistrySolver ode;
initialChemicalTimeStep 1e-07;
@@ -34,7 +36,7 @@ EulerImplicitCoeffs
equilibriumRateLimiter off;
}
-ODECoeffs
+odeCoeffs
{
ODESolver SIBS;
eps 0.05;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 4936c35ab1a..e5c06a7e043 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hMixtureThermo<reactingMixture>;
+thermoType hPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
chemistryReader foamChemistryReader;
--
GitLab