zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved construction of carrier props to reacting cloud constructor

Browse Source
This commit is contained in:
andy
2009-06-03 11:02:43 +01:00
parent cba4af2700
commit 3233ed6428
14 changed files with 38 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lagrangian/coalCombustion/CoalCloud/CoalCloud.C
View File

@ -35,8 +35,7 @@ Foam::CoalCloud<ThermoType>::CoalCloud
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<ThermoType>& carrierSpecies
hCombustionThermo& thermo
)
:
ReactingMultiphaseCloud<CoalParcel<ThermoType> >
@ -45,8 +44,7 @@ Foam::CoalCloud<ThermoType>::CoalCloud
rho,
U,
g,
thermo,
carrierSpecies
thermo
)
{
CoalParcel<ThermoType>::readFields(*this);

5
src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
View File

@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class CoalCloud Declaration
Class CoalCloud Declaration
\*---------------------------------------------------------------------------*/
template<class ThermoType>
@ -76,8 +76,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<ThermoType>& gases
hCombustionThermo& thermo
);

20
src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
View File

@ -28,6 +28,7 @@ License
#include "CompositionModel.H"
#include "PhaseChangeModel.H"
#include "multiComponentMixture.H"
// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * //
@ -67,15 +68,14 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<thermoType>& carrierSpecies
hCombustionThermo& thermo
)
:
ThermoCloud<ParcelType>(cloudName, rho, U, g, thermo),
reactingCloud(),
constProps_(this->particleProperties()),
carrierThermo_(thermo),
carrierSpecies_(carrierSpecies),
carrierSpecies_(thermo.composition().Y().size()),
compositionModel_
(
CompositionModel<ReactingCloud<ParcelType> >::New
@ -95,6 +95,20 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
rhoTrans_(thermo.composition().Y().size()),
dMassPhaseChange_(0.0)
{
// Create the carrier species
forAll(carrierSpecies_, specieI)
{
carrierSpecies_.set
(
specieI,
new thermoType
(
dynamic_cast<const multiComponentMixture<thermoType>&>
(thermo).speciesData()[specieI]
)
);
}
// Set storage for mass source fields and initialise to zero
forAll(rhoTrans_, i)
{

5
src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
View File

@ -98,7 +98,7 @@ protected:
hCombustionThermo& carrierThermo_;
//- Gas phase properties
PtrList<thermoType>& carrierSpecies_;
PtrList<thermoType> carrierSpecies_;
// References to the cloud sub-models
@ -148,8 +148,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<thermoType>& carrierSpecies
hCombustionThermo& thermo
);

5
src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
View File

@ -38,11 +38,10 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<typename ReactingCloud<ParcelType>::thermoType>& carrierSpecies
hCombustionThermo& thermo
)
:
ReactingCloud<ParcelType>(cloudName, rho, U, g, thermo, carrierSpecies),
ReactingCloud<ParcelType>(cloudName, rho, U, g, thermo),
reactingMultiphaseCloud(),
constProps_(this->particleProperties()),
devolatilisationModel_

4
src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
View File

@ -123,9 +123,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<typename ReactingCloud<ParcelType>::thermoType>&
carrierSpecies
hCombustionThermo& thermo
);

6
src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.C
View File

@ -35,8 +35,7 @@ Foam::BasicReactingCloud<ThermoType>::BasicReactingCloud
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<ThermoType>& carrierSpecies
hCombustionThermo& thermo
)
:
ReactingCloud<BasicReactingParcel<ThermoType> >
@ -45,8 +44,7 @@ Foam::BasicReactingCloud<ThermoType>::BasicReactingCloud
rho,
U,
g,
thermo,
carrierSpecies
thermo
)
{
BasicReactingParcel<ThermoType>::readFields(*this);

3
src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H
View File

@ -81,8 +81,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<ThermoType>& carrierSpecies
hCombustionThermo& thermo
);

6
src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.C
View File

@ -35,8 +35,7 @@ Foam::BasicTrackedReactingCloud<ThermoType>::BasicTrackedReactingCloud
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<ThermoType>& gases
hCombustionThermo& thermo
)
:
ReactingCloud<BasicTrackedReactingParcel<ThermoType> >
@ -45,8 +44,7 @@ Foam::BasicTrackedReactingCloud<ThermoType>::BasicTrackedReactingCloud
rho,
U,
g,
thermo,
gases
thermo
)
{
BasicTrackedReactingParcel<ThermoType>::readFields(*this);

3
src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.H
View File

@ -81,8 +81,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
hCombustionThermo& thermo,
PtrList<ThermoType>& gases
hCombustionThermo& thermo
);