Commit 12ad0174 authored by Andrew Heather's avatar Andrew Heather
Browse files

ENH: Extended parcel constantProperties constructors

parent 74499d57
......@@ -626,7 +626,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
)
),
solution_(mesh),
constProps_(dictionary::null),
constProps_(),
subModelProperties_(dictionary::null),
rndGen_(0, 0),
cellOccupancyPtr_(NULL),
......
......@@ -191,8 +191,9 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
ThermoCloud<ParcelType>(mesh, name, c),
reactingCloud(),
cloudCopyPtr_(NULL),
constProps_(c.constProps_),
compositionModel_(NULL),
constProps_(),
compositionModel_(c.compositionModel_->clone()),
// compositionModel_(NULL),
phaseChangeModel_(NULL),
rhoTrans_(0),
dMassPhaseChange_(0.0)
......
......@@ -123,7 +123,7 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
ReactingCloud<ParcelType>(mesh, name, c),
reactingMultiphaseCloud(),
cloudCopyPtr_(NULL),
constProps_(c.constProps_),
constProps_(),
devolatilisationModel_(NULL),
surfaceReactionModel_(NULL),
dMassDevolatilisation_(0.0),
......
......@@ -197,7 +197,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
KinematicCloud<ParcelType>(mesh, name, c),
thermoCloud(),
cloudCopyPtr_(NULL),
constProps_(c.particleProperties_),
constProps_(),
thermo_(c.thermo()),
T_(c.T()),
p_(c.p()),
......
......@@ -118,8 +118,17 @@ public:
public:
//- Constructor
constantProperties(const dictionary& parentDict);
// Constructors
//- Null constructor
constantProperties();
//- Copy constructor
constantProperties(const constantProperties& cp);
//- Constructor from dictionary
constantProperties(const dictionary& parentDict);
// Member functions
......
......@@ -29,6 +29,36 @@ using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ParcelType>
inline
Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties()
:
dict_(dictionary::null),
parcelTypeId_(-1),
rhoMin_(0.0),
rho0_(0.0),
minParticleMass_(0.0),
youngsModulus_(0.0),
poissonsRatio_(0.0)
{}
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
(
const constantProperties& cp
)
:
dict_(cp.dict_),
parcelTypeId_(cp.parcelTypeId_),
rhoMin_(cp.rhoMin_),
rho0_(cp.rho0_),
minParticleMass_(cp.minParticleMass_),
youngsModulus_(cp.youngsModulus_),
poissonsRatio_(cp.poissonsRatio_)
{}
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
(
......
......@@ -91,8 +91,17 @@ public:
public:
//- Constructor
constantProperties(const dictionary& parentDict);
// Constructors
//- Null constructor
constantProperties();
//- Copy constructor
constantProperties(const constantProperties& cp);
//- Constructor from dictionary
constantProperties(const dictionary& parentDict);
// Access
......
......@@ -25,6 +25,31 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ParcelType>
inline
Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
constantProperties()
:
ReactingParcel<ParcelType>::constantProperties(),
LDevol_(0.0),
hRetentionCoeff_(0.0)
{}
template<class ParcelType>
inline
Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
constantProperties
(
const constantProperties& cp
)
:
ReactingParcel<ParcelType>::constantProperties(cp),
LDevol_(cp.LDevol_),
hRetentionCoeff_(cp.hRetentionCoeff_)
{}
template<class ParcelType>
inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
constantProperties
......
......@@ -91,8 +91,17 @@ public:
public:
//- Constructor
constantProperties(const dictionary& parentDict);
// Constructors
//- Null constructor
constantProperties();
//- Copy constructor
constantProperties(const constantProperties& cp);
//- Constructor from dictionary
constantProperties(const dictionary& parentDict);
// Access
......
......@@ -25,6 +25,32 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ParcelType>
inline
Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties()
:
ThermoParcel<ParcelType>::constantProperties(),
pMin_(0.0),
constantVolume_(false),
Tvap_(0.0),
Tbp_(0.0)
{}
template<class ParcelType>
inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
(
const constantProperties& cp
)
:
ThermoParcel<ParcelType>::constantProperties(cp),
pMin_(cp.pMin_),
constantVolume_(cp.constantVolume_),
Tvap_(cp.Tvap_),
Tbp_(cp.Tbp_)
{}
template<class ParcelType>
inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
(
......
......@@ -98,7 +98,16 @@ public:
public:
// Constructors
constantProperties(const dictionary& parentDict);
//- Null constructor
constantProperties();
//- Copy constructor
constantProperties(const constantProperties& cp);
//- Constructor from dictionary
constantProperties(const dictionary& parentDict);
// Member functions
......
......@@ -25,6 +25,35 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties()
:
KinematicParcel<ParcelType>::constantProperties(),
T0_(0.0),
TMin_(0.0),
Cp0_(0.0),
epsilon0_(0.0),
f0_(0.0),
Pr_(0.0)
{}
template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
(
const constantProperties& cp
)
:
KinematicParcel<ParcelType>::constantProperties(cp),
T0_(cp.T0_),
TMin_(cp.TMin_),
Cp0_(cp.Cp0_),
epsilon0_(cp.epsilon0_),
f0_(cp.f0_),
Pr_(cp.Pr_)
{}
template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
(
......
Supports Markdown
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