Commit fbd5a836 authored by Andrew Heather's avatar Andrew Heather
Browse files

added new constructor

parent 17d6b425
......@@ -42,7 +42,18 @@ Foam::coalParcel::coalParcel
(
ReactingMultiphaseCloud<coalParcel>& owner,
const vector& position,
const label celli,
const label cellI
)
:
ReactingMultiphaseParcel<coalParcel>(owner, position, cellI)
{}
Foam::coalParcel::coalParcel
(
ReactingMultiphaseCloud<coalParcel>& owner,
const vector& position,
const label cellI,
const label typeId,
const scalar nParticle0,
const scalar d0,
......@@ -58,7 +69,7 @@ Foam::coalParcel::coalParcel
(
owner,
position,
celli,
cellI,
typeId,
nParticle0,
d0,
......
......@@ -59,12 +59,21 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
coalParcel
(
ReactingMultiphaseCloud<coalParcel>& owner,
const vector& position,
const label cellI
);
//- Construct from components
coalParcel
(
ReactingMultiphaseCloud<coalParcel>& owner,
const vector& position,
const label celli,
const label cellI,
const label typeId,
const scalar nParticle0,
const scalar d0,
......
......@@ -263,6 +263,15 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
inline KinematicParcel
(
KinematicCloud<ParcelType>& owner,
const vector& position,
const label cellI
);
//- Construct from components
inline KinematicParcel
(
......
......@@ -63,6 +63,28 @@ inline Foam::KinematicParcel<ParcelType>::trackData::trackData
{}
template <class ParcelType>
inline Foam::KinematicParcel<ParcelType>::KinematicParcel
(
KinematicCloud<ParcelType>& owner,
const vector& position,
const label cellI
)
:
Particle<ParcelType>(owner, position, cellI),
typeId_(owner.parcelTypeId()),
nParticle_(0),
d_(0.0),
U_(vector::zero),
rho_(0.0),
tTurb_(0.0),
UTurb_(vector::zero),
rhoc_(0.0),
Uc_(vector::zero),
muc_(0.0)
{}
template <class ParcelType>
inline Foam::KinematicParcel<ParcelType>::KinematicParcel
(
......
......@@ -276,6 +276,16 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
inline ReactingMultiphaseParcel
(
ReactingMultiphaseCloud<ParcelType>& owner,
const vector& position,
const label cellI
);
//- Construct from components
inline ReactingMultiphaseParcel
(
......@@ -328,6 +338,9 @@ public:
//- Return const access to mass fractions of solids
inline const scalarField& YSolid() const;
//- Return const access to the canCombust flag
inline bool canCombust() const;
// Edit
......@@ -340,6 +353,9 @@ public:
//- Return access to mass fractions of solids
inline scalarField& YSolid();
//- Return access to the canCombust flag
inline bool& canCombust();
// Main calculation loop
......
......@@ -85,6 +85,22 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::trackData::trackData
{}
template <class ParcelType>
inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
(
ReactingMultiphaseCloud<ParcelType>& owner,
const vector& position,
const label cellI
)
:
ReactingParcel<ParcelType>(owner, position, cellI),
YGas_(0),
YLiquid_(0),
YSolid_(0),
canCombust_(false)
{}
template<class ParcelType>
inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
(
......@@ -185,6 +201,13 @@ YSolid() const
}
template<class ParcelType>
inline bool Foam::ReactingMultiphaseParcel<ParcelType>::canCombust() const
{
return canCombust_;
}
template<class ParcelType>
inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YGas()
{
......@@ -206,4 +229,10 @@ inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YSolid()
}
template<class ParcelType>
inline bool& Foam::ReactingMultiphaseParcel<ParcelType>::canCombust()
{
return canCombust_;
}
// ************************************************************************* //
......@@ -228,6 +228,15 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
inline ReactingParcel
(
ReactingCloud<ParcelType>& owner,
const vector& position,
const label cellI
);
//- Construct from components
inline ReactingParcel
(
......
......@@ -71,6 +71,21 @@ inline Foam::ReactingParcel<ParcelType>::trackData::trackData
{}
template<class ParcelType>
inline Foam::ReactingParcel<ParcelType>::ReactingParcel
(
ReactingCloud<ParcelType>& owner,
const vector& position,
const label cellI
)
:
ThermoParcel<ParcelType>(owner, position, cellI),
mass0_(0.0),
Y_(0),
pc_(0.0)
{}
template<class ParcelType>
inline Foam::ReactingParcel<ParcelType>::ReactingParcel
(
......
......@@ -242,6 +242,15 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
inline ThermoParcel
(
ThermoCloud<ParcelType>& owner,
const vector& position,
const label cellI
);
//- Construct from components
inline ThermoParcel
(
......
......@@ -70,6 +70,22 @@ inline Foam::ThermoParcel<ParcelType>::trackData::trackData
{}
template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::ThermoParcel
(
ThermoCloud<ParcelType>& owner,
const vector& position,
const label cellI
)
:
KinematicParcel<ParcelType>(owner, position, cellI),
T_(0.0),
cp_(0.0),
Tc_(0.0),
cpc_(0.0)
{}
template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::ThermoParcel
(
......
......@@ -81,6 +81,15 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
inline TrackedReactingParcel
(
ReactingCloud<ParcelType>& owner,
const vector& position,
const label cellI
);
//- Construct from components
inline TrackedReactingParcel
(
......
......@@ -26,6 +26,19 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class ParcelType>
inline Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel
(
ReactingCloud<ParcelType>& owner,
const vector& position,
const label cellI
)
:
ReactingParcel<ParcelType>(owner, position, cellI),
ParticleTrackingData<ParcelType>(owner)
{}
template <class ParcelType>
inline Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel
(
......
......@@ -38,6 +38,17 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::basicKinematicParcel::basicKinematicParcel
(
KinematicCloud<basicKinematicParcel>& owner,
const vector& position,
const label cellI
)
:
KinematicParcel<basicKinematicParcel>(owner, position, cellI)
{}
Foam::basicKinematicParcel::basicKinematicParcel
(
KinematicCloud<basicKinematicParcel>& owner,
......
......@@ -60,6 +60,15 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
basicKinematicParcel
(
KinematicCloud<basicKinematicParcel>& owner,
const vector& position,
const label cellI
);
//- Construct from components
basicKinematicParcel
(
......
......@@ -38,6 +38,22 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
(
ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
const vector& position,
const label cellI
)
:
ReactingMultiphaseParcel<basicReactingMultiphaseParcel>
(
owner,
position,
cellI
)
{}
Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
(
ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
......
......@@ -60,6 +60,15 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
basicReactingMultiphaseParcel
(
ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
const vector& position,
const label cellI
);
//- Construct from components
basicReactingMultiphaseParcel
(
......
......@@ -38,6 +38,17 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::basicReactingParcel::basicReactingParcel
(
ReactingCloud<basicReactingParcel>& owner,
const vector& position,
const label cellI
)
:
ReactingParcel<basicReactingParcel>(owner, position, cellI)
{}
Foam::basicReactingParcel::basicReactingParcel
(
ReactingCloud<basicReactingParcel>& owner,
......
......@@ -60,6 +60,15 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
basicReactingParcel
(
ReactingCloud<basicReactingParcel>& owner,
const vector& position,
const label cellI
);
//- Construct from components
basicReactingParcel
(
......
......@@ -38,6 +38,17 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::basicThermoParcel::basicThermoParcel
(
ThermoCloud<basicThermoParcel>& owner,
const vector position,
const label cellI
)
:
ThermoParcel<basicThermoParcel>(owner, position, cellI)
{}
Foam::basicThermoParcel::basicThermoParcel
(
ThermoCloud<basicThermoParcel>& owner,
......
......@@ -59,6 +59,15 @@ public:
// Constructors
//- Construct from owner, position, and cloud owner
// Other properties initialised as null
basicThermoParcel
(
ThermoCloud<basicThermoParcel>& owner,
const vector position,
const label cellI
);
//- Construct from components
basicThermoParcel
(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment