ENH: combustion models - updated for current API

This commit is contained in:
Andrew Heather
2016-12-12 12:14:26 +00:00
parent 6408cd1fbb
commit 4c79a85baa
6 changed files with 19 additions and 5 deletions

View File

@ -125,10 +125,13 @@ template<class CombThermoType, class ThermoType>
Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::
diffusionMulticomponent
(
const word& modelType, const fvMesh& mesh, const word& phaseName
const word& modelType,
const fvMesh& mesh,
const word& combustionProperties,
const word& phaseName
)
:
CombThermoType(modelType, mesh, phaseName),
CombThermoType(modelType, mesh, combustionProperties, phaseName),
reactions_
(
dynamic_cast<const reactingMixture<ThermoType>&>(this->thermo())

View File

@ -171,6 +171,7 @@ public:
(
const word& modelType,
const fvMesh& mesh,
const word& combustionProperties,
const word& phaseName
);

View File

@ -35,13 +35,17 @@ template<class CombThermoType, class ThermoType>
eddyDissipationDiffusionModel<CombThermoType, ThermoType>::
eddyDissipationDiffusionModel
(
const word& modelType, const fvMesh& mesh, const word& phaseName
const word& modelType,
const fvMesh& mesh,
const word& combustionProperties,
const word& phaseName
)
:
eddyDissipationModelBase<CombThermoType, ThermoType>
(
modelType,
mesh,
combustionProperties,
phaseName
),
Cd_(readScalar(this->coeffs().lookup("Cd")))

View File

@ -45,7 +45,7 @@ namespace combustionModels
{
/*---------------------------------------------------------------------------*\
Class eddyDissipationDiffusionModel Declaration
Class eddyDissipationDiffusionModel Declaration
\*---------------------------------------------------------------------------*/
template<class CombThermoType, class ThermoType>
@ -81,6 +81,7 @@ public:
(
const word& modelType,
const fvMesh& mesh,
const word& combustionProperties,
const word& phaseName
);

View File

@ -35,13 +35,17 @@ namespace combustionModels
template<class CombThermoType, class ThermoType>
eddyDissipationModelBase<CombThermoType, ThermoType>::eddyDissipationModelBase
(
const word& modelType, const fvMesh& mesh, const word& phaseName
const word& modelType,
const fvMesh& mesh,
const word& combustionProperties,
const word& phaseName
)
:
singleStepCombustion<CombThermoType, ThermoType>
(
modelType,
mesh,
combustionProperties,
phaseName
),
CEDC_(readScalar(this->coeffs().lookup("CEDC")))

View File

@ -80,6 +80,7 @@ public:
(
const word& modelType,
const fvMesh& mesh,
const word& combustionProperties,
const word& phaseName
);