0ea0b7c407
The combustion and chemistry models no longer select and own the
thermodynamic model; they hold a reference instead. The construction of
the combustion and chemistry models has been changed to require a
reference to the thermodyanmics, rather than the mesh and a phase name.
At the solver-level the thermo, turbulence and combustion models are now
selected in sequence. The cyclic dependency between the three models has
been resolved, and the raw-pointer based post-construction step for the
combustion model has been removed.
The old solver-level construction sequence (typically in createFields.H)
was as follows:
autoPtr<combustionModels::psiCombustionModel> combustion
(
combustionModels::psiCombustionModel::New(mesh)
);
psiReactionThermo& thermo = combustion->thermo();
// Create rho, U, phi, etc...
autoPtr<compressible::turbulenceModel> turbulence
(
compressible::turbulenceModel::New(rho, U, phi, thermo)
);
combustion->setTurbulence(*turbulence);
The new sequence is:
autoPtr<psiReactionThermo> thermo(psiReactionThermo::New(mesh));
// Create rho, U, phi, etc...
autoPtr<compressible::turbulenceModel> turbulence
(
compressible::turbulenceModel::New(rho, U, phi, *thermo)
);
autoPtr<combustionModels::psiCombustionModel> combustion
(
combustionModels::psiCombustionModel::New(*thermo, *turbulence)
);
99 lines
2.7 KiB
C
99 lines
2.7 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | Copyright (C) 2013-2017 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 <http://www.gnu.org/licenses/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "basicSolidChemistryModel.H"
|
|
#include "fvMesh.H"
|
|
#include "Time.H"
|
|
|
|
/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
|
|
|
|
namespace Foam
|
|
{
|
|
defineTypeNameAndDebug(basicSolidChemistryModel, 0);
|
|
defineRunTimeSelectionTable(basicSolidChemistryModel, thermo);
|
|
}
|
|
|
|
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
|
|
|
Foam::basicSolidChemistryModel::basicSolidChemistryModel
|
|
(
|
|
solidReactionThermo& thermo
|
|
)
|
|
:
|
|
basicChemistryModel(thermo),
|
|
solidThermo_(thermo)
|
|
{}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
|
|
|
Foam::basicSolidChemistryModel::~basicSolidChemistryModel()
|
|
{}
|
|
|
|
|
|
const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
|
|
Foam::basicSolidChemistryModel::RR(const label i) const
|
|
{
|
|
NotImplemented;
|
|
return (volScalarField::Internal::null());
|
|
}
|
|
|
|
|
|
Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
|
|
Foam::basicSolidChemistryModel::RR(const label i)
|
|
{
|
|
NotImplemented;
|
|
|
|
return dynamic_cast<volScalarField::Internal&>
|
|
(
|
|
const_cast<volScalarField::Internal& >
|
|
(
|
|
volScalarField::Internal::null()
|
|
)
|
|
);
|
|
}
|
|
|
|
|
|
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
|
|
Foam::basicSolidChemistryModel::calculateRR
|
|
(
|
|
const label reactionI,
|
|
const label speciei
|
|
) const
|
|
{
|
|
NotImplemented;
|
|
|
|
return dynamic_cast<tmp<volScalarField::Internal>&>
|
|
(
|
|
const_cast<volScalarField::Internal& >
|
|
(
|
|
volScalarField::Internal::null()
|
|
)
|
|
);
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|